From e73c339a998708369895375c8af56e669fd2e218 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 18 Nov 2022 13:58:45 +0800
Subject: [PATCH] bug

---
 .../apps/AppBayonetRegistration/components/Detail.vue        | 1 +
 .../apps/AppCommunityManagement/components/Detail.vue        | 1 +
 .../apps/AppCommunityManagement/components/List.vue          | 5 ++---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index 0a69cd96..91b0abf9 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -106,6 +106,7 @@
               <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 isLine label="备注" :value="item.remarks"></ai-info-item>
 
               <ai-info-item label="交接图片" isLine v-if="['3', '2', '6'].includes(item.handleType) && item.handoverPersonName">
                 <ai-uploader
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
index e774a689..28b95104 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -24,6 +24,7 @@
               <ai-info-item label="管控人" :value="info.controllerUserName"></ai-info-item>
               <ai-info-item label="联系方式" :value="info.controllerUserPhone"></ai-info-item>
               <ai-info-item label="管理内容" isLine :value="info.controllerContent"></ai-info-item>
+              <ai-info-item isLine label="备注" :value="info.remarks"></ai-info-item>
               <ai-info-item label="图片" isLine>
                 <ai-uploader
                   :instance="instance"
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
index e2262843..c29c5e95 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -93,11 +93,10 @@
           { prop: 'idNumber',  label: '身份证号', align: 'center' },
           { prop: 'createTime', label: '抵平时间', align: 'center' },
           { prop: 'areaName',  label: '所属地区', align: 'center' },
-          { prop: 'arriveAddress',  label: '目的地详址', align: 'center' },
+          { prop: 'remarks',  label: '备注', align: 'center' },
           { prop: 'status', label: '管理状态', align: 'center', formart: v => this.dict.getLabel('EP_CM_status', v) },
           { prop: 'controllerUserName',  label: '管控人', align: 'center' },
-          { prop: 'nucleicAcidSamplingCount',  label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' },
-          // { prop: 'infoType', label: '对象来源', align: 'center', formart: v => this.dict.getLabel('EP_registerInfoType', v) },
+          { prop: 'nucleicAcidSamplingCount',  label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' }
         ],
         tableData: []
       }