From 8f8eaa32437ee7228ab0e28f210f09e6539477fe Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Nov 2022 10:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppCommunityManagement/Add.vue  |  2 +-
 .../AppCommunityManagement/Detail.vue         | 24 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue
index d5a4a8a5..0f9319de 100644
--- a/src/project/pingchang/AppCommunityManagement/Add.vue
+++ b/src/project/pingchang/AppCommunityManagement/Add.vue
@@ -181,7 +181,7 @@ export default {
       if( !this.form.fileList.length) {
         return this.$u.toast('请上传图片')
       }
-      if(status == 1 && !this.form.proveFileList.length) {
+      if(status == 2 && !this.form.proveFileList.length) {
         return this.$u.toast('请上传核酸阴性证明图片')
       }
 
diff --git a/src/project/pingchang/AppCommunityManagement/Detail.vue b/src/project/pingchang/AppCommunityManagement/Detail.vue
index dda71122..5f0dd9f1 100644
--- a/src/project/pingchang/AppCommunityManagement/Detail.vue
+++ b/src/project/pingchang/AppCommunityManagement/Detail.vue
@@ -20,6 +20,10 @@
           <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" :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', info.lastRiskDisposal.handleType)}}</div>
+      </div>
       <div class="item-flex">
         <div class="label">居家状态</div>
         <div class="value">{{$dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
@@ -68,6 +72,13 @@
       </div>
     </div>
 
+    <div class="info" v-if="info.lastReportInfo.remarks">
+      <div class="item-flex border-none">
+        <div style="color:#999;">备注</div>
+      </div>
+      <p style="padding-bottom: 12px;">{{info.lastReportInfo.remarks}}</p>
+    </div>
+
     <div class="line-bg" style="padding-bottom: 56px;" v-if="info.status == 1"></div>
     <div class="footer" v-if="info.status == 1">
       <div class="cancel" @click="toEdit()">编辑</div>
@@ -91,7 +102,7 @@ export default {
     document.title = '管理信息'
   },
   onLoad(option) {
-    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
+    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy', 'EP_handleType').then(() => {
       this.id = option.id
       this.getDetail()
     })
@@ -181,15 +192,22 @@ export default {
           margin-right: 8px;
         }
       }
-      .color-0{
+      .color-0,
+      .type-1,
+      .type-5{
         color: #42D784;
       }
-      .color-1{
+      .color-1,
+      .type-2,
+      .type-3{
         color: #f46;
       }
       .color-2{
         color: #1365DD;
       }
+      .type-4{
+        color: #FFA938;
+      }
     }
     .img-list{
       padding-bottom: 32px;