From f948203f587892b0ec0d4084bc710e391edaca50 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 28 Sep 2022 15:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppHealthReport/AddReport.vue   |  4 +-
 .../AppHealthReport/AppHealthReport.vue       | 14 ++---
 .../pingchang/AppReturnHomeRegister/Add.vue   | 55 +++++++++++++++++--
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/src/project/pingchang/AppHealthReport/AddReport.vue b/src/project/pingchang/AppHealthReport/AddReport.vue
index 73b57af..18adf99 100644
--- a/src/project/pingchang/AppHealthReport/AddReport.vue
+++ b/src/project/pingchang/AppHealthReport/AddReport.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="album">
+  <div class="AddReport">
     <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
     <div class="form-item__group">
       <div class="form-item">
@@ -262,7 +262,7 @@ export default {
 </script>
 
 <style lang="scss">
-.album {
+.AddReport {
   padding-bottom: 140px;
 
   .tips {
diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
index 4b2219b..3b1bd97 100644
--- a/src/project/pingchang/AppHealthReport/AppHealthReport.vue
+++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
@@ -82,27 +82,21 @@ export default {
     },
 
     getList() {
-
-      this.$instance.post(`/app/appepidemicreportmember/list?openId=${this.user.openId}`, null, {
+      this.$instance.post(`/app/appepidemicpreventionhealthreportinfo/reportUserList`, null, {
         params: {
+          createUserId: this.user.id,
           current: this.current,
           size: 15
         }
       }).then(res => {
-        if (res.code == 0) {
+        if (res?.data) {
           this.total = res.data.total
-          if (this.current > 1) {
-            this.list = [...this.list, ...res.data.records]
-          } else {
-            this.list = res.data.records
-          }
+          this.list = this.current == 1? res.data.records : [...this.list, ...res.data.records]
           uni.hideLoading()
           this.pageShow = true
           if (res.data.records.length < 15) {
-
             return false
           }
-
           this.current = this.current + 1
         } else {
           uni.hideLoading()
diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue
index 928526b..166bb45 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Add.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="album">
+  <div class="add">
     <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
 
     <div class="title">基本信息</div>
@@ -109,14 +109,16 @@
           </div>
         </div>
       </div>
-      <div class="form-item">
+      <div class="form-item form-item__imgs">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
             <h2>出行方式</h2>
           </div>
           <div class="form-item__right">
-            <AiSelect dict="EP_travelType" v-model="form.travelType" class="select"></AiSelect>
+            <div class="travelType">
+              <div class="travelItem" v-for="(v,index) in travelTypeDict" :key="index" :class="[travelType.includes(v.dictValue)? 'active':'']" @click="travelTypeSelect(v.dictValue)">{{ v.dictName }}</div>
+            </div>
           </div>
         </div>
       </div>
@@ -254,6 +256,17 @@
           </div>
         </div>
       </div>
+      <div class="form-item" v-if="form.abnormalHealth==1">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>异常情况</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect dict="EP_abnormalType" v-model="form.abnormalType" class="select"></AiSelect>
+          </div>
+        </div>
+      </div>
     </div>
 
     <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker>
@@ -333,7 +346,9 @@ export default {
       arr: [],
       gridList: [[], [], []],
       flag: false,
-      $areaId: ''
+      $areaId: '',
+      travelTypeDict: [],
+      travelType: [],
     }
   },
 
@@ -344,6 +359,7 @@ export default {
 
   onLoad() {
     this.$areaId = this.user.$areaId
+    this.travelTypeDict = this.$dict.getDict('epidemicRecentTravel')
   },
 
   methods: {
@@ -359,6 +375,15 @@ export default {
       this.form.arriveTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
     },
 
+    travelTypeSelect(value) {
+      const index = this.travelType.indexOf(value)
+      if (index === -1) {
+        this.travelType.push(value)
+      } else {
+        this.travelType.splice(index, 1)
+      }
+    },
+
     submit() {
       if (!this.form.name) {
         return this.$toast('请输入返乡人员姓名')
@@ -477,7 +502,7 @@ export default {
 </script>
 
 <style lang="scss">
-.album {
+.add {
   padding-bottom: 140px;
 
   .tips {
@@ -620,6 +645,26 @@ export default {
           margin-right: 8px;
           color: #999999;
         }
+        .travelType {
+          width: 100%;
+          .travelItem {
+            width: 100%;
+            line-height: 1.3;
+            padding: 20px 32px;
+            margin-bottom: 16px;
+            text-align: center;
+            background: #FFFFFF;
+            box-sizing: border-box;
+            border-radius: 16px;
+            color: #333333;
+            font-size: 28px;
+            border: 1px solid #CCCCCC;
+          }
+
+          .active {
+            background: #4181FF;
+          }
+        }
       }
     }