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

This commit is contained in:
aixianling
2022-04-29 18:32:49 +08:00
4 changed files with 76 additions and 41 deletions

View File

@@ -300,10 +300,8 @@
<span>是否会讲普通话</span>
</div>
<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
src="./components/img/check-icon.png" alt=""></div>
<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 == '02' ? 'check-active' : '' " @click="form.mandarin='02'"><img src="./components/img/check-icon.png" alt=""></div>
</div>
</div>
</div>
@@ -377,10 +375,8 @@
<span>是否国外务工</span>
</div>
<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
src="./components/img/check-icon.png" alt=""></div>
<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 == '02' ? 'check-active' : '' " @click="form.foreignWorkers='02'"><img src="./components/img/check-icon.png" alt=""></div>
</div>
</div>
</div>
@@ -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('请选择现住址')
}