From b1603f3b29150baf79d3432e802b2691bee21bce Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 27 Sep 2022 11:13:11 +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

---
 .../pingchang/AppReturnHomeRegister/Add.vue   | 159 ++++++++++--------
 .../AppReturnHomeRegister.vue                 |  18 +-
 .../AppReturnHomeRegister/Detail.vue          |   6 +-
 3 files changed, 102 insertions(+), 81 deletions(-)

diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue
index bcf5c45..610e691 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Add.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="album">
-    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
+    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>、
+
+    <div class="title">基本信息</div>
     <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>返乡人员姓名</h2>
+            <h2>姓名</h2>
           </div>
           <div class="form-item__right">
             <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
@@ -46,19 +48,21 @@
           </div>
         </div>
       </div>
-    </div>
-    <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>出行方式</h2>
+            <h2>高危行业</h2>
           </div>
           <div class="form-item__right">
-            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
+            <AiSelect v-model="form.type" dict="epidemicRecentPersonType" class="select"></AiSelect>
           </div>
         </div>
       </div>
+    </div>
+
+    <div class="title">行程信息</div>
+    <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
@@ -109,7 +113,41 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>到达时间</h2>
+            <h2>出行方式</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>车次/航班</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>行程描述</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
+                      placeholder-style="font-size: 16px"></textarea>
+          </div>
+        </div>
+      </div>    
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>抵平时间</h2>
           </div>
           <div class="form-item__right">
             <div class="ai-area" @click="isShowEndTime = true">
@@ -126,7 +164,18 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>到达地区</h2>
+            <h2>抵平卡口</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>返乡地区</h2>
           </div>
           <div class="form-item__right">
             <AiAreaPicker class="ai-area" v-model="form.arriveAreaId" :fullName.sync="form.arriveAreaName" :areaId="$areaId">
@@ -151,34 +200,35 @@
           </div>
         </div>
       </div>
-      <div class="form-item form-item__textarea">
+    </div>
+
+    <div class="title">健康状况</div>
+    <div class="form-item__group">
+      <div class="form-item form-item__imgs">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>行程描述</h2>
+            <h2>是否有风险旅居史？</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
-                      placeholder-style="font-size: 16px"></textarea>
+            <AiRadio style="width: 100%;" v-model="form.touchInFourteen" dict="yesOrNo"></AiRadio>
           </div>
         </div>
       </div>
-    </div>
-    <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>核酸检测日期</h2>
+            <h2>风险地区</h2>
           </div>
           <div class="form-item__right">
-            <div class="ai-area" @click="isShowDate = true">
+            <AiAreaPicker class="ai-area" v-model="form.startAreaId" :fullName.sync="form.startAreaName" all>
               <div class="ai-area__wrapper">
-                <span class="label" v-if="form.checkTime">{{ form.checkTime }}</span>
+                <span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span>
                 <i v-else>请选择</i>
                 <u-icon name="arrow-right" color="#ddd"/>
               </div>
-            </div>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -186,64 +236,30 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>本人健康码截图或核酸检测报告<span style="color:#999; fontSize:14px; font-weight: normal;">(最多9张)</span></h2>
-          </div>
-          <div class="form-item__right" style="padding-left: 5px;">
-            <AiUploader v-model="form.checkPhoto" :limit="9" multiple></AiUploader>
-          </div>
-        </div>
-      </div>
-      <div class="form-item form-item__imgs">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>核酸检测结果</h2>
+            <h2>近七日内是否接触新冠确诊或疑似患者？</h2>
           </div>
           <div class="form-item__right">
-            <AiRadio style="width: 100%;" v-model="form.checkResult" dict="epidemicRecentTestResult"/>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="form-item__group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>当前体温</h2>
-          </div>
-          <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.temperature" :maxlength="20"/>
-            <i>℃</i>
-          </div>
-        </div>
-      </div>
-      <div class="form-item form-item__imgs">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>14天内是否接触新冠确诊或疑似患者</h2>
-          </div>
-          <div class="form-item__right">
-            <AiRadio style="width: 100%;" v-model="form.touchInFourteen" dict="epidemicTouchInFourteen"></AiRadio>
-          </div>
-        </div>
-      </div>
-      <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">
-            <AiCheckbox style="width: 100%;" v-model="form.health" dict="epidemicRecentHealth"></AiCheckbox>
+            <AiRadio style="width: 100%;" v-model="form.health" dict="epidemicTouchInFourteen"></AiRadio>
+          </div>
+        </div>
+      </div>
+      <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">
+            <AiRadio style="width: 100%;" v-model="form.health" dict="yesOrNo"></AiRadio>
           </div>
         </div>
       </div>
     </div>
+
     <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker>
     <u-picker mode="time" :params="params" v-model="isShowStartTime" @confirm="onStartChange"></u-picker>
     <u-picker mode="time" :params="params" v-model="isShowEndTime" @confirm="onEndChange"></u-picker>
+
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" @click="submit">提交</div>
     </div>
@@ -456,6 +472,15 @@ export default {
     background: #FFF8F3;
   }
 
+  .title {
+    padding: 16px 32px 0 32px;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 36px;
+    font-weight: 600;
+  }
+
+
   .form-item__group {
     margin-bottom: 24px;
     background: #fff;
diff --git a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
index a783973..a28e5a8 100644
--- a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -18,15 +18,15 @@
         <p>{{ item.idNumber.replace(/^(\d{6})\d{8}(.{4}$)/g, `$1${Array(9).join('*')}$2`) }}</p>
         <div class="item-info">
           <div class="item-info__item">
-            <image src="/static/img/from-icon.png"/>
+            <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/from-icon.png"/>
             <span>{{ item.startAreaName }}</span>
           </div>
           <div class="item-info__item">
-            <image src="/static/img/to-icon.png"/>
+            <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/to-icon.png"/>
             <span>{{ item.arriveAreaName }}</span>
           </div>
           <div class="item-info__item">
-            <image src="/static/img/to-date.png"/>
+            <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/to-date.png"/>
             <span>{{ item.arriveTime && item.arriveTime.substr(0, item.arriveTime.length - 3) }} 到达</span>
           </div>
         </div>
@@ -74,21 +74,17 @@ export default {
       this.$linkTo('./Add')
     },
     getList() {
-      this.$instance.post(`/app/appepidemicbackhomerecord/list`, null, {
+      this.$instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
         params: {
-          openId: this.user.openId,
+          infoType: '1',
           current: this.current,
-          size: 15
+          size: 10,
         }
       }).then(res => {
         uni.hideLoading()
         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]
         }
       }).catch(() => {
         uni.hideLoading()
diff --git a/src/project/pingchang/AppReturnHomeRegister/Detail.vue b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
index e039891..55802f0 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Detail.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
@@ -4,15 +4,15 @@
       <h2>{{ info.name }}的返乡登记信息</h2>
       <div class="item-info">
         <div class="item-info__item">
-          <image src="/static/img/from-icon.png"/>
+          <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/from-icon.png"/>
           <span>{{ info.startAreaName }}</span>
         </div>
         <div class="item-info__item">
-          <image src="/static/img/to-icon.png"/>
+          <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/to-icon.png"/>
           <span>{{ info.arriveAreaName }}</span>
         </div>
         <div class="item-info__item">
-          <image src="/static/img/to-date.png"/>
+          <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/to-date.png"/>
           <span>{{ info.arriveTime && info.arriveTime.substr(0, info.arriveTime.length - 3) }} 到达</span>
         </div>
       </div>