kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-04-29 18:32:49 +08:00
parent 6089dea690 23bc560e70
commit 37bfe6be03
4 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/apps/AppMonitoringObject/Add.vue
View File

@@ -300,10 +300,8 @@
<span>是否会讲普通话</span> <span>是否会讲普通话</span>
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.mandarin == '01' ? 'check-active' : '' " @click="form.mandarin='01'">是<img <div class="check-item" :class="form.mandarin == '01' ? 'check-active' : '' " @click="form.mandarin='01'">是<img src="./components/img/check-icon.png" alt=""></div>
src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.mandarin == '02' ? 'check-active' : '' " @click="form.mandarin='02'">否<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.mandarin != '01' ? 'check-active' : '' " @click="form.mandarin='02'">否<img
src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -377,10 +375,8 @@
<span>是否国外务工</span> <span>是否国外务工</span>
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.foreignWorkers == '01' ? 'check-active' : '' " @click="form.foreignWorkers='01'">是<img <div class="check-item" :class="form.foreignWorkers == '01' ? 'check-active' : '' " @click="form.foreignWorkers='01'">是<img src="./components/img/check-icon.png" alt=""></div>
src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.foreignWorkers == '02' ? 'check-active' : '' " @click="form.foreignWorkers='02'">否<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.foreignWorkers != '01' ? 'check-active' : '' " @click="form.foreignWorkers='02'">否<img
src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -595,19 +591,18 @@ export default {
if (!id) { if (!id) {
if (!this.form.objectType) { if (!this.form.objectType) {
this.$u.toast('请选择监测对象类型') return this.$u.toast('请选择监测对象类型')
} }
} }
if (!this.form.idNumber) { if (!this.form.idNumber) {
this.$u.toast('请输入身份证号') return this.$u.toast('请输入身份证号')
} }
if (!this.form.phone) { if (!this.form.phone) {
this.$u.toast('请输入联系方式') return this.$u.toast('请输入联系方式')
} }
if (!this.form.currentAreaId) { if (!this.form.currentAreaId) {
this.$u.toast('请选择现住址') return this.$u.toast('请选择现住址')
} }

2
src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
View File

@@ -110,7 +110,7 @@
<!-- :areaId="user.areaId" v-model="form.currentAreaId"--> <!-- :areaId="user.areaId" v-model="form.currentAreaId"-->
<AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId" @select="onAreaChange"> <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId" @select="onAreaChange">
<div class="aiArea"> <div class="aiArea">
<span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span> <span class="label" style="color: #333;" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
<i v-else>请选择</i> <i v-else>请选择</i>
<u-icon name="arrow-right" color="#ddd"/> <u-icon name="arrow-right" color="#ddd"/>
</div> </div>

80
src/apps/AppMonitoringObject/MonitorFamilySituation.vue
View File

@@ -68,7 +68,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.dilapidatedHousehold == '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.dilapidatedHousehold == '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.dilapidatedHousehold != '01' ? 'check-active' : '' " @click="form.dilapidatedHousehold='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.dilapidatedHousehold == '02' ? 'check-active' : '' " @click="form.dilapidatedHousehold='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -80,7 +80,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.drinkingWaterSafety == '01' ? 'check-active' : '' " @click="form.drinkingWaterSafety='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.drinkingWaterSafety == '01' ? 'check-active' : '' " @click="form.drinkingWaterSafety='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.drinkingWaterSafety != '01' ? 'check-active' : '' " @click="form.drinkingWaterSafety='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.drinkingWaterSafety == '02' ? 'check-active' : '' " @click="form.drinkingWaterSafety='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -92,7 +92,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.houseDamage == '01' ? 'check-active' : '' " @click="form.houseDamage='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.houseDamage == '01' ? 'check-active' : '' " @click="form.houseDamage='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.houseDamage !='01' ? 'check-active' : '' " @click="form.houseDamage='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.houseDamage == '02' ? 'check-active' : '' " @click="form.houseDamage='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -104,7 +104,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.drinkingWaterDamage == '01' ? 'check-active' : '' " @click="form.drinkingWaterDamage='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.drinkingWaterDamage == '01' ? 'check-active' : '' " @click="form.drinkingWaterDamage='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.drinkingWaterDamage !='01' ? 'check-active' : '' " @click="form.drinkingWaterDamage='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.drinkingWaterDamage == '02' ? 'check-active' : '' " @click="form.drinkingWaterDamage='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -116,7 +116,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.toilet == '01' ? 'check-active' : '' " @click="form.toilet='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.toilet == '01' ? 'check-active' : '' " @click="form.toilet='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.toilet !='01' ? 'check-active' : '' " @click="form.toilet='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.toilet == '02' ? 'check-active' : '' " @click="form.toilet='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -128,7 +128,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.electric == '01' ? 'check-active' : '' " @click="form.electric='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.electric == '01' ? 'check-active' : '' " @click="form.electric='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.electric !='01' ? 'check-active' : '' " @click="form.electric='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.electric == '02' ? 'check-active' : '' " @click="form.electric='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -140,7 +140,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.television == '01' ? 'check-active' : '' " @click="form.television='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.television == '01' ? 'check-active' : '' " @click="form.television='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.television !='01' ? 'check-active' : '' " @click="form.television='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.television == '02' ? 'check-active' : '' " @click="form.television='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -228,7 +228,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.longtouqiye == '01' ? 'check-active' : '' " @click="form.longtouqiye='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.longtouqiye == '01' ? 'check-active' : '' " @click="form.longtouqiye='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.longtouqiye != '01' ? 'check-active' : '' " @click="form.longtouqiye='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.longtouqiye == '02' ? 'check-active' : '' " @click="form.longtouqiye='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -240,7 +240,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.produceElectric == '01' ? 'check-active' : '' " @click="form.produceElectric='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.produceElectric == '01' ? 'check-active' : '' " @click="form.produceElectric='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.produceElectric != '01' ? 'check-active' : '' " @click="form.produceElectric='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.produceElectric == '02' ? 'check-active' : '' " @click="form.produceElectric='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -252,7 +252,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.nongheshe == '01' ? 'check-active' : '' " @click="form.nongheshe='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.nongheshe == '01' ? 'check-active' : '' " @click="form.nongheshe='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.nongheshe !='01' ? 'check-active' : '' " @click="form.nongheshe='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.nongheshe == '02' ? 'check-active' : '' " @click="form.nongheshe='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -264,7 +264,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.cyzfdtr == '01' ? 'check-active' : '' " @click="form.cyzfdtr='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.cyzfdtr == '01' ? 'check-active' : '' " @click="form.cyzfdtr='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.cyzfdtr !='01' ? 'check-active' : '' " @click="form.cyzfdtr='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.cyzfdtr == '02' ? 'check-active' : '' " @click="form.cyzfdtr='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -281,28 +281,28 @@ export default {
return { return {
form: { form: {
houseType: '', houseType: '',
dilapidatedHousehold: '02', dilapidatedHousehold: '',
drinkingWaterSafety: '02', drinkingWaterSafety: '',
move: '02', move: '',
houseArea: '', houseArea: '',
trunkRoadDistance: '', trunkRoadDistance: '',
houseRoadType: '', houseRoadType: '',
fuelType:'', fuelType:'',
houseDamage: '02', houseDamage: '',
drinkingWaterDamage: '02', drinkingWaterDamage: '',
toilet: '02', toilet: '',
electric: '02', electric: '',
television: '02', television: '',
cultivatedLandArea: '', // 耕地面积 cultivatedLandArea: '', // 耕地面积
orchardArea: '', orchardArea: '',
woodlandArea: '', woodlandArea: '',
grainForGreenArea: '', grainForGreenArea: '',
grazingGrasslandArea: '', grazingGrasslandArea: '',
watersArea: '', watersArea: '',
longtouqiye: '02', longtouqiye: '',
produceElectric: '02', produceElectric: '',
nongheshe: '02', nongheshe: '',
cyzfdtr: '02', cyzfdtr: '',
}, },
id: '', id: '',
girdId: '', girdId: '',
@@ -343,6 +343,40 @@ export default {
submit() { 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.girdId = this.girdId
this.form.girdName = this.girdName this.form.girdName = this.girdName
this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {

14
src/apps/AppMonitoringObject/familyRisk.vue
View File

@@ -59,7 +59,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.militaryMartyrs == '01' ? 'check-active' : '' " @click="form.militaryMartyrs='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.militaryMartyrs == '01' ? 'check-active' : '' " @click="form.militaryMartyrs='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.militaryMartyrs != '01' ? 'check-active' : '' " @click="form.militaryMartyrs='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.militaryMartyrs == '02' ? 'check-active' : '' " @click="form.militaryMartyrs='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -71,7 +71,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="check-item" :class="form.dropOutOfSchool == '01' ? 'check-active' : '' " @click="form.dropOutOfSchool='01'">是<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.dropOutOfSchool == '01' ? 'check-active' : '' " @click="form.dropOutOfSchool='01'">是<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.dropOutOfSchool != '01' ? 'check-active' : '' " @click="form.dropOutOfSchool='02'">否<img src="./components/img/check-icon.png" alt=""></div> <div class="check-item" :class="form.dropOutOfSchool == '02' ? 'check-active' : '' " @click="form.dropOutOfSchool='02'">否<img src="./components/img/check-icon.png" alt=""></div>
</div> </div>
</div> </div>
</div> </div>
@@ -102,8 +102,8 @@ export default {
povertyYear: '', povertyYear: '',
riskType: '', riskType: '',
naturalDisasterType: '', naturalDisasterType: '',
militaryMartyrs: '02', militaryMartyrs: '',
dropOutOfSchool: '02', dropOutOfSchool: '',
dropOutOfSchoolReason: '', dropOutOfSchoolReason: '',
}, },
value: '', value: '',
@@ -140,6 +140,12 @@ export default {
if (!this.form.riskType) { if (!this.form.riskType) {
return this.$u.toast('请选择风险因素') 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.girdId = this.girdId
this.form.girdName = this.girdName this.form.girdName = this.girdName