From eef85d2dcba52318a39b0fc5b0616c1e4130ee70 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Sun, 9 Oct 2022 11:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppReturnHomeRegister/Detail.vue          | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/project/pingchang/AppReturnHomeRegister/Detail.vue b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
index 55802f0..f203a8e 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Detail.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
@@ -13,8 +13,13 @@
         </div>
         <div class="item-info__item">
           <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/to-date.png"/>
+          <!-- <p>{{ info.arriveTime.substr(0, info.arriveTime.length - 3) }}</p> -->
           <span>{{ info.arriveTime && info.arriveTime.substr(0, info.arriveTime.length - 3) }} 到达</span>
         </div>
+        <div class="item-info__item">
+          <image src="https://cdn.cunwuyun.cn/wxmp/pingchang/kakou.png"/>
+          <span>{{ info.gatewayName }}</span>
+        </div>
       </div>
     </div>
     <div class="detail-info">
@@ -37,7 +42,7 @@
       </div>
       <div class="detail-info__item">
         <div class="left">
-          <label>手机号码</label>
+          <label>联系方式</label>
         </div>
         <div class="right" @click="call(info.phone)" hover-class="text-hover">
           <image src="https://cdn.cunwuyun.cn/dvcp/h5/common/phone.png"/>
@@ -49,9 +54,16 @@
           <label>人员类别</label>
         </div>
         <div class="right">
-          <span :style="{color: /[03]/.test(info.type) ? '#42D784' : '#FF4466'}">{{
-              $dict.getLabel('epidemicMemberType', info.type)
-            }}</span>
+          <!-- :style="{color: /[03]/.test(info.type) ? '#42D784' : '#FF4466'}" -->
+          <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>
@@ -195,11 +207,15 @@ export default {
 
   onLoad(query) {
     this.$loading()
-    this.$dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => {
+    this.$dict.load(['EP_highRiskIndustries', 'EP_registerPersonType', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => {
       this.getInfo(query.id)
     })
   },
 
+  onShow() {
+    this.getInfo(query.id)
+  },
+
   methods: {
     preview(url) {
       uni.previewImage({
@@ -209,25 +225,14 @@ export default {
     },
 
     getInfo(id) {
-      this.$instance.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${id}`).then(res => {
+      this.$instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
         if (res.code === 0) {
           this.info = res.data
-          this.info.checkPhoto = JSON.parse(res.data.checkPhoto)
-          let healthName = ''
-          this.info.isHealth = false
-          res.data.health.split(',').forEach(v => {
-            if (v > 0) {
-              this.info.isHealth = true
-            }
-            healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
-          })
-          this.info.healthName = healthName
-
-          this.$nextTick(() => {
-            this.pageShow = true
-          })
+          this.info = res.data
+          this.companionList = res.data.companionList
+          this.travelType = res.data.travelType?.split(',')
+          this.pageShow = true
         }
-
         this.$hideLoading()
       })
     },