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 1/4] 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 @@ 现住址
- @@ -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) { From 90dca0ecf5c1d188d3f28a0d6f1f8d1589c18b3a Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 29 Apr 2022 19:04:53 +0800 Subject: [PATCH 2/4] 29430 --- .../AppMonitoringObject/MonitorIncome.vue | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/apps/AppMonitoringObject/MonitorIncome.vue b/src/apps/AppMonitoringObject/MonitorIncome.vue index b5da30c4..53c56882 100644 --- a/src/apps/AppMonitoringObject/MonitorIncome.vue +++ b/src/apps/AppMonitoringObject/MonitorIncome.vue @@ -8,7 +8,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -19,7 +19,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -30,7 +30,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -41,7 +41,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -52,7 +52,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -65,7 +65,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -76,7 +76,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -87,7 +87,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -98,7 +98,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -109,7 +109,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -120,7 +120,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -131,7 +131,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -142,7 +142,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -153,7 +153,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
@@ -164,7 +164,7 @@
+ placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
From d4b32eff268ef6d7227801f43a9ed8911077243d Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 29 Apr 2022 19:09:20 +0800 Subject: [PATCH 3/4] bug --- .../AppMonitoringObject/MonitorAddFamilyMember.vue | 12 ------------ src/apps/AppMonitoringObject/MonitorAddView.vue | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index ba6f8fca..485cf0c1 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -2,17 +2,6 @@
-
@@ -105,7 +94,6 @@ 现住址
-
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue index 863485ab..f294c375 100644 --- a/src/apps/AppMonitoringObject/MonitorAddView.vue +++ b/src/apps/AppMonitoringObject/MonitorAddView.vue @@ -61,7 +61,7 @@ export default { files: this.filesList, id: this.id, riskType: this.riskType, - riskEliminationMethod: '', + riskEliminationMethod: this.riskEliminationMethod, } if(this.pass == 1) { // 网格长 if(!this.riskEliminationMethod) { From ad4501c2889e42ecde3f6ed2ef82f1e1a0676691 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 29 Apr 2022 19:11:41 +0800 Subject: [PATCH 4/4] 29426 --- src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index 485cf0c1..c81e96b0 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -278,7 +278,7 @@
是
-
否否
@@ -355,7 +355,7 @@
是
-
否否