diff --git a/packages/meta/AppResident/localResident.vue b/packages/meta/AppResident/localResident.vue index ea63a19d..90ff7c96 100644 --- a/packages/meta/AppResident/localResident.vue +++ b/packages/meta/AppResident/localResident.vue @@ -437,7 +437,7 @@ + v-model="baseInfo.householdAreaId" /> @@ -740,10 +740,9 @@ export default { }], currentAddress: [{message: "请选择现住址详细地址", required: true}], householdAreaId: [ - {message: "户籍地必须选到村级", required: true,trigger: "blur"}, { validator: (r, v, cb) => { - if (/.+0{3}$/.test(v)) { + if (/.+0{3}$/.test(v) && v) { cb("户籍地必须选到村级") } else cb() },trigger: "blur" @@ -969,7 +968,7 @@ export default { this.showEdit2 = true; this.showEdit3 = true; this.showEdit4 = true; - this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId)) + // this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId)) this.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId)) this.$nextTick(() => this.$refs.ruleForm?.resetFields()) } else { diff --git a/packages/meta/AppResident/mobileResident.vue b/packages/meta/AppResident/mobileResident.vue index c9a35a18..0ca331df 100644 --- a/packages/meta/AppResident/mobileResident.vue +++ b/packages/meta/AppResident/mobileResident.vue @@ -434,7 +434,7 @@ + v-model="baseInfo.householdAreaId" /> @@ -719,10 +719,9 @@ export default { }], currentAddress: [{message: "请选择现住址详细地址", required: true}], householdAreaId: [ - {message: "户籍地必须选到村级", required: true, trigger: "blur"}, { validator: (r, v, cb) => { - if (/.+0{3}$/.test(v)) { + if (/.+0{3}$/.test(v) && v) { cb("户籍地必须选到村级") } else cb() }, trigger: "blur" @@ -947,7 +946,7 @@ export default { this.showEdit2 = true; this.showEdit3 = true; this.showEdit4 = true; - this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId)) + // this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId)) this.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId)) this.$nextTick(() => this.$refs.ruleForm?.resetFields()) } else {