From 5c448addd03f254674cbf6c5aa932962e7cf8bfe Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 27 Apr 2022 16:08:53 +0800
Subject: [PATCH] 29344

---
 src/apps/AppMonitoringObject/Detail.vue            |  8 ++++----
 src/apps/AppMonitoringObject/MonitorRemoveView.vue | 14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index f49fef01..cd183c72 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -242,7 +242,7 @@
     <div v-if="checkType == 2 && currIndex != 1">
 
       <div class="footer-btn" v-if="info.status == 0 || info.status == 3">
-        <div class="confirm-btn" @click="toRemove('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
+        <div class="confirm-btn" @click="toRemove('您确认要将此居民纳入监测对象吗？', 1,0)">纳入监测审核</div>
       </div>
 
       <div class="footer-btn" v-if="info.status == 1">
@@ -250,7 +250,7 @@
       </div>
 
       <div class="footer-btn" v-if="info.status == 2">
-        <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1)">消除风险审批</div>
+        <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1,1)">消除风险审核</div>
       </div>
 
       <div class="footer-btn" v-if="info.status == 4">
@@ -461,9 +461,9 @@ export default {
       })
     },
 
-    toRemove(text, pass) {
+    toRemove(text, pass,type) {
       this.$confirm('', text).then(() => {
-        uni.navigateTo({url: `./MonitorRemoveView?pass=${pass}&id=${this.info.id}&status=${this.info.status}`})
+        uni.navigateTo({url: `./MonitorRemoveView?pass=${pass}&id=${this.info.id}&status=${this.info.status}&type=${type}`})
         // this.$http.post(`/app/apppreventionreturntopoverty/relieve?id=${this.id}&pass=${pass}`).then(res => {
         //   if (res.code === 0) {
         //      this.$u.toast('操作成功')
diff --git a/src/apps/AppMonitoringObject/MonitorRemoveView.vue b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
index c91077de..2fb8d59c 100644
--- a/src/apps/AppMonitoringObject/MonitorRemoveView.vue
+++ b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="MonitorRemoveView">
-    <div class="user-info" v-if="info.length">
+    <div class="user-info" v-if="info">
       <div class="title">审核信息</div>
       <div class="info">
         <div class="item">
@@ -37,13 +37,13 @@
 
     <div class="result">
       <div class="title">处理意见</div>
-      <div class="check" v-if="info.status != 2">
+      <div class="check">
         <div class="left">
           <span style="color: #FF4466;">*</span>
           <span>审核结果</span>
         </div>
         <div class="right">
-          <div class="check-item" :class="form.pass == '1' ? 'check-active' : '' " @click="form.pass='1'">{{ info.operationType == 0? '纳入监测': '解除风险'}}<img src="./components/img/check-icon.png" alt=""></div>
+          <div class="check-item" :class="form.pass == '1' ? 'check-active' : '' " @click="form.pass='1'">{{ type == 0? '纳入监测': '解除风险'}}<img src="./components/img/check-icon.png" alt=""></div>
           <div class="check-item" :class="form.pass == '0' ? 'check-active' : '' " @click="form.pass='0'">驳回申请<img src="./components/img/check-icon.png" alt=""></div>
         </div>
       </div>
@@ -82,6 +82,7 @@ export default {
         files: [],
       },
       files: [],
+      type: '',
     }
   },
   onLoad(o) {
@@ -90,10 +91,11 @@ export default {
     this.id = o.id;
     this.status = o.status;
     this.form.pass = this.pass;
+    this.type = o.type
   },
   created() {
     this.getInfo()
-    document.title = this.info.operationType == 0? '纳入监测审核': '解除风险审核'
+    document.title = this.type == 0? '纳入监测审核': '解除风险审核'
   },
   methods: {
     getInfo() {
@@ -111,7 +113,7 @@ export default {
       })
     },
     submit() {
-      if (this.form.pass == 1) {   // 申请纳入
+      if (this.type == 0) {   // 纳入审核
         this.$http.post(`/app/apppreventionreturntopoverty/examine`,null,{
           params: {
             ...this.form,
@@ -128,7 +130,7 @@ export default {
             },600)
           }
         })
-      } else if (this.form.pass == 0){     // 申请解除
+      } else if (this.type == 1){     // 解除审核
         this.$http.post(`/app/apppreventionreturntopoverty/relieve`,null,{
           params: {
             ...this.form,