From 455d0b2064a7d72e6cd0fc9a8689e386152b1514 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 29 Apr 2022 15:52:11 +0800
Subject: [PATCH] bug

---
 src/apps/AppMonitoringObject/Detail.vue            |  4 ++--
 src/apps/AppMonitoringObject/List.vue              |  2 +-
 src/apps/AppMonitoringObject/MonitorAddView.vue    | 13 ++++++++++---
 src/apps/AppMonitoringObject/MonitorRemoveView.vue | 11 ++++++-----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 7a817aef..d426a152 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -174,7 +174,7 @@
 
     <div v-if="checkType == 2 && currIndex != 1">
 
-      <div class="footer-btn" v-if="info.status == 0 && userInfo == ''">
+      <div class="footer-btn" v-if="info.status == 0 && userInfo != ''">
         <div class="confirm-btn" @click="toRemove('您确认要将此居民纳入监测对象吗？', 1,0)">纳入监测审核</div>
       </div>
 
@@ -186,7 +186,7 @@
         <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1,1)">消除风险审核</div>
       </div>
 
-      <div class="footer-btn" v-if="(info.status == 4 || info.status == 3 || info.status == 0) && userInfo != ''">
+      <div class="footer-btn" v-if="(info.status == 4 || info.status == 3) && userInfo != ''">
         <div @click="del">删除人员</div>
         <div class="confirm-btn" @click="toAddView('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
       </div> 
diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue
index e1251550..476c1683 100644
--- a/src/apps/AppMonitoringObject/List.vue
+++ b/src/apps/AppMonitoringObject/List.vue
@@ -163,7 +163,7 @@ export default {
     }
   },
   onReachBottom() {
-    this.current = this.current + 1
+    this.current++
     this.getList()
   },
 }
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue
index 6f520c5b..7cc257c0 100644
--- a/src/apps/AppMonitoringObject/MonitorAddView.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddView.vue
@@ -61,17 +61,24 @@ export default {
               files: this.filesList,
               id: this.id,
               riskType: this.riskType,
+              riskEliminationMethod: '',
             }
       if(this.pass == 1) {  // 网格长
-        if(this.status == 1) {  
+        if(!this.riskEliminationMethod) {
+            return this.$u.toast('请选择风险消除方式')
+          }
+        if(this.status == 1) {
           url = '/app/apppreventionreturntopoverty/relieve' // 解除
-        } else if (this.status == 4 || this.status == 3) {  
+        } else if (this.status == 4 || this.status == 3) { 
+          if(!this.riskType) {
+            return this.$u.toast('请选择风险因素')
+          } 
           url = `/app/apppreventionreturntopoverty/examine` //  纳入监测
         }
       } else {   // 网格员
         if(this.status == '0') {
           if(!this.riskType) {
-            return this.$u.toast('请选择监测对象类型')
+            return this.$u.toast('请选择风险因素')
           }
         }
         if(this.status == '1') {
diff --git a/src/apps/AppMonitoringObject/MonitorRemoveView.vue b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
index 6675442e..4ab17cf0 100644
--- a/src/apps/AppMonitoringObject/MonitorRemoveView.vue
+++ b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
@@ -114,12 +114,13 @@ export default {
     },
 
     submit() {
+      var url = ''
+      var params = {
+        ...this.form,
+        id: this.id,
+      }
       if (this.type == 0) {   // 纳入审核
-        var url = `/app/apppreventionreturntopoverty/examine`
-        var params = {
-          ...this.form,
-          id: this.id,
-        }
+        url = `/app/apppreventionreturntopoverty/examine`
       } else if (this.type == 1){     // 解除审核
         url = `/app/apppreventionreturntopoverty/relieve`
       }