From 8bc68b050a1e717b4a35f45092619b9bfeac357d Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 29 Apr 2022 17:53:20 +0800 Subject: [PATCH 1/3] no message --- src/apps/AppMonitoringObject/Add.vue | 4 +- .../MonitorFamilySituation.vue | 80 +++++++++++++------ src/apps/AppMonitoringObject/familyRisk.vue | 14 +++- 3 files changed, 69 insertions(+), 29 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index d6a8272d..dd7cc824 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -307,7 +307,7 @@
是
-
否
+
否
@@ -382,7 +382,7 @@
是
-
否
+
否
diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue index 30bcb319..5585dfda 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue @@ -68,7 +68,7 @@
是
-
否
+
否
@@ -80,7 +80,7 @@
是
-
否
+
否
@@ -92,7 +92,7 @@
是
-
否
+
否
@@ -104,7 +104,7 @@
是
-
否
+
否
@@ -116,7 +116,7 @@
是
-
否
+
否
@@ -128,7 +128,7 @@
是
-
否
+
否
@@ -140,7 +140,7 @@
是
-
否
+
否
@@ -228,7 +228,7 @@
是
-
否
+
否
@@ -240,7 +240,7 @@
是
-
否
+
否
@@ -252,7 +252,7 @@
是
-
否
+
否
@@ -264,7 +264,7 @@
是
-
否
+
否
@@ -281,28 +281,28 @@ export default { return { form: { houseType: '', - dilapidatedHousehold: '02', - drinkingWaterSafety: '02', - move: '02', + dilapidatedHousehold: '', + drinkingWaterSafety: '', + move: '', houseArea: '', trunkRoadDistance: '', houseRoadType: '', fuelType:'', - houseDamage: '02', - drinkingWaterDamage: '02', - toilet: '02', - electric: '02', - television: '02', + houseDamage: '', + drinkingWaterDamage: '', + toilet: '', + electric: '', + television: '', cultivatedLandArea: '', // 耕地面积 orchardArea: '', woodlandArea: '', grainForGreenArea: '', grazingGrasslandArea: '', watersArea: '', - longtouqiye: '02', - produceElectric: '02', - nongheshe: '02', - cyzfdtr: '02', + longtouqiye: '', + produceElectric: '', + nongheshe: '', + cyzfdtr: '', }, id: '', girdId: '', @@ -343,6 +343,40 @@ export default { submit() { + if(!this.form.dilapidatedHousehold) { + return this.$u.toast('请选择是否危房') + } + if(!this.form.drinkingWaterSafety) { + return this.$u.toast('请选择是否解决安全饮水') + } + if(!this.form.houseDamage) { + return this.$u.toast('请选择是否住房损坏') + } + if(!this.form.drinkingWaterDamage) { + return this.$u.toast('请选择是否饮水设施损坏') + } + if(!this.form.toilet) { + return this.$u.toast('请选择是否有卫生厕所') + } + if(!this.form.electric) { + return this.$u.toast('请选择是否通生活用电') + } + if(!this.form.television) { + return this.$u.toast('请选择是否通广播电视') + } + if(!this.form.longtouqiye) { + return this.$u.toast('请选择是否有龙头企业带动') + } + if(!this.form.produceElectric) { + return this.$u.toast('请选择是否通生产用电') + } + if(!this.form.nongheshe) { + return this.$u.toast('请选择是否加入农民专业合作社') + } + if(!this.form.cyzfdtr) { + return this.$u.toast('请选择是否有创业致富带头人带动') + } + this.form.girdId = this.girdId this.form.girdName = this.girdName this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { diff --git a/src/apps/AppMonitoringObject/familyRisk.vue b/src/apps/AppMonitoringObject/familyRisk.vue index f54b14f3..c95e7406 100644 --- a/src/apps/AppMonitoringObject/familyRisk.vue +++ b/src/apps/AppMonitoringObject/familyRisk.vue @@ -59,7 +59,7 @@
是
-
否
+
否
@@ -71,7 +71,7 @@
是
-
否
+
否
@@ -102,8 +102,8 @@ export default { povertyYear: '', riskType: '', naturalDisasterType: '', - militaryMartyrs: '02', - dropOutOfSchool: '02', + militaryMartyrs: '', + dropOutOfSchool: '', dropOutOfSchoolReason: '', }, value: '', @@ -140,6 +140,12 @@ export default { if (!this.form.riskType) { return this.$u.toast('请选择风险因素') } + if (!this.form.militaryMartyrs) { + return this.$u.toast('是否军烈属') + } + if (!this.form.dropOutOfSchool) { + return this.$u.toast('是否义务阶段失学辍学') + } this.form.girdId = this.girdId this.form.girdName = this.girdName From 302c577da5707a575fe95c34f0012d3a7ef7f5d8 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 29 Apr 2022 18:24:51 +0800 Subject: [PATCH 2/3] 29464 --- src/apps/AppMonitoringObject/Add.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 836dcc43..c7bd387c 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -609,19 +609,18 @@ export default { if (!id) { if (!this.form.objectType) { - this.$u.toast('请选择监测对象类型') + return this.$u.toast('请选择监测对象类型') } - } if (!this.form.idNumber) { - this.$u.toast('请输入身份证号') + return this.$u.toast('请输入身份证号') } if (!this.form.phone) { - this.$u.toast('请输入联系方式') + return this.$u.toast('请输入联系方式') } if (!this.form.currentAreaId) { - this.$u.toast('请选择现住址') + return this.$u.toast('请选择现住址') } From 23bc560e7066b0ead456d3947f1bd1705d34dc18 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 29 Apr 2022 18:30:52 +0800 Subject: [PATCH 3/3] 29457 --- src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index 27ce66cf..34cd4367 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -110,7 +110,7 @@
- {{ form.currentAreaName }} + {{ form.currentAreaName }} 请选择