diff --git a/project/pingchang/apps/AppHealthReport/components/Detail.vue b/project/pingchang/apps/AppHealthReport/components/Detail.vue index 325ffa2c..8bf945fd 100644 --- a/project/pingchang/apps/AppHealthReport/components/Detail.vue +++ b/project/pingchang/apps/AppHealthReport/components/Detail.vue @@ -56,6 +56,8 @@ + + @@ -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 diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue index 5d25e5a3..fa084093 100644 --- a/project/pingchang/apps/AppHomeReport/components/Detail.vue +++ b/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(',')