From d50b295bc77a6943dd3e7ed5b67b5903c304dcf0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 31 Mar 2022 15:08:05 +0800
Subject: [PATCH] BUG 28743

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

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 31da3c21..dc939945 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -21,6 +21,11 @@
             <el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
             <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
           </template>
+          <template v-if="/5/.test(detail.status)">
+            <el-button v-if="isGridAdmin" type="primary" @click="handleAccept(1)">纳入监测</el-button>
+            <el-button v-else type="primary" @click="handleAccept()">申请纳入监测</el-button>
+            <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+          </template>
           <el-button v-if="/4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
             删除
           </el-button>
@@ -261,7 +266,7 @@ export default {
       }).catch(() => 0)
     },
     handleAccept(pass) {
-      let msg = pass == 1 ? "是否将该人员纳入监测对象?" : "是否驳回纳入监测对象申请?", {id} = this.detail
+      let msg = pass == 0 ? "是否驳回纳入监测对象申请?" : `是否${isNaN(pass) ? '(申请)' : ''}纳入监测对象?`, {id} = this.detail
       this.$confirm(msg).then(() => {
         this.instance.post("/app/apppreventionreturntopoverty/examine", null, {
           params: {pass, id}
@@ -316,7 +321,8 @@ export default {
       }
     }
   }
-  ::v-deep.el-tabs__content{
+
+  ::v-deep.el-tabs__content {
     max-height: calc(100vh - 136px);
     overflow-y: auto;
   }