From ddd4bfc0332ecf9091dd251ac1953fc80e2e0881 Mon Sep 17 00:00:00 2001
From: yanran200830 <yanran200830@163.com>
Date: Fri, 25 Nov 2022 17:06:08 +0800
Subject: [PATCH] bug

---
 project/pidu/app/AppGoods/components/Add.vue                | 6 ++++--
 .../apps/AppCommunityManagement/components/Detail.vue       | 2 +-
 .../apps/AppCommunityManagement/components/List.vue         | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/Add.vue b/project/pidu/app/AppGoods/components/Add.vue
index af4ed389..b3aa3915 100644
--- a/project/pidu/app/AppGoods/components/Add.vue
+++ b/project/pidu/app/AppGoods/components/Add.vue
@@ -108,10 +108,12 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appintegralmerchandise/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.form = res.data
-            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+            this.form.imageUrl = [{
+              url: res.data.imageUrl
+            }]
           }
         })
       },
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
index 9aa6dc4b..30d1d823 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -24,7 +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.lastRiskDisposal.remarks"></ai-info-item>
+              <ai-info-item isLine label="备注" v-if="info.lastRiskDisposal" :value="info.lastRiskDisposal.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 199b3734..bfe9b413 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -93,13 +93,12 @@
           { prop: 'idNumber',  label: '身份证号', align: 'center' },
           { prop: 'createTime', label: '抵平时间', align: 'center' },
           { prop: 'registerInfo', label: '抵平卡口', align: 'center', formart: v => v.gatewayName },
-          { prop: 'registerInfo', label: '处置意见', align: 'center', formart: v => this.dict.getLabel('EP_handleType', v.handleType) },
+          { prop: 'registerInfo', label: '处置意见', align: 'center', formart: v => v.handleType !== '7' ? this.dict.getLabel('EP_handleType', v.handleType) : '-' },
           { prop: 'areaName',  label: '所属地区', align: 'center' },
           { prop: 'arriveAddress',  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: []
       }