diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 31cca946..3f0b34b4 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -300,10 +300,8 @@
是否会讲普通话
@@ -377,10 +375,8 @@
是否国外务工
@@ -595,19 +591,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('请选择现住址')
}
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 }}
请选择
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
