Browse Source

Merge branch 'dev_ljj_idcard'

feature
wangxianzhang 3 years ago
parent
commit
0fc44f686c
  1. 4
      src/utils/validate.js
  2. 8
      src/views/modules/base/huji/chusheng/cpts/edit.vue
  3. 6
      src/views/modules/base/huji/chusheng/index.vue
  4. 36
      src/views/modules/base/huji/immigration/edit.vue
  5. 14
      src/views/modules/base/huji/immigration/index.vue
  6. 4
      src/views/modules/plugins/change/changedeath-add-or-update.vue
  7. 6
      src/views/modules/plugins/change/changedeath.vue
  8. 6
      src/views/modules/plugins/change/changerelocation.vue
  9. 4
      src/views/modules/plugins/change/changewelfare-add-or-update.vue
  10. 6
      src/views/modules/plugins/change/changewelfare.vue
  11. 14
      src/views/modules/plugins/change/verify.vue
  12. 12
      src/views/modules/plugins/change/verifyForm.vue

4
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);
}

8
src/views/modules/base/huji/chusheng/cpts/edit.vue

@ -170,7 +170,7 @@
</el-form-item>
<el-form-item
label="身份证号"
label="证号"
prop="idCard"
label-width="150px"
style="display: block"
@ -178,7 +178,7 @@
<el-input
class="item_width_1"
maxlength="30"
placeholder="请输入身份证号"
placeholder="请输入身份证号或护照号"
v-model="fmData.idCard"
@blur="handleBlurId"
:disabled="formType === 'edit'"
@ -444,10 +444,10 @@ export default {
dataRule() {
let checkIdCard = (rule, value, callback) => {
if (value === "") {
callback(new Error("请输入身份证"));
callback(new Error("请输入证件号"));
} else {
if (!isCard(value)) {
callback(new Error("身份证号格式不正确"));
callback(new Error("证号格式不正确"));
}
callback();
}

6
src/views/modules/base/huji/chusheng/index.vue

@ -131,13 +131,13 @@
</el-input>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-form-item label="证号" prop="idCard">
<el-input
v-model="fmData.idCard"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
placeholder="请输入身份证号或证件号"
>
</el-input>
</el-form-item>
@ -282,7 +282,7 @@
<el-table-column
prop="idCard"
align="center"
label="身份证号"
label="证号"
:show-overflow-tooltip="true"
>
</el-table-column>

36
src/views/modules/base/huji/immigration/edit.vue

@ -153,7 +153,7 @@
>补充居民信息</el-checkbox
>
</template>
<el-checkbox
v-else
v-model="fmData.isCheck"
@ -183,14 +183,14 @@
</el-form-item>
<el-form-item
label="身份证号"
label="证号"
prop="idCard"
label-width="150px"
style="display: block"
>
<el-input
class="item_width_1"
placeholder="请输入身份证号"
placeholder="请输入身份证号或护照号"
v-model="fmData.idCard"
:disabled="formType === 'edit'"
@blur="handleBlurId"
@ -282,9 +282,9 @@
disabled
v-model="fmData.sourceAddress"
/>
<el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps"
<el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps"
v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
</el-form-item>
<el-form-item
label="详细地址"
@ -439,10 +439,10 @@ export default {
dataRule() {
let checkIdCard = (rule, value, callback) => {
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'

14
src/views/modules/base/huji/immigration/index.vue

@ -134,7 +134,7 @@
</el-input>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-form-item label="证号" prop="idCard">
<el-input
v-model="fmData.idCard"
class="resi-cell-input"
@ -291,7 +291,7 @@
prop="idCard"
align="center"
min-width="160"
label="身份证号"
label="证号"
>
</el-table-column>
@ -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)

4
src/views/modules/plugins/change/changedeath-add-or-update.vue

@ -7,8 +7,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="身份证" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
<el-form-item label="证件号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>

6
src/views/modules/plugins/change/changedeath.vue

@ -12,13 +12,13 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入身份证号或护照号">
</el-input>
</el-form-item>
<el-form-item label="手机"
@ -82,7 +82,7 @@
<el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
</template>
</el-table-column>
<el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="gender" label="性别" header-align="center" align="center">
<template slot-scope="scope">

6
src/views/modules/plugins/change/changerelocation.vue

@ -109,13 +109,13 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入身份证号或护照号">
</el-input>
</el-form-item>
<el-form-item label="手机"
@ -181,7 +181,7 @@
<el-table-column prop="oldAddress" label="所属房屋" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="idCard" label="证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{

4
src/views/modules/plugins/change/changewelfare-add-or-update.vue

@ -10,8 +10,8 @@
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="身份证" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
<el-form-item label="护照号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>

6
src/views/modules/plugins/change/changewelfare.vue

@ -12,13 +12,13 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
<el-form-item label="护照号"
prop="idCard">
<el-input v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入身份证号或护照号">
</el-input>
</el-form-item>
<el-form-item label="手机"
@ -76,7 +76,7 @@
<el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
</template>
</el-table-column>
<el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="gender" label="性别" header-align="center" align="center">
<template slot-scope="scope">

14
src/views/modules/plugins/change/verify.vue

@ -134,7 +134,7 @@
</el-input>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-form-item label="证号" prop="idCard">
<el-input
v-model="fmData.idCard"
class="resi-cell-input"
@ -236,7 +236,7 @@
prop="idCard"
align="center"
width="180"
label="身份证号"
label="证号"
>
</el-table-column>
@ -276,7 +276,7 @@
align="center"
width="100"
/>
<el-table-column fixed="right" label="操作" align="center" width="120">
<template slot-scope="scope">
@ -298,7 +298,7 @@
>审核</el-button
>
</template>
</template>
</el-table-column>
</el-table>
@ -408,9 +408,9 @@ export default {
const _h = this.clientHeight - this.searchH - 440
console.log('computed-searchH---_h', _h)
return this.$store.state.inIframe ? h : _h
},
changeVDisabled() {
return !this.fmData.villageId
},
@ -436,7 +436,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
})

12
src/views/modules/plugins/change/verifyForm.vue

@ -15,7 +15,7 @@
<span>{{ detailInfo.mobile }}</span>
</el-form-item>
<el-form-item
label="身份证号:"
label="证号:"
label-width="150px"
>
<span>{{ detailInfo.idCard }}</span>
@ -140,7 +140,7 @@
</template> -->
</el-form>
<el-form v-if="btnType == 'detail' && isMoveOut == 1" :model="detailInfo">
<template>
<el-form-item
label="迁往区域:"
@ -155,14 +155,14 @@
<span>{{ detailInfo.newHomeName }}</span>
</el-form-item>
</template>
<el-form-item
label="迁出时间:"
label-width="150px"
>
<span>{{ detailInfo.moveOutDate }}</span>
</el-form-item>
</el-form>
@ -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)

Loading…
Cancel
Save