From 5a8402f78141626c53d1954b6aa97cb39873cc7d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 17 May 2022 18:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/ReportConfig.vue     | 21 ++++++-
 .../components/report/WorkReport.vue          | 60 ++++++++++++++++---
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/src/saas/AppCountryAlbum/ReportConfig.vue b/src/saas/AppCountryAlbum/ReportConfig.vue
index 42a71fde..8ecbe5f5 100644
--- a/src/saas/AppCountryAlbum/ReportConfig.vue
+++ b/src/saas/AppCountryAlbum/ReportConfig.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="AttendanceFiexdTime">
+  <div class="report-config">
     <div class="form-group">
-      <div class="form-item" v-for="(item, index) in list" :key="index">
+      <div class="form-item" v-for="(item, index) in list" :key="index" :class="[item.type === 'textarea' ? 'textarea' : '']">
         <span>{{ item.label }}</span>
         <div class="form-item__right" v-if="item.type === 'text'">
           <input :placeholder="'请输入' + item.label" v-model="item.value">
@@ -11,6 +11,9 @@
           <span :style="{color: item.value ? '#333' : '#999'}">{{ item.value || '请选择' + item.label }}</span>
           <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
         </div>
+        <div class="form-item__right" v-if="item.type === 'textarea'">
+          <textarea :placeholder="'请输入' + item.label" v-model="item.value" :maxlength="-1"></textarea>
+        </div>
       </div>
     </div>
     <div class="form-btn" hover-class="text-hover" @click="save">保存</div>
@@ -52,7 +55,7 @@
 </script>
 
 <style lang="scss" scoped>
-  .AttendanceFiexdTime {
+  .report-config {
     padding-bottom: 130px;
 
     * {
@@ -99,6 +102,18 @@
           margin-right: 20px;
         }
 
+        &.textarea {
+          display: block;
+          height: auto;
+          padding: 32px 0;
+
+          textarea {
+            width: 100%;
+            margin-top: 20px;
+            text-align: left;
+          }
+        }
+
         .form-item__right {
           display: flex;
           align-items: center;
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index 67c63a2c..9594980a 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -17,19 +17,22 @@
           <label>汇报人：{{ form.name || '请输入汇报人姓名' }}</label>
         </div>
         <div class="bottom-item">
-          <span>备注：{{ '请输入备注' }}</span>
+          <span>备注：{{ form.remark || '请输入备注' }}</span>
+        </div>
+        <div class="imgs">
+          <image :src="item" v-for="(item, index) in imgs" mode="widthFix" :key="index" />
         </div>
       </div>
-      <div class="add" data-html2canvas-ignore ref="add">
-        <div class="add-btn">
+      <div class="add" data-html2canvas-ignore ref="add" @click="save">
+        <div class="add-btn" @click.stop="addPhoto">
           <span>添加图片</span>
         </div>
-        <div class="add-btn">
+        <!-- <div class="add-btn">
           <span>添加文字</span>
-        </div>
+        </div> -->
       </div>
     </div>
-    <image v-if="waterSrc" :src="waterSrc" />
+    <image v-if="waterSrc" :src="waterSrc" @click="waterSrc = ''" />
   </div>
 </template>
 
@@ -47,8 +50,10 @@
           unit: '',
           title: '',
           date: '',
-          name: ''
-        }
+          name: '',
+          remark: ''
+        },
+        imgs: []
       }
     },
 
@@ -76,6 +81,23 @@
         })
       },
 
+      addPhoto () {
+        uni.chooseImage({
+          count: 1,
+          sizeType: ['compressed'],
+          success: res => {
+            let formData = new FormData()
+            formData.append('file', res.tempFiles[0])
+            this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+              if (res.code === 0) {
+                console.log(res.data)
+                this.imgs.push(res.data.url)
+              }
+            })
+          }
+        })
+      },
+
       linkTo (path) {
         const data = [
           {
@@ -101,6 +123,12 @@
             key: 'date',
             value: '',
             label: '汇报日期'
+          },
+          {
+            type: 'textarea',
+            key: 'remark',
+            value: '',
+            label: '备注'
           }
         ]
         uni.navigateTo({
@@ -120,6 +148,22 @@
       box-sizing: border-box;
     }
 
+    & > image {
+      position: fixed;
+      top: 0;
+      left: 0;
+      z-index: 111;
+      width: 100%;
+      height: 100vh;
+    }
+
+    .imgs {
+      image {
+        display: block;
+        width: 100%;
+      }
+    }
+
     .top {
       display: flex;
       justify-content: space-between;