From 7806ad49819afd9a9d13020dc566d3264f9637c3 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 27 Sep 2022 13:51:28 +0800
Subject: [PATCH] 31052

---
 .../AppGetewayRegister/getewayAdd.vue         |  1 -
 .../AppGetewayRegister/getewayDetail.vue      |  8 ++++
 .../pingchang/AppReturnHomeRegister/Add.vue   | 39 +++++++++++++------
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
index 5f7fb8f..aa35cdb 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
@@ -128,7 +128,6 @@
             <h2>出行方式</h2>
           </div>
           <div class="form-item__right">
-            <!-- <AiCheckbox style="width: 100%;" v-model="travelType" dict="EP_travelType"/> -->
             <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>
diff --git a/src/project/pingchang/AppGetewayRegister/getewayDetail.vue b/src/project/pingchang/AppGetewayRegister/getewayDetail.vue
index d35416d..3536890 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayDetail.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayDetail.vue
@@ -56,6 +56,14 @@
           <span>{{ $dict.getLabel('EP_registerPersonType', info.type) }}</span>
         </div>
       </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>高危行业</label>
+        </div>
+        <div class="right">
+          <span>{{ $dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries) }}</span>
+        </div>
+      </div>
     </div>
     <div class="detail-info">
       <h2>行程信息</h2>
diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue
index 610e691..928526b 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Add.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="album">
-    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>、
+    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
 
     <div class="title">基本信息</div>
     <div class="form-item__group">
@@ -55,7 +55,7 @@
             <h2>高危行业</h2>
           </div>
           <div class="form-item__right">
-            <AiSelect v-model="form.type" dict="epidemicRecentPersonType" class="select"></AiSelect>
+            <AiSelect v-model="form.highRiskIndustries" dict="EP_highRiskIndustries" class="select"></AiSelect>
           </div>
         </div>
       </div>
@@ -116,7 +116,7 @@
             <h2>出行方式</h2>
           </div>
           <div class="form-item__right">
-            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
+            <AiSelect dict="EP_travelType" v-model="form.travelType" class="select"></AiSelect>
           </div>
         </div>
       </div>
@@ -127,7 +127,7 @@
             <h2>车次/航班</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
+            <input placeholder="请输入" v-model="form.trainNo" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -290,10 +290,28 @@ export default {
         day: true
       },
       form: {
-        arriveAddress: '',
+        infoType: '1',
+        name: '',
+        idNumber: '',
+        phone: '',
+        type: '',
+        highRiskIndustries: '',  // 高危行业
+        startTime: '',
+        startAreaId: '',
+        startAreaName: '',
+        startAddress: '',
+        travelType: '',  // 出行方式
+        trainNo: '',
+        description: '',
+        arriveTime: '',
+        arriveAreaId: '',  // 预计到达卡口id
+        gatewayId: '',   // 卡口id
+        gatewayName: '',
         arriveAreaId: '',
         arriveAreaName: '',
-        arriveTime: '',
+        arriveAddress: '',
+        
+        
         checkPhoto: [],
         checkResult: '',
         checkTime: '',
@@ -302,10 +320,9 @@ export default {
         idNumber: '',
         name: '',
         phone: '',
-        startAddress: '',
-        startAreaId: '',
-        startAreaName: '',
-        startTime: '',
+        
+        
+        
         temperature: '',
         touchInFourteen: '',
         travelType: '',
@@ -628,7 +645,7 @@ export default {
 
       h2 {
         padding: 0 4px;
-        font-weight: 600;
+        font-weight: 400;
         font-size: 32px;
         color: #333333;
       }