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

28550

Browse Source
This commit is contained in:
yanran200730
2022-03-28 10:29:53 +08:00
parent f160760526
commit 52c854661a
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/meta/AppResident/localResident.vue
View File

@@ -437,7 +437,7 @@
</div> </div>
<el-form-item label="户籍地：" prop="householdAreaId"> <el-form-item label="户籍地：" prop="householdAreaId">
<ai-area-select clearable always-show :instance="instance" v-if="showEdit3" <ai-area-select clearable always-show :instance="instance" v-if="showEdit3"
v-model="baseInfo.householdAreaId" :disabled-level="disabledLevel" :valueLevel="4"/> v-model="baseInfo.householdAreaId" />
<el-form-item v-if="baseInfo.householdAreaId"> <el-form-item v-if="baseInfo.householdAreaId">
<el-input v-model="baseInfo.householdAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/> <el-input v-model="baseInfo.householdAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
</el-form-item> </el-form-item>
@@ -740,10 +740,9 @@ export default {
}], }],
currentAddress: [{message: "请选择现住址详细地址", required: true}], currentAddress: [{message: "请选择现住址详细地址", required: true}],
householdAreaId: [ householdAreaId: [
{message: "户籍地必须选到村级", required: true,trigger: "blur"},
{ {
validator: (r, v, cb) => { validator: (r, v, cb) => {
if (/.+0{3}$/.test(v)) { if (/.+0{3}$/.test(v) && v) {
cb("户籍地必须选到村级") cb("户籍地必须选到村级")
} else cb() } else cb()
},trigger: "blur" },trigger: "blur"
@@ -969,7 +968,7 @@ export default {
this.showEdit2 = true; this.showEdit2 = true;
this.showEdit3 = true; this.showEdit3 = true;
this.showEdit4 = 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.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
this.$nextTick(() => this.$refs.ruleForm?.resetFields()) this.$nextTick(() => this.$refs.ruleForm?.resetFields())
} else { } else {

7
packages/meta/AppResident/mobileResident.vue
View File

@@ -434,7 +434,7 @@
</div> </div>
<el-form-item label="户籍地：" prop="householdAreaId"> <el-form-item label="户籍地：" prop="householdAreaId">
<ai-area-select clearable always-show :instance="instance" v-if="showEdit3" <ai-area-select clearable always-show :instance="instance" v-if="showEdit3"
v-model="baseInfo.householdAreaId" :valueLevel="4"/> v-model="baseInfo.householdAreaId" />
<el-form-item v-if="baseInfo.householdAreaId"> <el-form-item v-if="baseInfo.householdAreaId">
<el-input v-model="baseInfo.householdAddress" maxlength="30" show-word-limit placeholder="详细地址" clearable/> <el-input v-model="baseInfo.householdAddress" maxlength="30" show-word-limit placeholder="详细地址" clearable/>
</el-form-item> </el-form-item>
@@ -719,10 +719,9 @@ export default {
}], }],
currentAddress: [{message: "请选择现住址详细地址", required: true}], currentAddress: [{message: "请选择现住址详细地址", required: true}],
householdAreaId: [ householdAreaId: [
{message: "户籍地必须选到村级", required: true, trigger: "blur"},
{ {
validator: (r, v, cb) => { validator: (r, v, cb) => {
if (/.+0{3}$/.test(v)) { if (/.+0{3}$/.test(v) && v) {
cb("户籍地必须选到村级") cb("户籍地必须选到村级")
} else cb() } else cb()
}, trigger: "blur" }, trigger: "blur"
@@ -947,7 +946,7 @@ export default {
this.showEdit2 = true; this.showEdit2 = true;
this.showEdit3 = true; this.showEdit3 = true;
this.showEdit4 = 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.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
this.$nextTick(() => this.$refs.ruleForm?.resetFields()) this.$nextTick(() => this.$refs.ruleForm?.resetFields())
} else { } else {