From e8a7db7f05f6eda70535643abd2840223f73f86a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 8 Feb 2022 16:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E4=B9=A1=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sass/AppBackUserList/Add.vue             | 23 +++++++++++++-------
 src/sass/AppBackUserList/AppBackUserList.vue |  6 ++---
 src/sass/AppBackUserList/Qrcode.vue          | 20 ++++++++++++-----
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/sass/AppBackUserList/Add.vue b/src/sass/AppBackUserList/Add.vue
index d7c99751..a861d546 100644
--- a/src/sass/AppBackUserList/Add.vue
+++ b/src/sass/AppBackUserList/Add.vue
@@ -168,12 +168,12 @@
             <h2>到达地区</h2>
           </div>
           <div class="form-item__right">
-            <ai-area-picker
+            <AiAreaPicker
               ref="area"
               class="ai-area"
               :value="form.arriveAreaId"
               :fullName.sync="form.arriveAreaName"
-              :areaId="$areaId"
+              :areaId="areaId"
               mode="custom"
               @select="(v) => (form.arriveAreaId = v)"
             >
@@ -184,7 +184,7 @@
                 <i v-else>请选择</i>
                 <u-icon name="arrow-right" color="#ddd" />
               </div>
-            </ai-area-picker>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -251,7 +251,7 @@
             <h2>本人健康码截图或核酸检测报告</h2>
           </div>
           <div class="form-item__right">
-            <AiUploader v-model="form.checkPhoto" :limit="1"></AiUploader>
+            <AiUploader :def.sync="form.checkPhoto" :limit="1" action="/admin/file/add2"></AiUploader>
           </div>
         </div>
       </div>
@@ -389,12 +389,15 @@ export default {
         travelType: "",
         type: "",
         unusual: "",
+        arriveGirdId: '',
+        arriveGirdName: '',
+        corpId: '',
       },
       dictList: [],
       arr: [],
       gridList: [[], [], []],
       flag: false,
-      $areaId: "",
+      areaId: "",
     };
   },
 
@@ -403,9 +406,14 @@ export default {
     ...mapState(["user"]),
   },
 
-  onLoad() {
-    this.$areaId = this.user.$areaId;
+  onLoad(option) {
+    this.areaId = this.user.areaId;
     document.title = '返乡登记'
+    if(option.corpId) {
+      this.form.corpId = option.corpId
+    }
+    this.form.arriveGirdId = option.arriveGirdId
+    this.form.arriveGirdName = option.arriveGirdName
   },
 
   methods: {
@@ -531,7 +539,6 @@ export default {
       this.$http
         .post(`/app/appepidemicbackhomerecord/addOrUpdate`, {
           ...this.form,
-          openid: this.user.openid,
           startTime: this.form.startTime + ":00",
           arriveTime: this.form.arriveTime + ":00",
           checkTime: this.form.checkTime + " 00:00:00",
diff --git a/src/sass/AppBackUserList/AppBackUserList.vue b/src/sass/AppBackUserList/AppBackUserList.vue
index 50e52787..56c13d80 100644
--- a/src/sass/AppBackUserList/AppBackUserList.vue
+++ b/src/sass/AppBackUserList/AppBackUserList.vue
@@ -48,7 +48,7 @@
     </div>
     <div class="pad-b120"></div>
     <div class="footer">
-      <div class="bg-fff" @click="linkTo('./Add')">登记</div>
+      <div class="bg-fff" @click="linkTo(`./Add?arriveGirdId=${girdId}&arriveGirdName=${girdName}`)">登记</div>
       <div class="bg-blue" @click="show=true">邀请居民填写</div>
     </div>
     <u-popup v-model="show" mode="bottom" border-radius="14">
@@ -66,14 +66,14 @@
           <img src="./components/img/lj.png" alt="">
           <p>获取链接</p>
         </div>
-        <div class="item" @click="linkTo('./Qrcode')">
+        <div class="item" @click="linkTo(`./Qrcode?girdId=${girdId}&girdName=${girdName}`)">
           <img src="./components/img/ewm.png" alt="">
           <p>保存二维码</p>
         </div>
       </div>
       <div class="btn" @click="show=false">取消</div>
     </u-popup>
-    <u-select v-model="showSelect" :list="girdList" label-name="dictName" value-name="dictValue"  @confirm="confirmSelect"/>
+    <u-select v-model="showSelect" :list="girdList" label-name="girdName" value-name="id"  @confirm="confirmSelect"/>
   </div>
 </template>
 
diff --git a/src/sass/AppBackUserList/Qrcode.vue b/src/sass/AppBackUserList/Qrcode.vue
index 07d4ecd0..ef1d7b49 100644
--- a/src/sass/AppBackUserList/Qrcode.vue
+++ b/src/sass/AppBackUserList/Qrcode.vue
@@ -4,10 +4,10 @@
       <img src="./components/img/qrcode-header.png" alt="" class="header-img">
       <div class="code-content">
         <div class="img-div">
-          <img src="./components/img/ewm.png" alt="">
+          <img :src="imgUrl" alt="">
         </div>
         <p>扫二维码填写返乡人员信息</p>
-        <p>网格信息:千岩街网格</p>
+        <p>网格信息:{{girdName}}</p>
       </div>
     </div>
   </div>
@@ -19,7 +19,9 @@ import { mapState } from 'vuex'
 export default {
   data() {
     return {
-
+      girdName: '',
+      girdId: '',
+      imgUrl: ''
     }
   },
   computed: { ...mapState(['user']) },
@@ -27,10 +29,18 @@ export default {
     document.title = '返乡人员信息'
   },
   onLoad(option) {
-    
+    this.girdName = option.girdName
+    this.girdId = option.girdId
+    this.getQrcode()
   },
   methods: {
-    
+    getQrcode() {
+      this.$http.post(`/app/appepidemicbackhomerecord/addQrCodeURL?arriveGirdId=${this.girdId}&arriveGirdName=${this.girdName}`).then((res) => {
+        if (res.code == 0) {
+          this.imgUrl = res.data
+        }
+      })
+    }
   },
 }
 </script>