elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

疫情防控下的身份证号改 证件号

feature
jianjun 3 years ago
parent
d8486b231c
commit
cb8e0e9889
13 changed files with 102 additions and 102 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. 8
      src/views/modules/base/epidemic/antiInfo.vue
  2. 12
      src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
  3. 4
      src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
  4. 10
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  5. 34
      src/views/modules/base/epidemic/natInfo/natForm.vue
  6. 26
      src/views/modules/base/epidemic/natInfo/natList.vue
  7. 28
      src/views/modules/base/epidemic/travel.vue
  8. 6
      src/views/modules/base/epidemic/vaccin.vue
  9. 26
      src/views/modules/base/epidemic/vaccinAdd.vue
  10. 28
      src/views/modules/base/epidemic/vaccinForm.vue
  11. 12
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  12. 4
      src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
  13. 6
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

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' },

10
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"
@ -393,7 +393,7 @@ export default {
agencyId: '', agencyId: '',
formData: { formData: {
attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1 attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1
name: '', name: '',
mobile: '', mobile: '',
idCard: '', idCard: '',
@ -798,7 +798,7 @@ export default {
//重置搜索条件 //重置搜索条件
resetSearch () { resetSearch () {
this.formData = { this.formData = {
attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1 attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1
name: '', name: '',
mobile: '', mobile: '',
idCard: '', idCard: '',

34
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">
@ -249,9 +249,9 @@ export default {
icNatId: '', icNatId: '',
formData: { formData: {
icNatId: '', icNatId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -262,9 +262,9 @@ export default {
channel: [], channel: [],
content: '', content: '',
fileName: '',//附件名 fileName: '',//附件名
attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
attachmentUrl: '',//附件地址 attachmentUrl: '',//附件地址
}, },
fileList: [], fileList: [],
@ -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;
} }
@ -581,9 +581,9 @@ export default {
this.formData = { this.formData = {
icNatId: '', icNatId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -594,9 +594,9 @@ export default {
channel: [], channel: [],
content: '', content: '',
fileName: '',//附件名 fileName: '',//附件名
attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
attachmentUrl: '',//附件地址 attachmentUrl: '',//附件地址
} }
}, },
@ -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' },

26
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"
@ -297,11 +297,11 @@ export default {
timeRange: [], timeRange: [],
formData: { formData: {
orgType: 'current',//当前组织:current 根组织：all orgType: 'current',//当前组织:current 根组织：all
name: '',//姓名 name: '',//姓名
mobile: '',//手机号 mobile: '',//手机号
idCard: '',//身份证号码 idCard: '',//身份证号码
startTime: '',//检测开始时间yyyy-MM-dd HH:mm startTime: '',//检测开始时间yyyy-MM-dd HH:mm
endTime: '',//检测结束时间yyyy-MM-dd HH:mm endTime: '',//检测结束时间yyyy-MM-dd HH:mm
isResiUser: ''//0:否 1:是 isResiUser: ''//0:否 1:是
@ -556,11 +556,11 @@ export default {
//重置搜索条件 //重置搜索条件
resetSearch () { resetSearch () {
this.formData = { this.formData = {
orgType: 'current',//当前组织:current 根组织：all orgType: 'current',//当前组织:current 根组织：all
name: '',//姓名 name: '',//姓名
mobile: '',//手机号 mobile: '',//手机号
idCard: '',//身份证号码 idCard: '',//身份证号码
startTime: '',//检测开始时间yyyy-MM-dd HH:mm startTime: '',//检测开始时间yyyy-MM-dd HH:mm
endTime: '',//检测结束时间yyyy-MM-dd HH:mm endTime: '',//检测结束时间yyyy-MM-dd HH:mm
} }
this.timeRange = [] this.timeRange = []

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

@ -6,7 +6,7 @@
ref="ref_searchform" ref="ref_searchform"
:label-width="'100px'"> :label-width="'100px'">
<div> <div>
<el-form-item label="姓名" <el-form-item label="姓名"
prop="name"> prop="name">
<el-input v-model="formData.name" <el-input v-model="formData.name"
@ -28,20 +28,20 @@
</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>
</div> </div>
<div> <div>
<el-form-item label="来自地区" <el-form-item label="来自地区"
prop="sourceAddress"> prop="sourceAddress">
<el-input v-model="formData.sourceAddress" <el-input v-model="formData.sourceAddress"
@ -50,7 +50,7 @@
clearable clearable
placeholder="请输入地区"> placeholder="请输入地区">
</el-input> </el-input>
<!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps" <!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps"
v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader> --> v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader> -->
</el-form-item> </el-form-item>
@ -85,7 +85,7 @@
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button <el-button
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
@ -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"
@ -382,8 +382,8 @@ export default {
selectionAll: [], selectionAll: [],
timeRange: [], timeRange: [],
formData: { formData: {
name: '',//负责人 name: '',//负责人
mobile: '',//联系电话 mobile: '',//联系电话
idCard: '', idCard: '',
sourceAddress: '', sourceAddress: '',
sourceAddressCode: '', sourceAddressCode: '',
@ -430,7 +430,7 @@ export default {
lzayLoadArea(node, resolve) { lzayLoadArea(node, resolve) {
this.getArea(node, resolve) this.getArea(node, resolve)
// setTimeout(() => { // setTimeout(() => {
// }, 1000) // }, 1000)
}, },
handleSearch () { handleSearch () {
@ -453,7 +453,7 @@ export default {
if (code === 0) { if (code === 0) {
const nodes = data.map(item => ({ const nodes = data.map(item => ({
value: item.areaCode, // value: item.areaCode, //
label: item.areaName, label: item.areaName,
code: item.areaCode, code: item.areaCode,
level: item.level, level: item.level,
@ -496,7 +496,7 @@ export default {
this.tableLoading = false this.tableLoading = false
}, },
handleAreaChange(val) { handleAreaChange(val) {
if (val.length > 0) { if (val.length > 0) {
const len = val.length - 1 const len = val.length - 1
this.formData.sourceAddressCode = val[len] this.formData.sourceAddressCode = val[len]
@ -574,7 +574,7 @@ export default {
}); });
}, },
async handleDeletes (row) { async handleDeletes (row) {
if (this.selectionAll.length === 0) { if (this.selectionAll.length === 0) {
this.$message.info('请选择要取消关注的名单') this.$message.info('请选择要取消关注的名单')

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"

26
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">
@ -211,10 +211,10 @@ export default {
vaccineId: '', vaccineId: '',
formData: { formData: {
vaccineId: '', vaccineId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
isResiUser: "0",//是否客户下居民(0:否 1:是) isResiUser: "0",//是否客户下居民(0:否 1:是)
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -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;
} }
@ -465,10 +465,10 @@ export default {
this.formData = { this.formData = {
vaccineId: '', vaccineId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
isResiUser: "0",//是否客户下居民(0:否 1:是) isResiUser: "0",//是否客户下居民(0:否 1:是)
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -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' },

28
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">
@ -126,9 +126,9 @@ export default {
icNatId: '', icNatId: '',
formData: { formData: {
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -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;
} }
@ -445,9 +445,9 @@ export default {
this.formData = { this.formData = {
icNatId: '', icNatId: '',
agencyId: '',//当前网格所属组织Id agencyId: '',//当前网格所属组织Id
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
@ -458,9 +458,9 @@ export default {
channel: [], channel: [],
content: '', content: '',
fileName: '',//附件名 fileName: '',//附件名
attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
attachmentUrl: '',//附件地址 attachmentUrl: '',//附件地址
} }
}, },
@ -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"

Write Preview
Loading…
Cancel
Save