elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_ljj_idcard' into dev

dev-用户反馈
jianjun 3 years ago
parent
8b45b47cd8 cb8e0e9889
commit
14838d329b
18 changed files with 402 additions and 363 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/utils/validate.js
  2. 4
      src/views/components/editResi.vue
  3. 199
      src/views/components/resiForm.vue
  4. 8
      src/views/modules/base/epidemic/antiInfo.vue
  5. 12
      src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
  6. 4
      src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
  7. 6
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  8. 10
      src/views/modules/base/epidemic/natInfo/natForm.vue
  9. 6
      src/views/modules/base/epidemic/natInfo/natList.vue
  10. 6
      src/views/modules/base/epidemic/travel.vue
  11. 8
      src/views/modules/base/epidemic/travelForm.vue
  12. 6
      src/views/modules/base/epidemic/vaccin.vue
  13. 10
      src/views/modules/base/epidemic/vaccinAdd.vue
  14. 10
      src/views/modules/base/epidemic/vaccinForm.vue
  15. 12
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  16. 4
      src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
  17. 6
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  18. 10
      src/views/modules/shequzhili/xiangmu/cpts/edit.vue

10
src/utils/validate.js
View File

@ -39,3 +39,13 @@ export function isURL(s) {
export function isCard(s) { export function isCard(s) {
return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s); return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
} }
/**
* 护照
* @param {*} s
*/
export function isPassport(s) {
let reg=/(^[EeKkGgDdSsPpHh]\d{8}$)|(^(([Ee][a-fA-F])|([DdSsPp][Ee])|([Kk][Jj])|([Mm][Aa])|(1[45]))\d{7}$)/; //护照（包括香港和澳门）
return reg.test(s);
}

4
src/views/components/editResi.vue
View File

@ -333,10 +333,10 @@ export default {
} }
let checkIdCard = (rule, value, callback) => { let checkIdCard = (rule, value, callback) => {
if (value === '') { if (value === '') {
callback(new Error('请输入身份证')) callback(new Error('请输入证件号'))
} else { } else {
if (!isCard(value)) { if (!isCard(value)) {
callback(new Error('身份证号格式不正确')) callback(new Error('证件号格式不正确'))
} }
callback() callback()
} }

199
src/views/components/resiForm.vue
View File

@ -1,27 +1,43 @@
<template> <template>
<div :id="formId" class="resi-container"> <div :id="formId"
<el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth"> class="resi-container">
<el-form :ref="formId"
class="resi-form"
:model="form"
:rules="rulesForm"
:label-width="labelWidth">
<template v-if="supportAdd"> <template v-if="supportAdd">
<el-row style="margin-bottom: 10px;"> <el-row style="margin-bottom: 10px;">
<el-col :span="24"> <el-col :span="24">
<el-button icon="el-icon-plus" size="small" @click="handleAddRow"></el-button> <el-button icon="el-icon-plus"
size="small"
@click="handleAddRow"></el-button>
</el-col> </el-col>
</el-row> </el-row>
<resi-form v-for="(item, index) in addList" :key="index" :ref="'baseForms' + index" :columns="3" :form-list="formList" :form-id="'baseForms' + item" /> <resi-form v-for="(item, index) in addList"
:key="index"
:ref="'baseForms' + index"
:columns="3"
:form-list="formList"
:form-id="'baseForms' + item" />
</template> </template>
<template v-else> <template v-else>
<el-row v-if="fixed" class="resi-row"> <el-row v-if="fixed"
class="resi-row">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="GRID_ID" label="所属网格"> <el-form-item prop="GRID_ID"
label="所属网格">
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> --> <!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select v-model.trim="form.GRID_ID" placeholder="请选择网格" size="small" <el-select v-model.trim="form.GRID_ID"
clearable class="resi-cell-select" @change="handleChangeGrid" placeholder="请选择网格"
> size="small"
<el-option clearable
v-for="item in optionsG" class="resi-cell-select"
@change="handleChangeGrid">
<el-option v-for="item in optionsG"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -32,15 +48,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="所属房屋" required> <el-form-item label="所属房屋"
required>
<div class="resi-cell-value"> <div class="resi-cell-value">
<div class="resi-cell-col"> <div class="resi-cell-col">
<el-form-item prop="VILLAGE_ID"> <el-form-item prop="VILLAGE_ID">
<el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small" <el-select v-model.trim="form.VILLAGE_ID"
clearable class="resi-cell-select" @change="handleChangeV" placeholder="请选择小区"
> size="small"
<el-option clearable
v-for="item in optionsV" class="resi-cell-select"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -48,11 +67,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="BUILD_ID"> <el-form-item prop="BUILD_ID">
<el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small" <el-select v-model.trim="form.BUILD_ID"
clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB" placeholder="请选择楼号"
> size="small"
<el-option clearable
v-for="item in optionsB" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -60,11 +81,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="UNIT_ID"> <el-form-item prop="UNIT_ID">
<el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small" <el-select v-model.trim="form.UNIT_ID"
clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD" placeholder="请选择单元"
> size="small"
<el-option clearable
v-for="item in optionsD" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -72,12 +95,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="HOME_ID"> <el-form-item prop="HOME_ID">
<el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small" <el-select v-model.trim="form.HOME_ID"
clearable class="resi-cell-select resi-cell-select-middle" placeholder="请选择房号"
@change="handleChangeH" size="small"
> clearable
<el-option class="resi-cell-select resi-cell-select-middle"
v-for="item in optionsH" @change="handleChangeH">
<el-option v-for="item in optionsH"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -102,33 +126,34 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row"> <el-row v-for="(item, index) in sliceList(formList, columns)"
:key="index"
class="resi-row">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)" <el-col v-for="n in item"
:key="n.itemId"
:span="item.length === 1 ? 24 : (24/columns)"
:style="n.itemType === 'divider' && 'display: none;'"> :style="n.itemType === 'divider' && 'display: none;'">
<el-form-item :prop="n.columnName" :label="n.label"> <el-form-item :prop="n.columnName"
:label="n.label">
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> --> <!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value"> <div class="resi-cell-value">
<template v-if="n.itemType === 'input' || n.itemType === 'textarea'"> <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
<el-input <el-input v-if="n.validType"
v-if="n.validType"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入内容" placeholder="请输入内容"
@blur="handleValidBlur(n)" @blur="handleValidBlur(n)">
>
</el-input> </el-input>
<el-input <el-input v-else
v-else
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入内容" placeholder="请输入内容">
>
</el-input> </el-input>
</template> </template>
<!-- <template v-if="n.itemType === 'textarea'"> <!-- <template v-if="n.itemType === 'textarea'">
@ -142,8 +167,7 @@
> >
</el-input> </el-input>
</template> --> </template> -->
<el-date-picker <el-date-picker v-else-if="n.itemType === 'datepicker'"
v-else-if="n.itemType === 'datepicker'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
class="resi-cell-input" class="resi-cell-input"
type="date" type="date"
@ -153,8 +177,7 @@
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
<el-date-picker <el-date-picker v-else-if="n.itemType === 'daterange'"
v-else-if="n.itemType === 'daterange'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
type="daterange" type="daterange"
align="right" align="right"
@ -162,16 +185,13 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
>
</el-date-picker> </el-date-picker>
<el-time-picker <el-time-picker v-else-if="n.itemType === 'timepicker'"
v-else-if="n.itemType === 'timepicker'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
placeholder="任意时间点"> placeholder="任意时间点">
</el-time-picker> </el-time-picker>
<el-time-picker <el-time-picker v-else-if="n.itemType === 'timerange'"
v-else-if="n.itemType === 'timerange'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
is-range is-range
class="resi-cell-range" class="resi-cell-range"
@ -180,11 +200,14 @@
end-placeholder="结束时间" end-placeholder="结束时间"
placeholder="选择时间范围"> placeholder="选择时间范围">
</el-time-picker> </el-time-picker>
<el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]" <el-select v-else-if="n.itemType === 'select'"
v-model.trim="form[n.columnName]"
:multiple="n.multiSelect" :multiple="n.multiSelect"
placeholder="请选择" size="small" clearable class="resi-cell-select"> placeholder="请选择"
<el-option size="small"
v-for="item in n.options || options" clearable
class="resi-cell-select">
<el-option v-for="item in n.options || options"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -194,8 +217,7 @@
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable></el-cascader> --> clearable></el-cascader> -->
<el-cascader <el-cascader v-else-if="n.itemType === 'cascader'"
v-else-if="n.itemType === 'cascader'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:options="n.options" :options="n.options"
:props="{ emitPath: false }" :props="{ emitPath: false }"
@ -204,8 +226,11 @@
class="resi-cell-select"> class="resi-cell-select">
</el-cascader> </el-cascader>
<template v-else-if="n.itemType === 'radio'"> <template v-else-if="n.itemType === 'radio'">
<el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]" <el-radio v-for="ns in n.options"
:label="ns.value" @change="hanldeChangeRadio(n)"> :key="ns.value"
v-model.trim="form[n.columnName]"
:label="ns.value"
@change="hanldeChangeRadio(n)">
{{ ns.label }} {{ ns.label }}
</el-radio> </el-radio>
<!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> --> <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
@ -213,7 +238,9 @@
<template v-else-if="n.itemType === 'checkbox'"> <template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model.trim="form[n.columnName]"> <el-checkbox-group v-model.trim="form[n.columnName]">
<template v-for="ns in n.options"> <template v-for="ns in n.options">
<el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'" :key="ns.value" :label="ns.value"> <el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'"
:key="ns.value"
:label="ns.value">
{{ns.label}} {{ns.label}}
</el-checkbox> </el-checkbox>
</template> </template>
@ -231,7 +258,7 @@
</template> </template>
<script> <script>
import { isCard, isMobile } from '@/utils/validate' import { isCard, isPassport, isMobile } from '@/utils/validate'
import { computedCard } from '@/utils/index' import { computedCard } from '@/utils/index'
export default { export default {
@ -286,10 +313,10 @@ export default {
} }
let checkIdCard = (rule, value, callback) => { let checkIdCard = (rule, value, callback) => {
if (value === '') { if (value === '') {
callback(new Error('请输入身份证')) callback(new Error('请输入证件号码'))
} else { } else {
if (!isCard(value)) { if (!isCard(value) && !isPassport(value)) {
callback(new Error('身份证号格式不正确')) callback(new Error('证件号码格式不正确'))
} }
callback() callback()
} }
@ -351,7 +378,7 @@ export default {
let form = initForm(this.formInfo, this.formList) let form = initForm(this.formInfo, this.formList)
let rules = initRules(this.formList) let rules = initRules(this.formList)
console.log('rulessss', rules) console.log('rulessss', rules)
let tempFormList = [ ...this.formList ].map(item => { let tempFormList = [...this.formList].map(item => {
const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true
return { return {
...item, ...item,
@ -506,19 +533,20 @@ export default {
// } // }
}) })
}, },
hanldeChangeRadio(n) { hanldeChangeRadio (n) {
this.$emit('changeradio', n) this.$emit('changeradio', n)
}, },
handleValidBlur(n) { handleValidBlur (n) {
console.log('n---', n) console.log('n---', n)
if (n.columnName !== 'ID_CARD') return if (n.columnName !== 'ID_CARD') return
if (!isCard(this.form.ID_CARD)) return if (!isCard(this.form.ID_CARD) && !isPassport(this.form.ID_CARD)) return
const { user } = this.$store.state const { user } = this.$store.state
let huji = '', i = 0 let huji = '', i = 0
if (user.areaCodePath && user.areaCodePath.length > 0) { if (user.areaCodePath && user.areaCodePath.length > 0) {
i = user.areaCodePath.length - 1 i = user.areaCodePath.length - 1
huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i] huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
} }
if (this.form.ID_CARD.length === 18 || this.form.ID_CARD.length === 15) {
const _id = this.form.ID_CARD.substr(0, 6) const _id = this.form.ID_CARD.substr(0, 6)
const { sex, birth, age } = computedCard(this.form.ID_CARD) const { sex, birth, age } = computedCard(this.form.ID_CARD)
this.form.BIRTHDAY = birth this.form.BIRTHDAY = birth
@ -527,6 +555,8 @@ export default {
this.form.IS_BDHJ = huji == _id ? '1' : '' this.form.IS_BDHJ = huji == _id ? '1' : ''
this.validateIdcard(this.form.ID_CARD) this.validateIdcard(this.form.ID_CARD)
console.log('age-----', age, _id) console.log('age-----', age, _id)
}
}, },
handleOpenSearch () { handleOpenSearch () {
this.openSearch = !this.openSearch this.openSearch = !this.openSearch
@ -589,9 +619,9 @@ export default {
this.getHouseList() this.getHouseList()
}, },
// 为了实现根据房屋类型改版是否租户的需求 // 为了实现根据房屋类型改版是否租户的需求
handleChangeH(val){ handleChangeH (val) {
let item = this.optionsH.find(item => item.value === val); let item = this.optionsH.find(item => item.value === val);
if(item && item.type == '1'){ if (item && item.type == '1') {
this.form.IS_TENANT = '1' this.form.IS_TENANT = '1'
console.log('item-----', item) console.log('item-----', item)
} else this.form.IS_TENANT = '0' } else this.form.IS_TENANT = '0'
@ -619,7 +649,7 @@ export default {
let arr = [] let arr = []
this.addList.forEach(item => { this.addList.forEach(item => {
// console.log('handlerMuscForm----000', this.$refs['baseForms' + item][0].handleForm()) // console.log('handlerMuscForm----000', this.$refs['baseForms' + item][0].handleForm())
arr.push([ ...this.$refs['baseForms' + item][0].handleForm() ]) arr.push([...this.$refs['baseForms' + item][0].handleForm()])
}) })
// console.log('handlerMuscForm----111', arr) // console.log('handlerMuscForm----111', arr)
let arr2 = arr.reduce(function (a, b) { return a.concat(b) }) let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@ -822,7 +852,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.resi-form { .resi-form {
:deep .el-date-editor.el-input, .el-date-editor.el-input__inner { :deep .el-date-editor.el-input,
.el-date-editor.el-input__inner {
width: 100% !important; width: 100% !important;
} }
} }
@ -839,22 +870,20 @@ export default {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.resi-form .resi-row { .resi-form .resi-row {
margin-bottom: 0; margin-bottom: 0;
} }
.resi-cell-value .resi-cell-textarea {
.resi-cell-value .resi-cell-textarea {
width: 300px; width: 300px;
} }
.resi-cell-col { .resi-cell-col {
display: flex; display: flex;
.el-form-item { .el-form-item {
margin-right: 10px; margin-right: 10px;
} }
} }
.resi-cell-select { .resi-cell-select {
width: 190px; width: 190px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px; margin-right: 10px;
@ -864,8 +893,8 @@ export default {
&-small { &-small {
width: 88px; width: 88px;
} }
} }
.resi-cell-select:last-child { .resi-cell-select:last-child {
margin-right: 0; margin-right: 0;
} }
</style> </style>

8
src/views/modules/base/epidemic/antiInfo.vue
View File

@ -101,13 +101,13 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="idCard"> prop="idCard">
<el-input v-model="searchForm.idCard" <el-input v-model="searchForm.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证号或护照号">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -197,7 +197,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证号" label="证件号"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="birthDay" <el-table-column prop="birthDay"
@ -318,7 +318,7 @@
</el-input> </el-input>
<!-- <span>{{ formDetail.mobile }}</span> --> <!-- <span>{{ formDetail.mobile }}</span> -->
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="idCard"> prop="idCard">
<el-input v-model="formDetail.idCard" <el-input v-model="formDetail.idCard"
size="small" size="small"

12
src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
View File

@ -36,12 +36,12 @@
v-model="formData1.mobile"> v-model="formData1.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入身份证号" placeholder="请输入身份证号或证件号"
clearable clearable
v-model="formData1.idCard"> v-model="formData1.idCard">
</el-input> </el-input>
@ -196,7 +196,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="houseName" <el-table-column prop="houseName"
@ -602,12 +602,12 @@ export default {
}) })
return false; return false;
} }
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (regCard.test(this.formData1.idCard) === false) { if (regCard.test(this.formData1.idCard) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的身份证号码' message: '请输入正确的证件号码'
}) })
return false; return false;
} }
@ -783,7 +783,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'blur' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '证件号不能为空', trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },

4
src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
View File

@ -33,7 +33,7 @@
v-model="formData.mobile"> v-model="formData.mobile">
</el-input> --> </el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
@ -285,7 +285,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'blur' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '证件号不能为空', trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },

6
src/views/modules/base/epidemic/natFocus/natFocusList.vue
View File

@ -28,13 +28,13 @@
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="mobile"> prop="mobile">
<el-input v-model="formData.idCard" <el-input v-model="formData.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证号或护照号">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -210,7 +210,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
width="170"> width="170">
</el-table-column> </el-table-column>
<el-table-column prop="allName" <el-table-column prop="allName"

10
src/views/modules/base/epidemic/natInfo/natForm.vue
View File

@ -84,12 +84,12 @@
v-model="formData.mobile"> v-model="formData.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入身份证号" placeholder="请输入身份证号或护照号"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
v-model="formData.idCard"> v-model="formData.idCard">
@ -449,12 +449,12 @@ export default {
}) })
return false; return false;
} }
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (regCard.test(this.formData.idCard) === false) { if (regCard.test(this.formData.idCard) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的身份证号码' message: '请输入正确的证件号码'
}) })
return false; return false;
} }
@ -623,7 +623,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'blur' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '证件号不能为空', trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },

6
src/views/modules/base/epidemic/natInfo/natList.vue
View File

@ -71,13 +71,13 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="idCard"> prop="idCard">
<el-input v-model="formData.idCard" <el-input v-model="formData.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证号或护照号">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -153,7 +153,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="natTime" <el-table-column prop="natTime"

6
src/views/modules/base/epidemic/travel.vue
View File

@ -28,13 +28,13 @@
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="idCard"> prop="idCard">
<el-input v-model="formData.idCard" <el-input v-model="formData.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证号或证件号">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -154,7 +154,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="detailAddress" <el-table-column prop="detailAddress"

8
src/views/modules/base/epidemic/travelForm.vue
View File

@ -83,12 +83,12 @@
v-model="formData.mobile"> v-model="formData.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入身份证号" placeholder="请输入身份证号或证件号"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
v-model="formData.idCard"> v-model="formData.idCard">
@ -245,10 +245,10 @@ export default {
} }
let checkIdCard = (rule, value, callback) => { let checkIdCard = (rule, value, callback) => {
if (value === '') { if (value === '') {
callback(new Error('身份证不能为空')) callback(new Error('证件号不能为空'))
} else { } else {
if (!isCard(value)) { if (!isCard(value)) {
callback(new Error('身份证号格式不正确')) callback(new Error('证件号格式不正确'))
} }
callback() callback()
} }

6
src/views/modules/base/epidemic/vaccin.vue
View File

@ -68,13 +68,13 @@
placeholder="请输入手机号"> placeholder="请输入手机号">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="idCard"> prop="idCard">
<el-input v-model="formData.idCard" <el-input v-model="formData.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证号或证件号">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -149,7 +149,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="inoculateTime" <el-table-column prop="inoculateTime"

10
src/views/modules/base/epidemic/vaccinAdd.vue
View File

@ -84,12 +84,12 @@
v-model="formData.mobile"> v-model="formData.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入身份证号" placeholder="请输入身份证号或护照号"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
v-model="formData.idCard"> v-model="formData.idCard">
@ -389,12 +389,12 @@ export default {
}) })
return false; return false;
} }
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (regCard.test(this.formData.idCard) === false) { if (regCard.test(this.formData.idCard) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的身份证号码' message: '请输入正确的证件号码'
}) })
return false; return false;
} }
@ -507,7 +507,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'change' } { required: true, message: '姓名不能为空', trigger: 'change' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'change' } { required: true, message: '证件号不能为空', trigger: 'change' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'change' }, { required: true, message: '手机号不能为空', trigger: 'change' },

10
src/views/modules/base/epidemic/vaccinForm.vue
View File

@ -33,12 +33,12 @@
v-model="formData.mobile"> v-model="formData.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入身份证号" placeholder="请输入身份证号或护照号"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
v-model="formData.idCard"> v-model="formData.idCard">
@ -313,12 +313,12 @@ export default {
}) })
return false; return false;
} }
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (regCard.test(this.formData.idCard) === false) { if (regCard.test(this.formData.idCard) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的身份证号码' message: '请输入正确的证件号码'
}) })
return false; return false;
} }
@ -487,7 +487,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'blur' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '证件号不能为空', trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },

12
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
View File

@ -36,12 +36,12 @@
v-model="formData1.mobile"> v-model="formData1.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入身份证号" placeholder="请输入身份证号或护照号"
clearable clearable
v-model="formData1.idCard"> v-model="formData1.idCard">
</el-input> </el-input>
@ -207,7 +207,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column prop="houseName" <el-table-column prop="houseName"
@ -647,12 +647,12 @@ export default {
}) })
return false; return false;
} }
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (regCard.test(this.formData1.idCard) === false) { if (regCard.test(this.formData1.idCard) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的身份证号码' message: '请输入正确的证件号码'
}) })
return false; return false;
} }
@ -833,7 +833,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'blur' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '证件号不能为空', trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },

4
src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
View File

@ -33,7 +33,7 @@
v-model="formData.mobile"> v-model="formData.mobile">
</el-input> --> </el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
@ -279,7 +279,7 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' } { required: true, message: '姓名不能为空', trigger: 'blur' }
], ],
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '证件号不能为空', trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },

6
src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
View File

@ -25,13 +25,13 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证" <el-form-item label="证件号"
prop="mobile"> prop="mobile">
<el-input v-model="formData.idCard" <el-input v-model="formData.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证"> placeholder="请输入身份证号或证件号">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -206,7 +206,7 @@
<el-table-column prop="idCard" <el-table-column prop="idCard"
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="证件号"
width="170"> width="170">
</el-table-column> </el-table-column>
<el-table-column prop="allName" <el-table-column prop="allName"

10
src/views/modules/shequzhili/xiangmu/cpts/edit.vue
View File

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

Write Preview
Loading…
Cancel
Save