From d0daec76949253f33639c0b433f36433d45c6b24 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 15:53:35 +0800
Subject: [PATCH 1/3] BUG 28632

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index db2d9772..0c52c573 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -10,18 +10,18 @@
           <template v-if="/1/.test(detail.status)">
             <el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button>
             <el-button type="primary" @click="handleRelieve()" v-else>申请解除风险</el-button>
+            <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit">编辑</el-button>
+            <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
           </template>
           <template v-if="/2/.test(detail.status)&&isGridAdmin">
-            <el-button type="primary" @click="handleRelieve(1)" >解除风险</el-button>
+            <el-button type="primary" @click="handleRelieve(1)">解除风险</el-button>
             <el-button type="primary" @click="handleRelieve(0)">继续监测</el-button>
           </template>
           <template v-if="/3/.test(detail.status)&&isGridAdmin">
             <el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
+            <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
           </template>
-          <el-button v-if="/[1]/g.test(detail.status)" type="primary" icon="iconfont iconEdit" @click="gotoEdit">
-            编辑
-          </el-button>
-          <el-button v-if="/[134]/g.test(detail.status)&&isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
+          <el-button v-if="/4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
             删除
           </el-button>
         </template>

From a1d439104ecf8213e5c06d75ed9c0d1219af1916 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 15:54:50 +0800
Subject: [PATCH 2/3] BUG 28633

---
 packages/jianping/AppHelpedResident/hrAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index c47927e2..681e61c1 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -221,7 +221,7 @@ export default {
         sex: [{required: true, message: "请选择性别"}],
         phone: [{required: true, message: "请输入联系方式"}],
         currentAreaId: [
-          {required: true, message: "请选择户籍地"},
+          {required: true, message: "请选择现住址"},
           {pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"},
         ],
         isHousehold: [{required: true, message: "请选择是否户主"}],

From abd55bd4138b74d8612aba0d33324212e33606cd Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 15:59:47 +0800
Subject: [PATCH 3/3] BUG 28634

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 0c52c573..a8ab7928 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -278,6 +278,9 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.detail = res.data
+          this.detail.family.map(e => {
+            e.householdRelation = e.householdRelation || "户主"
+          })
         }
       })
     },