From b1d93bb65f4adcc93a0565415d658b23971ca6e6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 09:55:50 +0800
Subject: [PATCH 1/4] BUG 28614

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

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index d52f2d2a..21e9a55a 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -219,6 +219,7 @@ export default {
         idNumber: [{required: true, message: "请输入身份证号"}],
         name: [{required: true, message: "请输入姓名"}],
         sex: [{required: true, message: "请选择性别"}],
+        phone: [{required: true, message: "请输入联系方式"}],
         currentAreaId: [
           {required: true, message: "请选择户籍地"},
           {pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"},

From 30f28a494156ffcf89e8f73d8e5fe6307135df5f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 10:47:29 +0800
Subject: [PATCH 2/4] BUG 28623

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

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 8c94ce68..77115369 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -11,8 +11,8 @@
             <el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button>
             <el-button type="primary" @click="handleRelieve()" v-else>申请解除风险</el-button>
           </template>
-          <template v-if="/2/.test(detail.status)">
-            <el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button>
+          <template v-if="/2/.test(detail.status)&&isGridAdmin">
+            <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)">

From 2d35cdc95aa175e5edac9148bede8b496819293f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 10:48:30 +0800
Subject: [PATCH 3/4] BUG 28622

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

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 77115369..4ac5ba52 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -21,7 +21,7 @@
           <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)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
+          <el-button v-if="/[134]/g.test(detail.status)&&isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
             删除
           </el-button>
         </template>

From 4c4240e3c8a2aaa3a0b1f290660685dd9cdff40a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 29 Mar 2022 11:49:43 +0800
Subject: [PATCH 4/4] BUG 28626

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

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 4ac5ba52..db2d9772 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -15,7 +15,7 @@
             <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)">
+          <template v-if="/3/.test(detail.status)&&isGridAdmin">
             <el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
           </template>
           <el-button v-if="/[1]/g.test(detail.status)" type="primary" icon="iconfont iconEdit" @click="gotoEdit">