From 9715c28362c5dadb9344a899352ee86b888b44b3 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 12 Jan 2022 16:20:35 +0800
Subject: [PATCH] 26652

---
 .../3.0.0/AppHealthReport/components/Detail.vue     | 11 +++--------
 .../AppReturnHomeRegister/components/Detail.vue     | 11 +++--------
 .../3.0.0/AppReturnHomeRegister/components/List.vue | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/packages/3.0.0/AppHealthReport/components/Detail.vue b/packages/3.0.0/AppHealthReport/components/Detail.vue
index 0134a04b..ff733052 100644
--- a/packages/3.0.0/AppHealthReport/components/Detail.vue
+++ b/packages/3.0.0/AppHealthReport/components/Detail.vue
@@ -89,7 +89,7 @@
       <div v-show="currIndex === 2">
         <ai-card title="异常处理">
           <template #right>
-            <el-button type="primary" @click="release">解除异常</el-button>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
           </template>
           <template #content>
             <ai-wrapper
@@ -107,7 +107,7 @@
         </ai-card>
         <ai-card title="异常情况记录">
           <template #right>
-            <el-button type="primary" @click="isShowAdd = true">添加</el-button>
+            <el-button type="primary" v-if="info.status === '0'" @click="isShowAdd = true">添加</el-button>
           </template>
           <template #content>
             <ai-table
@@ -185,7 +185,7 @@
           {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
           {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '异常' : '正常' }
         ],
-        tabList: ['基本信息', '每日上报']
+        tabList: ['基本信息', '每日上报', '异常处理']
       }
     },
 
@@ -205,11 +205,6 @@
         this.instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            if (res.data.status === '0') {
-              this.tabList = ['基本信息', '每日上报', '异常处理']
-            } else {
-              this.tabList = ['基本信息', '每日上报']
-            }
             this.currIndex = 0
           }
         })
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
index d2c32611..531cb8e4 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
@@ -64,7 +64,7 @@
       <div v-show="currIndex === 1">
         <ai-card title="异常处理">
           <template #right>
-            <el-button type="primary" @click="release">解除异常</el-button>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
           </template>
           <template #content>
             <ai-wrapper
@@ -82,7 +82,7 @@
         </ai-card>
         <ai-card title="异常情况记录">
           <template #right>
-            <el-button type="primary" @click="isShow = true">添加</el-button>
+            <el-button type="primary" v-if="info.status === '0'" @click="isShow = true">添加</el-button>
           </template>
           <template #content>
             <ai-table
@@ -148,7 +148,7 @@
           {prop: 'content', label: '说明', align: 'center' },
           {prop: 'createTime', label: '创建时间', align: 'center'}
         ],
-        tabList: ['基本信息']
+        tabList: ['基本信息', '异常处理']
       }
     },
 
@@ -169,11 +169,6 @@
           if (res.code === 0) {
             this.info = res.data
             this.info.checkPhoto = res.data.checkPhoto ? JSON.parse(res.data.checkPhoto) : []
-            if (res.data.status === '0') {
-              this.tabList = ['基本信息', '异常处理']
-            } else {
-              this.tabList = ['基本信息']
-            }
           }
         })
       },
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/List.vue b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
index 6394246b..95e0320e 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/List.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
@@ -116,7 +116,18 @@
             label: '到达地区'
           },
           { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v.split(' ')[0] },
-          { prop: 'status', align: 'center', label: '健康状态', formart: v => v === '0' ? '异常' : '正常' },
+          {
+            prop: 'status',
+            align: 'center',
+            label: '健康状态',
+            render: (h, {row}) => {
+              return h('span', {
+                style: {
+                  color: row.status === '0' ? 'red' : '#333'
+                }
+              }, row.status === '0' ? '异常' : '正常')
+            }
+          },
           // { prop: 'type', align: 'center', label: '今日上报' }
         ],
         ids: [],