From 2faf80cc2232f5a9886f7e191f97417c3d024e9c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Sun, 9 Oct 2022 14:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8F=91=E5=9C=B0=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E9=80=89=E8=87=B3=E5=8E=BF=E7=BA=A7=E5=8F=8A=E4=BB=A5=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGetewayRegister/getewayAdd.vue         |  5 +-
 .../AppReturnHomeRegister/Detail.vue          | 58 +++++--------------
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
index 4e1866a..075f67c 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
@@ -572,8 +572,9 @@ export default {
         return this.$toast('请选择出发地')
       }
 
-      if (this.startAreaId.substr(this.startAreaId.length - 3, 3) === '000') {
-        return this.$toast('出发地必须选到村或社区')
+      if (this.startAreaId.substr(4,this.startAreaId.length - 4) === '00000000') {
+        return this.$toast('出发地必须选至县级及以下')
+        // return console.log(this.startAreaId.substr(6,this.startAreaId.length - 6));
       }
 
       // if (!this.form.startAddress) {
diff --git a/src/project/pingchang/AppReturnHomeRegister/Detail.vue b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
index f203a8e..6ea89ed 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Detail.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
@@ -13,7 +13,6 @@
         </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">
@@ -22,6 +21,7 @@
         </div>
       </div>
     </div>
+
     <div class="detail-info">
       <h2>基本信息</h2>
       <div class="detail-info__item">
@@ -67,6 +67,7 @@
         </div>
       </div>
     </div>
+
     <div class="detail-info">
       <h2>行程信息</h2>
       <div class="detail-info__item">
@@ -134,53 +135,23 @@
         </div>
       </div>
     </div>
-    <div class="detail-info">
-      <h2>核酸检测信息</h2>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>核酸检测日期</label>
-        </div>
-        <div class="right">
-          <span>{{ info.checkTime.split(' ')[0] }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>核酸检测结果</label>
-        </div>
-        <div class="right">
-          <span :style="{color: info.checkResult === '0' ? '#42D784' : '#FF4466'}">{{
-              $dict.getLabel('epidemicRecentTestResult', info.checkResult)
-            }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item detail-info__item--img">
-        <div class="left" style="max-width: 100%;">
-          <label>本人健康码截图或核酸检测报告</label>
-        </div>
-        <div class="right">
-          <image :src="item.url" @click="preview(item.url)" v-for="(item, index) in info.checkPhoto" :key="index"/>
-        </div>
-      </div>
-    </div>
+
     <div class="detail-info">
       <h2>健康状况</h2>
       <div class="detail-info__item">
         <div class="left">
-          <label>当前体温</label>
+          <label>是否有风险旅居史？</label>
         </div>
         <div class="right">
-          <span :style="{color: info.temperature >= 37.3 ? '#FF4466' : '#42D784'}">{{ info.temperature }}℃</span>
+          <span :style="{ color: info.fromHighRiskArea==1? '#FF4466' : '#42D784'}">{{ info.fromHighRiskArea==1? info.highRiskAreaName: '否' }}</span>
         </div>
       </div>
       <div class="detail-info__item">
         <div class="left">
-          <label>14天内是否接触新冠确诊或疑似患者</label>
+          <label>7天内是否接触新冠确诊或疑似患者？</label>
         </div>
         <div class="right">
-          <span :style="{color: info.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{
-              $dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)
-            }}</span>
+          <span :style="{ color: info.contactPatients==1? '#FF4466' : info.contactPatients==2? '': '#42D784'}">{{ $dict.getLabel('epidemicTouchInFourteen', info.contactPatients) }}</span>
         </div>
       </div>
       <div class="detail-info__item">
@@ -188,10 +159,14 @@
           <label>当前健康状况</label>
         </div>
         <div class="right">
-          <span :style="{color: !info.isHealth ? '#42D784' : '#FF4466'}">{{ info.healthName }}</span>
+          <span :style="{ color: info.abnormalType? '#FF4466' :'#42D784'}">{{ $dict.getLabel('EP_abnormalType',info.abnormalType) || '没有出现症状' }}</span>
         </div>
       </div>
     </div>
+
+    <div class="btn-wrapper" v-if="info.handleType == 0">
+      <div class="btn" @click="$linkTo(`./Add?id=${info.id}`)" hover-class="text-hover">编辑</div>
+    </div>
   </div>
 </template>
 
@@ -207,15 +182,11 @@ export default {
 
   onLoad(query) {
     this.$loading()
-    this.$dict.load(['EP_highRiskIndustries', 'EP_registerPersonType', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => {
+    this.$dict.load(['EP_highRiskIndustries', 'EP_registerPersonType', 'EP_abnormalType', 'EP_riskLevel', 'EP_travelType']).then(() => {
       this.getInfo(query.id)
     })
   },
 
-  onShow() {
-    this.getInfo(query.id)
-  },
-
   methods: {
     preview(url) {
       uni.previewImage({
@@ -248,7 +219,8 @@ export default {
 
 <style lang="scss">
 .detail {
-  padding-bottom: 40px;
+  padding-bottom: 130px;
+  box-sizing: border-box;
 
   .detail-header {
     padding: 32px;