From 710c17567ff72ea413c3f64979e74a95b3b9b7f1 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 15 Nov 2022 11:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=8F=A3=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGetewayRegister/getewayAdd.vue         | 37 +++++++++++--------
 .../AppReturnHomeRegister/Detail.vue          |  5 +--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
index a31bca7..6c560c8 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
@@ -311,6 +311,7 @@
 <script>
 import { mapState, mapActions } from 'vuex'
 import NamePhone from './components/namePhone.vue'
+import dayjs from 'dayjs'
 export default {
   appName: "添加卡口记录",
   data() {
@@ -335,11 +336,11 @@ export default {
         arriveAreaId: '',
         arriveAreaName: '',
         arriveAddress: '',
-        fromHighRiskArea: '',
+        fromHighRiskArea: '0',
         highRiskAreaId: '',
         highRiskAreaName: '',
-        contactPatients: '',
-        abnormalHealth: '',
+        contactPatients: '0',
+        abnormalHealth: '0',
         abnormalType: '',
         companionCount: '',  // 同行人数量
         companionList: [],  // 同行人集合
@@ -388,6 +389,8 @@ export default {
     if(decodeURIComponent(o.scene) != 'undefined') {
       this.scene = decodeURIComponent(o.scene)
     }
+    let timeNow = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
+    this.form.arriveTime = timeNow.substr(0,timeNow.length - 3)
   },
   onShow() {
     this.$dict.load(['EP_travelType']).then(()=> {
@@ -422,19 +425,16 @@ export default {
     ...mapActions(['getUserInfo']),
     // 授权登录
     getAuth() {
-      
       this.$nextTick(() => {
-        // if(this.token) {
-          this.token && this.getUserInfo()
-          this.form.gatewayId = this.scene
-          this.getewayList()
-          this.$forceUpdate()
-          setTimeout(()=>{
-            let item = this.getewayData.filter(item=> item.value == this.scene)
-            this.form.gatewayName = item?.[0].label
-          },400)
-          this.pageShow = true
-        // } 
+        this.token && this.getUserInfo()
+        this.form.gatewayId = this.scene
+        this.getewayList()
+        this.$forceUpdate()
+        setTimeout(()=>{
+          let item = this.getewayData.filter(item=> item.value == this.scene)
+          this.form.gatewayName = item?.[0].label
+        },400)
+        this.pageShow = true
       })
     },
 
@@ -475,7 +475,7 @@ export default {
           this.form.startTime = res.data.startTime.substr(0, res.data.startTime.length - 3)
           this.form.arriveTime = res.data.arriveTime.substr(0, res.data.arriveTime.length - 3)
           this.startAreaId = res.data.startAreaId
-          this.arriveAreaName = res.data.startAreaName
+          this.startAreaName = res.data.startAreaName
         }
         this.$hideLoading()
       })
@@ -523,6 +523,11 @@ export default {
         if(res?.data) {
           this.form.name = res.data.name || ''
           this.form.phone = res.data.phone || ''
+          this.startAreaId = res.data.startAreaId
+          this.startAreaName = res.data.startAreaName
+          this.form.description = res.data.description || ''
+          this.form.arriveAreaId = res.data.arriveAreaId
+          this.form.arriveAreaName = res.data.arriveAreaName
         }
       })
     },
diff --git a/src/project/pingchang/AppReturnHomeRegister/Detail.vue b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
index 9ef8df0..c74a806 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Detail.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
@@ -49,12 +49,11 @@
           <span style="color: #4181FF">{{ info.phone }}</span>
         </div>
       </div>
-      <div class="detail-info__item">
+      <!-- <div class="detail-info__item">
         <div class="left">
           <label>人员类别</label>
         </div>
         <div class="right">
-          <!-- :style="{color: /[03]/.test(info.type) ? '#42D784' : '#FF4466'}" -->
           <span>{{ $dict.getLabel('EP_registerPersonType', info.type) }}</span>
         </div>
       </div>
@@ -65,7 +64,7 @@
         <div class="right">
           <span>{{ $dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries) }}</span>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <div class="detail-info">