From 44fe1bfacc027ca25f01cc490066475351069514 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 29 Apr 2022 19:01:52 +0800
Subject: [PATCH] 29465

---
 src/apps/AppMonitoringObject/Add.vue          | 24 +++++++------------
 .../MonitorAddFamilyMember.vue                |  3 ---
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 10a64e71..e55700d0 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -121,7 +121,6 @@
               <span>现住址</span>
             </div>
             <div class="right">
-              <!-- :areaId="user.areaId"   v-model="form.currentAreaId"-->
               <AiAreaPicker :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId">
                 <AiMore v-model="form.currentAreaName"/>
               </AiAreaPicker>
@@ -583,11 +582,6 @@ export default {
     },
 
     nextStep() {
-      // objectType: '请选择监测对象类型',
-      // name: '请输入户主姓名',
-      // idNumber: '请输入身份证号',
-      // phone: '请输入联系方式',
-      // currentAreaId: '请选择现住址',
 
       if (!this.isEdit) {
         if (!this.form.objectType) {
@@ -605,14 +599,6 @@ export default {
         return this.$u.toast('请选择现住址')
       }
 
-
-      // const rules = this.rules()
-
-      // for (let v of Object.keys(rules)) {
-      //   if (!this.form[v]) {
-      //     return this.$u.toast(rules[v])
-      //   }
-      // }
       let regTel = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/
       if (this.form.phone.length == 11 && !regTel.test(this.form.phone)) {
         return this.$u.toast('请输入正确的手机号')
@@ -686,7 +672,15 @@ export default {
         if (res.code == 0) {
           this.$u.toast(this.$route.query.id ? '保存成功' : '提交成功')
           uni.$emit('reload')
-          uni.navigateTo({url: './serviceResult'})
+          setTimeout(() =>{
+            if (this.$route.query.id) {
+              uni.navigateBack({
+                delta: 2
+              })
+            } else {
+              uni.navigateTo({url: './serviceResult'})
+            }
+          })
         }
       }).catch((err) => {
         this.$u.toast(err)
diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
index 21347995..ba6f8fca 100644
--- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -597,9 +597,6 @@ 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.form.isHousehold = 1
       this.current = 1
 
       // if(!this.form.riskType) {