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 
# Conflicts:
#	src/apps/AppMonitoringObject/Add.vue
This commit is contained in:
aixianling
2022-04-29 19:27:27 +08:00
parent b12ae2c588 ad4501c288
commit 352843b9be
4 changed files with 27 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -582,11 +582,6 @@ export default {
},
nextStep() {
// objectType: '请选择监测对象类型',
// name: '请输入户主姓名',
// idNumber: '请输入身份证号',
// phone: '请输入联系方式',
// currentAreaId: '请选择现住址',
if (!this.isEdit) {
if (!this.form.objectType) {
@@ -604,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('请输入正确的手机号')
@@ -685,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)

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

@@ -2,17 +2,6 @@
<div class="add">
<div class="form">
<div class="form-group">
<!-- <div class="form-item" v-if="!id">
<div class="form-item__wrapper">
<div class="left">
<i>*</i>
<span>监测对象类型</span>
</div>
<div class="right">
<AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
</div>
</div>
</div> -->
<div class="form-item">
<div class="form-item__wrapper">
<div class="left">
@@ -105,7 +94,6 @@
<span>现住址</span>
</div>
<div class="right">
<!-- :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">
<div class="aiArea">
@@ -290,7 +278,7 @@
<div class="right">
<div class="check-item" :class="form.mandarin == '01' ? 'check-active' : '' " @click="form.mandarin='01'">是<img
src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.mandarin != '01' ? 'check-active' : '' " @click="form.mandarin='02'">否<img
<div class="check-item" :class="form.mandarin == '02' ? 'check-active' : '' " @click="form.mandarin='02'">否<img
src="./components/img/check-icon.png" alt=""></div>
</div>
</div>
@@ -367,7 +355,7 @@
<div class="right">
<div class="check-item" :class="form.foreignWorkers == '01' ? 'check-active' : '' " @click="form.foreignWorkers='01'">是<img
src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.foreignWorkers != '01' ? 'check-active' : '' " @click="form.foreignWorkers='02'">否<img
<div class="check-item" :class="form.foreignWorkers == '02' ? 'check-active' : '' " @click="form.foreignWorkers='02'">否<img
src="./components/img/check-icon.png" alt=""></div>
</div>
</div>
@@ -597,9 +585,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) {

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

@@ -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) {

30
src/apps/AppMonitoringObject/MonitorIncome.vue
View File

@@ -8,7 +8,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income3" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -19,7 +19,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income4" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -30,7 +30,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income5" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -41,7 +41,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income6" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -52,7 +52,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income9" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -65,7 +65,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income7" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -76,7 +76,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income8" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -87,7 +87,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income10" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -98,7 +98,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income13" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -109,7 +109,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income14" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -120,7 +120,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income11" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -131,7 +131,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income12" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -142,7 +142,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income15" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -153,7 +153,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income1" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>
@@ -164,7 +164,7 @@
</div>
<div class="right">
<input placeholder="请输入" v-model="form.income2" type="number"
placeholder-style="color: #999; font-size: 30rpx;"/>
placeholder-style="color: #999; font-size: 30rpx;" maxlength="9"/>
</div>
</div>
</div>