From 4a06402b35d32ed2a4dca0fa35669891830448a7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 27 Apr 2022 17:38:43 +0800
Subject: [PATCH] 29318

---
 src/apps/AppMonitoringObject/Add.vue          | 22 +++----
 src/apps/AppMonitoringObject/Detail.vue       | 27 ++++++--
 .../AppMonitoringObject/MonitorAddView.vue    | 65 ++++++++++++-------
 3 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index ab25e71c..28ff79ec 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -182,15 +182,15 @@
           <div class="right">
 
             <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect>
-            <!-- <u-checkbox-group>
+            <u-checkbox-group>
               <u-checkbox
                   v-model="e.checked"
-                  v-for="(e, i) in fpHealth" :key="i"
-                  :name="item.dictValue"
+                  v-for="(e, i) in $dict.getDict('fpHealth')" :key="i"
+                  :name="e.dictValue"
                   @change="checkboxChange(indexs, index, i)"
               >{{ e.dictName }}
               </u-checkbox>
-            </u-checkbox-group> -->
+            </u-checkbox-group>
           </div>
         </div>
       </div>
@@ -409,15 +409,6 @@ export default {
         this.form.currentAreaId = this.user.areaId
       }
     })
-    // var dictList = []
-    // console.log(this.$dict.getDict('fpHealth'));
-    // this.$dict.getDict('fpHealth').map((item) => {
-    //   dictList.push(item.dictValue)
-    // })
-    // return helthList = dictList.join(',')
-    // console.log(dictList.join(','));
-    
-    
   },
 
   onShow() {
@@ -441,6 +432,11 @@ export default {
       })
     },
 
+    checkboxChange(indexs, index, i) {
+      this.formDataList[indexs][index].checkList[i].checked = !this.formDataList[indexs][index].checkList[i].checked
+      this.$forceUpdate()
+    },
+
     nextStep() {
       const rules = this.rules()
 
diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index cd183c72..bb7681b9 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/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) {
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue
index 80cdd983..ce6980d6 100644
--- a/src/apps/AppMonitoringObject/MonitorAddView.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddView.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="MonitorAddView">
     <div class="containter">
-      <div class="type" v-if="status == 0 || 3">
-        <div><span style="color: #FF4466">*</span>{{ status == 0? '监测对象类型' : status == 3? '风险因素':'' }}</div>
+      <div class="type" v-if="status == 3 || status == 4 || status == 0">
+        <div><span style="color: #FF4466">*</span>风险因素</div>
         <div>
           <AiSelect dict="fpRiskType" v-model="riskType" />
         </div>
@@ -50,29 +50,50 @@ export default {
     this.status = o.status
   },
   onShow() {
-    document.title = this.status == 0 && this.pass ==''? '申请纳入监测': this.status == 1 && this.pass ==''? '申请解除风险' : '解除风险'
+    document.title = (this.status == 3 || this.status == 4 ) && this.pass ==''? '申请纳入监测': this.status == 1 && this.pass ==''? '申请解除风险' :  this.status == 1 && this.pass ==1? '解除风险': (this.status == 4 || this.status==3) &&  this.pass == 1? '纳入监测':''
   },
   methods: {
     submit() {
-      if(this.pass != '') {
-        this.$http.post(`/app/apppreventionreturntopoverty/relieve`,null,{
-          params: {
-            pass: this.pass,
-            opinion: this.opinion,
-            files: this.filesList,
-            id: this.id,
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast('提交成功')
-            uni.$emit('reload')
-            setTimeout(() =>{
-              uni.navigateBack({
-                delta: 2
-              })
-            },600)
-          }
-        })
+      if(this.pass == 1) {
+        if(this.status == 1) {  // 解除
+          this.$http.post(`/app/apppreventionreturntopoverty/relieve`,null,{
+            params: {
+              pass: this.pass,
+              opinion: this.opinion,
+              files: this.filesList,
+              id: this.id,
+            }
+          }).then(res => {
+            if (res.code == 0) {
+              this.$u.toast('提交成功')
+              uni.$emit('reload')
+              setTimeout(() =>{
+                uni.navigateBack({
+                  delta: 2
+                })
+              },600)
+            }
+          })
+        } else if (this.status == 4 || this.status == 3 || this.status == 0) {  //  纳入监测
+          this.$http.post(`/app/apppreventionreturntopoverty/examine`,null,{
+            params: {
+              pass: this.pass,
+              opinion: this.opinion,
+              files: this.filesList,
+              id: this.id,
+            }
+          }).then(res => {
+            if (res.code == 0) {
+              this.$u.toast('提交成功')
+              uni.$emit('reload')
+              setTimeout(() =>{
+                uni.navigateBack({
+                  delta: 2
+                })
+              },600)
+            }
+          })
+        }
       } else {
         if(this.status == '0') {
           if(!this.riskType) {