From 33f48e779ffc5d79fb5ec3b8506d0575a253de9f Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 29 Mar 2022 09:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Add.vue    |  5 +++--
 src/apps/AppMonitoringObject/Detail.vue | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index f8395709..1e2425f9 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -16,7 +16,7 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i>*</i>
-            <span>姓名</span>
+            <span>户主姓名</span>
           </div>
           <div class="right">
             <input placeholder="请输入" type="text" v-model="form.name" :maxlength="8"
@@ -329,7 +329,7 @@ export default {
     rules() {
       return {
         objectType: '请选择监测对象类型',
-        name: '请输入姓名',
+        name: '请输入户主姓名',
         idNumber: '请输入身份证号',
         phone: '请输入联系方式',
         currentAreaId: '请选择现住址',
@@ -359,6 +359,7 @@ export default {
       this.form.girdId = this.girdInfo.girdId
       this.form.girdName = this.girdInfo.girdName
       this.form.householdIdNumber = this.form.idNumber
+      this.form.householdRelation = '01'
       this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
         ...this.form,
         id: this.isEdit ? this.id : ''
diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index f66c1240..79dce804 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -268,7 +268,7 @@ export default {
         return false
       }
 
-      return !!(this.info.drinkingWaterSafety && this.info.dilapidatedHouse);
+      return !!(this.info.drinkingWaterSafety && this.info.dilapidatedHouse && this.info.move);
 
 
     }
@@ -285,12 +285,12 @@ export default {
     })
 
     this.id = query.id
-    uni.$on('reload', () => {
-      this.getInfo()
-    })
   },
   onShow() {
     document.title = '居民详情'
+    uni.$on('reload', () => {
+      this.getInfo()
+    })
   },
 
   methods: {
@@ -329,7 +329,7 @@ export default {
               this.$http.post(`/app/apppreventionreturntopovertylog/delete?ids=${id}`).then(res => {
                 if (res.code === 0) {
                   this.$u.toast('删除成功')
-                  this.getInfo(this.id)
+                  this.getInfo()
                 }
                 uni.hideLoading()
               })