From 9861b4718e328db3965236f2e574b82ece6c8e04 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 18:24:03 +0800
Subject: [PATCH] bug

---
 .../AppHelpedResident/detail/hrLog.vue         |  2 +-
 .../jianping/AppHelpedResident/hrDetail.vue    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/detail/hrLog.vue b/packages/jianping/AppHelpedResident/detail/hrLog.vue
index 6d1735b9..7662a8a2 100644
--- a/packages/jianping/AppHelpedResident/detail/hrLog.vue
+++ b/packages/jianping/AppHelpedResident/detail/hrLog.vue
@@ -14,7 +14,7 @@
           <p>操作类型：{{row.operationDesc}}</p>
           <div class="content" v-text="row.detail"/>
           <ai-uploader v-model="row.files" disabled/>
-          <div class="btns">
+          <div class="btns" v-if="row.bizType == 0">
             <el-button type="text" @click="handleEdit(row)" v-if="$permissions('app_apppreventionreturntopovertylog_edit')">编辑</el-button>
             <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopovertylog_del')">删除</el-button>
           </div>
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index ff7ef4c0..95a94cdd 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -7,15 +7,18 @@
           <template v-if="isGridAdmin">
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 0 && girdAdminApplyStatus != 1">纳入监测</el-button>
             <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
+            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 4 && girdAdminApplyStatus != 1">纳入监测</el-button>
+            <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 4 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
             <el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
             <el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
           </template>
-          <template v-else>
+          <template v-if="user.info.girdCheckType == 1">
             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
+             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4">申请纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
-          <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+          <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status) && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
         </template>
       </ai-title>
       <template #content>
@@ -739,7 +742,15 @@ export default {
           this.examineFrom.files = ids.join(',')
         }
         this.examineFrom.id = this.detail.id
-        this.instance.post(`/app/apppreventionreturntopoverty/relieve`, null, { params: this.examineFrom }).then(res => {
+        var url = ''
+        if (this.changeStatus == 2) { //纳入监测
+          url = `/app/apppreventionreturntopoverty/examine`
+        }
+
+        if (this.changeStatus == 5) { //解除风险
+          url = `/app/apppreventionreturntopoverty/relieve`
+        }
+        this.instance.post(url, null, { params: this.examineFrom }).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
@@ -860,6 +871,7 @@ export default {
       font-size: 100px;
     }
     p {
+      text-align: center;
       font-size: 16px;
       padding-top: 20px;
       color: #000;