From 6577e406a467e882f03a7e263cffc1468f627785 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 18 Oct 2022 15:13:33 +0800
Subject: [PATCH] bug

---
 .../components/Detail.vue                     | 60 +++++++++++++++----
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index ae445d70..4f0e41b5 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -86,28 +86,39 @@
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="处理意见">
+        <ai-card title="卡口处置意见">
           <template #content>
             <ai-wrapper
               style="margin-bottom: 20px;"
               v-for="item in info.riskDisposalList"
               :key="item.id"
               label-width="120px">
-              <ai-info-item label="处理人员" :value="info.createUserName"></ai-info-item>
+              <ai-info-item label="处置人员" :value="info.createUserName"></ai-info-item>
               <ai-info-item label="联系电话" :value="info.createUserPhone"></ai-info-item>
-              <ai-info-item label="处理意见" :value="dict.getLabel('EP_handleType', item.handleType)"></ai-info-item>
+              <ai-info-item label="处置意见" :value="dict.getLabel('EP_handleType', item.handleType)"></ai-info-item>
               <ai-info-item v-if="item.handleType === '2'" label="集中隔离地" :value="dict.getLabel('EP_quarantineAddress', item.quarantineAddress)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="移交对象" :value="dict.getLabel('EP_handoverObject', item.handoverObject)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="移交方式" :value="dict.getLabel('EP_handoverMethod', item.handoverMethod)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="交接人员姓名" :value="info.handoverPersonName"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="手机号" :value="info.handoverPersonPhone"></ai-info-item>
+              <ai-info-item label="居家状态" v-if="item.handleType === '3'" :value="dict.getLabel('EP_homeStatus', communityInfo.homeStatus)"></ai-info-item>
               <ai-info-item
-                v-if="['2'].includes(item.handleType)"
+                v-if="['2', '3'].includes(item.handleType)"
                 label="隔离时间"
                 :value="item.quarantineBeginTime ? item.quarantineBeginTime + '至' + item.quarantineEndTime : ''">
               </ai-info-item>
-              <ai-info-item v-if="['2'].includes(item.handleType)" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy)"></ai-info-item>
-              <ai-info-item label="图片" isLine v-if="['3', '6'].includes(item.handleType)">
+              <ai-info-item label="隔离策略" v-if="['2', '3'].includes(item.handleType)" :value="dict.getLabel('EP_quarantineStrategy', communityInfo.quarantineStrategy)"></ai-info-item>
+              <ai-info-item label="管控方式" isLine v-if="['3'].includes(item.handleType)" :value="dict.getLabel('EP_controlMethod', item.controlMethod)"></ai-info-item>
+              <!-- <ai-info-item label="附件" isLine v-if="['3'].includes(item.handleType)">
+                <ai-uploader
+                  :instance="instance"
+                  :value="item.fileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item> -->
+              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="移交对象" :value="dict.getLabel('EP_handoverObject', item.handoverObject)"></ai-info-item>
+              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="移交方式" :value="dict.getLabel('EP_handoverMethod', item.handoverMethod)"></ai-info-item>
+              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="交接人员姓名" :value="item.handoverPersonName"></ai-info-item>
+              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="手机号" :value="item.handoverPersonPhone"></ai-info-item>
+
+              <ai-info-item label="交接图片" isLine v-if="['3', '2', '6'].includes(item.handleType)">
                 <ai-uploader
                   :instance="instance"
                   :value="item.fileList"
@@ -119,6 +130,31 @@
             <ai-empty style="margin-bottom: 60px;" v-if="info.riskDisposalList && !info.riskDisposalList.length"></ai-empty>
           </template>
         </ai-card>
+        <ai-card title="社区处置意见">
+          <template #content>
+            <ai-wrapper
+              style="margin-bottom: 20px;"
+              v-if="communityInfo.communityHandleType"
+              label-width="120px">
+              <ai-info-item label="处置人员" :value="communityInfo.createUserName"></ai-info-item>
+              <ai-info-item label="联系电话" :value="communityInfo.createUserPhone"></ai-info-item>
+              <ai-info-item label="处置意见" :value="dict.getLabel('EP_handleType', communityInfo.handleType)"></ai-info-item>
+              <ai-info-item label="居家状态" :value="dict.getLabel('EP_homeStatus', communityInfo.homeStatus)"></ai-info-item>
+              <ai-info-item label="隔离时间" :value="communityInfo.quarantineBeginTime ? communityInfo.quarantineBeginTime + '至' + communityInfo.quarantineEndTime : ''"></ai-info-item>
+              <ai-info-item label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', communityInfo.quarantineStrategy)"></ai-info-item>
+              <ai-info-item label="管控方式" :value="dict.getLabel('EP_controlMethod', communityInfo.controlMethod)"></ai-info-item>
+              <ai-info-item label="图片" isLine v-if="['3', '6'].includes(communityInfo.handleType)">
+                <ai-uploader
+                  :instance="instance"
+                  :value="item.fileList"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+            <ai-empty style="margin-bottom: 60px;" v-if="!communityInfo.communityHandleType"></ai-empty>
+          </template>
+        </ai-card>
       </div>
     </template>
   </ai-detail>
@@ -141,6 +177,7 @@
         currIndex: 0,
         isLoading: false,
         tableData: [],
+        communityInfo: {},
         colConfigs: [
           {prop: 'name', label: '姓名', align: 'center' },
           {prop: 'phone', label: '手机号', align: 'center'}
@@ -165,7 +202,8 @@
         this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.info.checkPhoto = res.data.checkPhoto ? JSON.parse(res.data.checkPhoto) : []
+            this.info.communityHandleType = res.data.communityHandleType.filter(v => !v.communityHandleType)
+            this.communityInfo = res.data.communityHandleType.filter(v => v.communityHandleType).length ? res.data.communityHandleType.filter(v => v.communityHandleType)[0] : {}
 
             this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
               return this.dict.getLabel('EP_travelType', v)