diff --git a/src/utils/validate.js b/src/utils/validate.js index a130010f2..480ad2692 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -33,9 +33,9 @@ export function isURL(s) { } /** - * 身份证 + * 身份证或证件号 * @param {*} s */ export function isCard(s) { - return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s); + return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s); } diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue index ccf2018e4..9edea79ba 100644 --- a/src/views/modules/base/huji/chusheng/cpts/edit.vue +++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue @@ -170,7 +170,7 @@ { if (value === "") { - callback(new Error("请输入身份证")); + callback(new Error("请输入证件号")); } else { if (!isCard(value)) { - callback(new Error("身份证号格式不正确")); + callback(new Error("证件号格式不正确")); } callback(); } diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue index 99b9837f0..fca0d3e4a 100644 --- a/src/views/modules/base/huji/chusheng/index.vue +++ b/src/views/modules/base/huji/chusheng/index.vue @@ -131,13 +131,13 @@ - + @@ -282,7 +282,7 @@ diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue index 2999880c6..764b7a8b9 100644 --- a/src/views/modules/base/huji/immigration/edit.vue +++ b/src/views/modules/base/huji/immigration/edit.vue @@ -153,7 +153,7 @@ >补充居民信息 - + - - + { if (value === '') { - callback(new Error('请输入身份证')) + callback(new Error('请输入证件号')) } else { if (!isCard(value)) { - callback(new Error('身份证号格式不正确')) + callback(new Error('证件号格式不正确')) } callback() } @@ -457,7 +457,7 @@ export default { ], name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }], idCard: [ - { required: true, message: '身份证号不能为空', trigger: 'blur' }, + { required: true, message: '证件号不能为空', trigger: 'blur' }, { required: true, validator: checkIdCard, trigger: 'blur' } ], inTime: [ @@ -491,7 +491,7 @@ export default { async mounted() { console.log('mounted-----我执行了') await this.getGridList() - + this.getRelationList() }, @@ -616,7 +616,7 @@ export default { if (code === 0) { const nodes = data.map(item => ({ - value: item.areaCode, // + value: item.areaCode, // label: item.areaName, code: item.areaCode, level: item.level, @@ -748,7 +748,7 @@ export default { return this.$message.error(res.msg) } else { console.log('获取户主信息成功', res.data) - + if (res.data) { const { name } = res.data this.fmData.householderName = name @@ -767,7 +767,7 @@ export default { this.$refs.ref_form.resetFields() this.formType = type - + if (id) { await this.getDatail(id) } @@ -780,7 +780,7 @@ export default { }, async getDatail(moveInId) { let url = '/epmetuser/icMoveIn/detail' - + const params = { moveInId: moveInId || '' } @@ -793,7 +793,7 @@ export default { }, async handleComfirm() { - + // setTimeout(() => { // this.btnDisable = false // }, 10000) @@ -821,21 +821,21 @@ export default { this.fmData.isReplace = '1' this.submit() }).catch(() => { - this.fmData.isReplace = '0' - this.submit() + this.fmData.isReplace = '0' + this.submit() }); return } } } this.submit() - + } }) }, async submit() { - + let url = '' if (this.formType === 'add') { url = '/epmetuser/icMoveIn/add' diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue index 641343708..8f4673564 100644 --- a/src/views/modules/base/huji/immigration/index.vue +++ b/src/views/modules/base/huji/immigration/index.vue @@ -134,7 +134,7 @@ - + @@ -491,9 +491,9 @@ export default { const _h = this.clientHeight - this.searchH console.log('computed-searchH---_h', _h) return this.$store.state.inIframe ? h : _h - + }, - + changeVDisabled() { return !this.fmData.villageId }, @@ -519,7 +519,7 @@ export default { const h = this.clientHeight - this.searchH + this.iframeHeight const _h = this.clientHeight - this.searchH console.log('computed-searchH---_h', _h) - + this.$nextTick(() => { this.tableHeight = this.$store.state.inIframe ? h : _h }) @@ -831,13 +831,13 @@ export default { console.log('res----dddd', res) // this.download(res.data, title + '.xls') // this.getTemplateList() - + // this.exportLoading = false // if (res.data.code && res.data.code == 9999) { // return this.$message.error(res.data.msg) // } this.formatData(res) - + }) .catch(err => { console.log('err', err) diff --git a/src/views/modules/plugins/change/changedeath-add-or-update.vue b/src/views/modules/plugins/change/changedeath-add-or-update.vue index 19cdb429d..bab279502 100644 --- a/src/views/modules/plugins/change/changedeath-add-or-update.vue +++ b/src/views/modules/plugins/change/changedeath-add-or-update.vue @@ -7,8 +7,8 @@ - - + + diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 725c58069..d1a75bffb 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -12,13 +12,13 @@ placeholder="请输入姓名"> - + placeholder="请输入身份证号或护照号"> {{scope.row.name}} - + --> - + - + {{ detailInfo.moveOutDate }} - + @@ -491,7 +491,7 @@ export default { this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : '' } else this.confirmResult = '1' if (row.newGridName) this.isMoveOut = 1 - + this.reason = row.reason // await this.loadRootAgency() @@ -751,7 +751,7 @@ export default { moveOutDate: this.dataForm.outOfTime } } - + const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)