From 44f563d94e0bc521b7861c827c35fd1a02602adf Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 14 Jan 2022 10:25:42 +0800
Subject: [PATCH] 26729

---
 packages/2.0.5/AppGridMember/components/add.vue    |  6 +++---
 packages/3.0.0/AppHealthReport/components/List.vue | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/2.0.5/AppGridMember/components/add.vue b/packages/2.0.5/AppGridMember/components/add.vue
index c2e40bff..2dc6a755 100644
--- a/packages/2.0.5/AppGridMember/components/add.vue
+++ b/packages/2.0.5/AppGridMember/components/add.vue
@@ -127,7 +127,7 @@
                   </el-tag> -->
                   <el-form-item style="width: 100%" label-width="80px" :label="'网格' + (index + 1)" v-for="(item, index) in forms.girdInfoList" :key="'选项' + (index + 1)">
                     <div class="form-flex">
-                      <el-select v-model="item.checkType" placeholder="请选择">
+                      <el-select v-model="item.checkType" placeholder="请选择网格角色">
                         <el-option
                           v-for="item in options"
                           :key="item.value"
@@ -135,7 +135,7 @@
                           :value="item.value">
                         </el-option>
                       </el-select>
-                      <el-input disabled v-model="item.girdName" :maxlength="200" size="small" placeholder="请输入选项">
+                      <el-input disabled v-model="item.girdName" :maxlength="200" size="small" placeholder="请选择责任网格">
                         <template slot="append">
                           <el-button size="small" @click="currIndex = index, showGrid = true">选择网格</el-button>
                         </template>
@@ -262,7 +262,7 @@ export default {
       },
       options: [{
         value: '2',
-        label: '网格管理员'
+        label: '网格长'
       }, {
         value: '1',
         label: '网格员'
diff --git a/packages/3.0.0/AppHealthReport/components/List.vue b/packages/3.0.0/AppHealthReport/components/List.vue
index 59ddbe21..f220dd46 100644
--- a/packages/3.0.0/AppHealthReport/components/List.vue
+++ b/packages/3.0.0/AppHealthReport/components/List.vue
@@ -120,7 +120,18 @@
           { prop: 'phone', align: 'center', label: '手机号码' },
           { prop: 'areaName', align: 'center', label: '所属地区', width: '200px' },
           { prop: 'reportTime', align: 'center', label: '上报时间', width: '200px' }, 
-          { prop: 'vaccine', align: 'center', label: '已接种情况', formart: v => (v || 0) + '次' }, 
+          {
+            prop: 'vaccine',
+            align: 'center',
+            label: '已接种情况',
+            render: (h, {row}) => {
+              return h('span', {
+                style: {
+                  color: row.status === '0' ? 'red' : '#333'
+                }
+              }, row.today === '0' ? '-' : (row.vaccine || 0 + '次'))
+            }
+          }, 
           { prop: 'healthCode', align: 'center', label: '健康码', formart: v => v ? this.dict.getLabel('epidemicHealthCode', v) : '-' }, 
           { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v ? v.split(' ')[0] : '-' }, 
           { prop: 'checkResult', align: 'center', label: '检测结果', formart: v => v ? this.dict.getLabel('epidemicRecentTestResult', v) : '-' },