29318

src/apps/AppMonitoringObject/Detail.vue

@@ -228,20 +228,21 @@
     </AiFixedBtn>
      <!-- 0：待纳入、1：监测中、2：待解除、3：已解除、4：已驳回 -->
     <div v-if="checkType == 1 && currIndex != 1"> 
-      <div class="footer-btn" v-if="info.status == 4">
+      <!-- <div class="footer-btn" v-if="info.status == 4">
         <div @click="del">删除人员</div>
-      </div>
+      </div> -->
       <div class="footer-btn" v-if="info.status == 1">
         <div class="confirm-btn" @click="toAddView('您确认要申请解除此监测对象的风险吗？', '')">申请解除风险</div>
       </div>
-      <div class="footer-btn" v-if="info.status == 3">
+      <div class="footer-btn" v-if="info.status == 3 || info.status == 4">
+        <div @click="del">删除人员</div>
         <div class="confirm-btn" @click="toAddView('您确认要申请纳入此监测对象吗？', '')">申请纳入监测</div>
       </div>
     </div>
 
     <div v-if="checkType == 2 && currIndex != 1">
 
-      <div class="footer-btn" v-if="info.status == 0 || info.status == 3">
+      <div class="footer-btn" v-if="info.status == 0 && userInfo == ''">
         <div class="confirm-btn" @click="toRemove('您确认要将此居民纳入监测对象吗？', 1,0)">纳入监测审核</div>
       </div>
 
@@ -253,8 +254,9 @@
         <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1,1)">消除风险审核</div>
       </div>
 
-      <div class="footer-btn" v-if="info.status == 4">
+      <div class="footer-btn" v-if="(info.status == 4 || info.status == 3 || info.status == 0) && userInfo != ''">
         <div @click="del">删除人员</div>
+        <div class="confirm-btn" @click="toAddView('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
       </div> 
     </div>
     
@@ -275,7 +277,9 @@ export default {
       isFrom: false,
       viewAll: false,
       checkType: '',
-      girdInfo: {}
+      girdInfo: {},
+      userInfo: {},
+      id: '',
     }
   },
 
@@ -323,8 +327,9 @@ export default {
       this.isGirdUser()
       this.getInfo()
     })
-
+    
     this.id = query.id
+    this.getUserPopup()
   },
   onShow() {
     document.title = '监测对象详情'
@@ -404,6 +409,14 @@ export default {
       this.currIndex = index
     },
 
+    getUserPopup() {
+      this.$http.post(`/app/apppreventionreturntopoverty/popup?id=${this.id}`).then(res => {
+        if (res?.code === 0) {
+          this.userInfo = res.data
+        }
+      })
+    },
+
     getInfo() {
       this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
         if (res.code === 0) {