From 95ddb550e7e0e9e3244a6934ea2a75cf31c4c9dd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 27 Apr 2022 12:43:48 +0800
Subject: [PATCH] 29319

---
 src/apps/AppMonitoringObject/Add.vue          | 51 +++++++++++--------
 .../AppMonitoringObject/MonitorAddView.vue    |  8 +--
 .../AppMonitoringObject/MonitorRemoveView.vue |  4 +-
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 3f3ca902..0d7fe903 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -87,7 +87,8 @@
               <span>现住址</span>
             </div>
             <div class="right">
-              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :areaId="user.areaId" :root="user.areaId" @select="onAreaChange">
+              <!-- :areaId="user.areaId"   v-model="form.currentAreaId"-->
+              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName"  :root="user.areaId" @select="onAreaChange">
                   <div class="aiArea">
                     <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
                     <i v-else>请选择</i>
@@ -173,13 +174,23 @@
         </div>
       </div>
       <div class="form-item">
-        <div class="form-item__wrapper">
+        <div class="form-item__wrapper checkbox">
           <div class="left">
             <i style="opacity: 0;">*</i>
             <span>健康状况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect>
+
+            <!-- <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect> -->
+            <u-checkbox-group>
+              <u-checkbox
+                  v-model="e.checked"
+                  v-for="(e, i) in fpHealth" :key="i"
+                  :name="item.dictValue"
+                  @change="checkboxChange(indexs, index, i)"
+              >{{ e.dictName }}
+              </u-checkbox>
+            </u-checkbox-group>
           </div>
         </div>
       </div>
@@ -362,7 +373,8 @@ export default {
       girdInfo: {},
       photo: [],
       userList: [],
-      flag:false,
+      flag: false,
+      helthList: [],
     }
   },
   computed: {
@@ -389,13 +401,21 @@ export default {
     this.$dict.load(['fpType','fpRiskType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
     'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth']).then(() => {
       if (query.id) {
-        this.isEdit = true
+        this.flag = true
         this.id = query.id
         this.getInfo(this.id)
       }else {
         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(','));
+    
     
   },
 
@@ -414,12 +434,6 @@ export default {
       }
     },
 
-    getResidentList() {
-      this.$http.post('').then(res => {
-
-      })
-    },
-
     getResidentList() {
       uni.navigateTo({
         url: './residentList'
@@ -461,10 +475,6 @@ export default {
       if(!this.form.riskType) {
         return this.$u.toast('请选择风险因素')
       }
-
-      // if(!this.form.detail) {
-      //   return this.$u.toast('请输入备注说明')
-      // }
       
       this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
         ...this.form,
@@ -589,6 +599,11 @@ export default {
         border-bottom: 1px solid #E4E5E6;
       }
 
+      .checkbox {
+        display: flex;
+
+      }
+
       .right {
         height: 112px;
         line-height: 112px;
@@ -653,12 +668,6 @@ export default {
           font-size: 32px;
         }
       }
-
-      // &:last-child {
-      //   .form-item__wrapper {
-      //     border: none;
-      //   }
-      // }
     }
   }
 
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue
index 56a8cc89..e0fdd631 100644
--- a/src/apps/AppMonitoringObject/MonitorAddView.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddView.vue
@@ -74,7 +74,7 @@ export default {
         this.filesList = files.join(',')
       }
 
-      if(this.status == 0) {
+      if(this.status == 0) { // 纳入监测
         this.$http.post(`/app/apppreventionreturntopoverty/examine`, null,{
           params: {
             pass: this.pass,
@@ -85,7 +85,7 @@ export default {
           }
         }).then(res => {
           if (res.code === 0) {
-            this.$u.toast('操作成功')
+            this.$u.toast('提交成功')
             uni.$emit('reload')
             setTimeout(() => {
               uni.navigateBack({
@@ -94,7 +94,7 @@ export default {
             },600)
           }
         })
-      } else {
+      } else {      //  驳回
         this.$http.post(`/app/apppreventionreturntopoverty/relieve`, null,{
           params: {
             pass: this.pass,
@@ -105,7 +105,7 @@ export default {
           }
         }).then(res => {
           if (res.code === 0) {
-            this.$u.toast('操作成功')
+            this.$u.toast('提交成功')
             uni.$emit('reload')
             setTimeout(() => {
               uni.navigateBack({
diff --git a/src/apps/AppMonitoringObject/MonitorRemoveView.vue b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
index 33265e76..47767915 100644
--- a/src/apps/AppMonitoringObject/MonitorRemoveView.vue
+++ b/src/apps/AppMonitoringObject/MonitorRemoveView.vue
@@ -123,7 +123,7 @@ export default {
           }
         }).then(res => {
           if (res.code === 0) {
-            this.$u.toast('操作成功')
+            this.$u.toast('提交成功')
             uni.$emit('reload')
             setTimeout(() =>{
               uni.navigateBack({
@@ -140,7 +140,7 @@ export default {
           }
         }).then(res => {
           if (res.code === 0) {
-            this.$u.toast('操作成功')
+            this.$u.toast('提交成功')
             uni.$emit('reload')
             setTimeout(() =>{
               uni.navigateBack({