From 6f59cfb856d1b2471e0a005d1c890585580ea226 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 12 Oct 2022 11:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E4=B9=A1=E6=8A=A5=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppHealthReport/Detail.vue      |   6 +-
 .../AppReturnHomeReporting.vue                |   4 +-
 .../AppReturnHomeReporting/ErrorInfo.vue      |   7 +-
 .../AppReturnHomeReporting/RiskContent.vue    | 122 ++----------------
 .../AppReturnHomeReporting/UserInfo.vue       |   4 +
 5 files changed, 23 insertions(+), 120 deletions(-)

diff --git a/src/project/pingchang/AppHealthReport/Detail.vue b/src/project/pingchang/AppHealthReport/Detail.vue
index a7021517..e6226cbe 100644
--- a/src/project/pingchang/AppHealthReport/Detail.vue
+++ b/src/project/pingchang/AppHealthReport/Detail.vue
@@ -17,11 +17,11 @@
           {{info.reportUser.phone}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">本地地区</div>
+        <div class="label">到达地区</div>
         <div class="value">{{info.reportUser.areaName}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">本地地址</div>
+        <div class="label">详细地址</div>
         <div class="value">{{info.reportUser.address}}</div>
       </div>
     </div>
@@ -61,7 +61,7 @@
       </div>
       <div class="item-flex">
         <div class="label">已接种试剂</div>
-        <div class="value" :style="info.vaccinationCount == 0 ? 'color:#f46;' : ''">{{$dict.getLabel('EP_vaccinationCount', info.vaccinationCount)}}</div>
+        <div class="value">{{$dict.getLabel('EP_vaccinationCount', info.vaccinationCount)}}</div>
       </div>
       <div class="item-flex border-none">
         <div class="label" style="width:100%;">本人健康码截图/核酸检测报告</div>
diff --git a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue
index 0040148e..a5617ff3 100644
--- a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue
@@ -48,9 +48,9 @@
           <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{item.startAreaName}}</span></p>
           <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{item.arriveAreaName}}</span></p>
           <p><img src="./components/img/time-icon.png" alt="">{{item.arriveTime}}</p>
-          <img :src="statusImgList[item.handleType]" alt="" class="status-img">
+          <img :src="statusImgList[item.handleType]" alt="" class="status-img" v-if="item.handleType == 5">
         </div>
-        <div class="bottom" v-if="item.handleType>0">
+        <div class="bottom" v-if="item.handleUserName">
           <div class="text">处置人：<span>{{item.handleUserName}}</span></div>
         </div>
       </div>
diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
index 35be1c96..678bacdb 100644
--- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="ErrorInfo">
     <div class="info">
-      <div class="title">基本信息<span class="title-right-btn" @click="showText(7)">新增风险记录</span></div>
+      <div class="title">基本信息</div>
       <div class="item-flex">
         <div class="label">姓名</div>
         <div class="value">{{info.name}}</div>
@@ -37,7 +37,7 @@
     <div class="bg-line"></div>
     <div class="footer">
       <div class="add" @click="toContent">社区初排</div>
-      <div class="confirm" @click="showText(5)">解除风险</div>
+      <div class="confirm" @click="showText(7)">新增风险记录</div>
     </div>
     <u-popup v-model="show" mode="bottom">
       <div class="textarea">
@@ -265,15 +265,14 @@ export default {
     font-size: 36px;
     font-family: PingFangSC-Regular, PingFang SC;
     .add {
-      flex: 1;
       color: #333;
     }
     .confirm {
-      flex: 2;
       color: #fff;
       background: #1365dd;
     }
     div {
+      flex: 1;
       text-align: center;
     }
   }
diff --git a/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue b/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue
index f778fd00..1523142d 100644
--- a/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue
@@ -1,116 +1,5 @@
 <template>
   <div class="RiskContent">
-    <div class="user-info">
-      <div class="user-list">
-        <div class="item">
-          <h2 class="name">{{info.name}}的返乡登记信息</h2>
-          <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
-          <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{info.arriveAreaName}}</span></p>
-          <p><img src="./components/img/time-icon.png" alt="">{{info.arriveTime}}</p>
-        </div>
-      </div>
-      <div class="info">
-        <div class="title">基本信息</div>
-        <div class="item-flex">
-          <div class="label">姓名</div>
-          <div class="value">{{info.name}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">身份证号</div>
-          <div class="value">{{info.idNumberText}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">联系方式</div>
-          <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
-            <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
-            {{info.phone}}
-          </div>
-        </div>
-        <div class="item-flex">
-          <div class="label">人员类别</div>
-          <div class="value">{{$dict.getLabel('EP_registerPersonType', info.type)}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">高危行业</div>
-          <div class="value">{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}</div>
-        </div>
-      </div>
-      <div class="line-bg"></div>
-      <div class="info">
-        <div class="title">行程信息</div>
-        <div class="item-flex">
-          <div class="label">出行方式</div>
-          <div class="value">
-            <span v-for="(item, index) in info.travelTypeList" :key="index"><span v-if="index>0">;</span>{{$dict.getLabel('EP_travelType',item)}}</span>
-          </div>
-        </div>
-        <div class="item-flex border-none" v-if="info.trainNo">
-          <div style="color:#999;">车次/车牌/航班</div>
-        </div>
-        <p class="line-text" v-if="info.trainNo">{{info.trainNo}}</p>
-        <div class="item-flex">
-          <div class="label">出发时间</div>
-          <div class="value" v-if="info.startTime">{{info.startTime.substring(0, 16)}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">出发地</div>
-          <div class="value" :style="{color: info.riskLevel == 2 ? '#FF4466' : '#333'}">{{info.startAreaName}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">出发地详址</div>
-          <div class="value">{{info.startAddress}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">行程描述</div>
-          <div class="value">{{info.description}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">抵平时间</div>
-          <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">目的地</div>
-          <div class="value">{{info.arriveAreaName}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">目的地详址</div>
-          <div class="value">{{info.arriveAddress}}</div>
-        </div>
-      </div>
-      <div class="line-bg"></div>
-      <div class="info">
-        <div class="title">健康状况</div>
-        <div class="item-flex">
-          <div class="label">是否有风险旅居史</div>
-          <div class="value" :style="info.fromHighRiskArea == 1 ? 'color:#f46;' : ''">{{$dict.getLabel('yesOrNo', info.fromHighRiskArea)}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label" style="width:360px;">7天内是否接触新冠确诊或疑似患者</div>
-          <div class="value" :style="info.contactPatients == 1 ? 'color:#f46;' : ''">{{$dict.getLabel('epidemicTouchInFourteen', info.contactPatients)}}</div>
-        </div>
-        <div class="item-flex">
-          <div class="label">当前健康状况</div>
-          <div class="value" >
-            <span v-if="info.abnormalHealth != 1">没有异常</span>
-            <span v-else style="color:#FF4466;">{{$dict.getLabel('EP_abnormalType', info.abnormalType)}}</span>
-          </div>
-        </div>
-      </div>
-      <div class="line-bg"></div>
-      <div class="info" v-if="info.companionList && info.companionList.length">
-        <div class="title">同行情况<span>共{{info.companionCount}}人同行</span></div>
-        <div class="table-content">
-          <div class="item table-header">
-            <div>姓名</div>
-            <div>手机号码</div>
-          </div>
-          <div class="item" v-for="(item, index) in info.companionList" :key="index">
-            <div>{{item.name}}</div>
-            <div>{{item.phone}}</div>
-          </div>
-        </div>
-      </div>
-    </div>
     <div class="form-info">
       <div class="info mar-b16">
         <div class="item">
@@ -177,6 +66,16 @@
           <u-input v-model="form.remarks" type="textarea" placeholder="请输入备注"  height="200" :custom-style="{'font-size': '17px'}" maxlength="500" />
         </div>
       </div>
+      <div class="info mar-b16" v-if="form.communityHandleType == 2">
+        <div class="item">
+          <div class="label" style="width:100%;">
+            <span class="tips">*</span>核酸阴性证明图片
+          </div>
+        </div>
+        <div style="padding: 0 16px 24px 0;" class="solid">
+          <AiUploader :def.sync="form.fileList" multiple placeholder="上传核酸阴性证明" :limit="1" action="/admin/file/add2"></AiUploader>
+        </div>
+      </div>
     </div>
     <div class="btn-height"></div>
     <div class="footer" @click="submit">提交</div>
@@ -194,6 +93,7 @@ export default {
       id: '',
       info: {},
       form: {
+        controlMethod: '',
         communityHandleType: '',
         homeStatus: '',
         quarantineBeginTime: '',
diff --git a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
index dab932bb..523b83d4 100644
--- a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
@@ -66,6 +66,10 @@
         <div class="label">抵平时间</div>
         <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
       </div>
+      <div class="item-flex">
+        <div class="label">抵平卡口</div>
+        <div class="value" v-if="info.gatewayName">{{info.gatewayName}}</div>
+      </div>
       <div class="item-flex">
         <div class="label">目的地</div>
         <div class="value">{{info.arriveAreaName}}</div>