31096

project/pingchang/apps/AppHealthReport/components/Detail.vue

@@ -56,6 +56,8 @@
               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
               <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
               <ai-info-item label="详细地址" isLine :value="info.address"></ai-info-item>
+              <ai-info-item label="风险解除人" v-if="riskDisposalInfo.createUserName" :value="riskDisposalInfo.createUserName"></ai-info-item>
+              <ai-info-item label="风险解除时间" v-if="riskDisposalInfo.createTime" :value="riskDisposalInfo.createTime"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -92,6 +94,7 @@
         isShow: false,
         currIndex: 0,
         isLoading: false,
+        riskDisposalInfo: {},
         tableData: [],
         colConfigs1: [
           {prop: 'createTime', label: '上报日期', align: 'center' },
@@ -133,6 +136,15 @@
         this.instance.post(`/app/appepidemicpreventionhealthreportinfo/userDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
+
+            console.log(res.data.handleLogs.filter(v => v.riskRelief))
+
+            if (res.data.handleLogs && res.data.handleLogs.length) {
+              this.riskDisposalInfo = res.data.handleLogs.filter(v => v.riskRelief).length ? res.data.handleLogs.filter(v => !v.riskRelief)[0] : {}
+              console.log(this.riskDisposalInfo)
+
+              this.info.handleLogs = res.data.handleLogs.filter(v => !v.riskRelief)
+            }
           }
 
           this.isLoading = false

project/pingchang/apps/AppHomeReport/components/Detail.vue

@@ -162,8 +162,6 @@
         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.travelTypeNames = res.data.travelType.split(',').map(v => {
               return this.dict.getLabel('EP_travelType', v)
             }).join('，')