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

清理idCardNoUtils,改使用ID对象

Browse Source
This commit is contained in:
aixianling
2022-10-14 13:58:35 +08:00
parent 12b3a48baa
commit cfb0177a45
27 changed files with 193 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/conv/AppVaccination/AppVaccination.vue
View File

@@ -62,6 +62,7 @@
<script>
import {mapState} from "vuex";
import AddVaccination from "./addVaccination";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "AppVaccination",
@@ -108,7 +109,7 @@ export default {
{label: "出生日期", prop: "birthday", align: 'center'},
{
label: "身份证号", width: "160px", align: 'center',
render: (h, {row}) => h('span', null, this.idCardNoUtil.hideId(row.idNumber))
render: (h, {row}) => h('span', null, ID.hideId(row.idNumber))
},
{label: "所属地区", prop: "areaName", align: 'center'},
{label: "住址", prop: "address", width: "200px", align: 'center'},

7
packages/conv/AppVaccination/addVaccination.vue
View File

@@ -82,6 +82,7 @@
<script>
import {mapState} from "vuex";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "addVaccination",
@@ -183,9 +184,9 @@ export default {
this.form = {...this.form, name, idNumber, phone, areaId, address}
},
getInfoByIdNumber(code) {
if (this.idCardNoUtil.checkIdCardNo(code)) {
let info = this.idCardNoUtil.getIdCardInfo(code)
this.form.sex = this.dict.getValue('sex', info.gender)
if (ID.check(code)) {
let info = new ID(code)
this.form.sex = info.sex
this.form.birthday = info.birthday
this.$forceUpdate()
}

4
packages/conv/creditScore/scorePersonal/AppScorePersonal.vue
View File

@@ -97,6 +97,7 @@
<script>
import {mapState} from 'vuex';
import detail from './detail'
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: 'AppScorePersonal',
@@ -263,8 +264,7 @@ export default {
formRules() {
let IdNumberPass = (rule, value, callback) => {
if (value) {
console.log(this.idCardNoUtil);
if (this.idCardNoUtil.checkIdCardNo(value)) {
if (ID.check(value)) {
callback();
} else {
callback(new Error("身份证号格式错误"));

3
packages/device/tutelage/AppWristband/components/Add.vue
View File

@@ -119,6 +119,7 @@
<script>
import { mapState } from 'vuex'
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: 'Add',
@@ -132,7 +133,7 @@
const validatorId = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入身份证号'))
} else if (!this.idCardNoUtil.checkIdCardNo(value)) {
} else if (!ID.check(value)) {
callback(new Error('身份证号格式错误'))
} else {
callback()

3
packages/extra/AppCodeGeneration/components/Add.vue
View File

@@ -163,6 +163,7 @@
<script>
import {mapState} from 'vuex'
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: 'Add',
@@ -242,7 +243,7 @@ export default {
}
})
const idNumberInfo = this.idCardNoUtil.getIdCardInfo(e.idNumber)
const idNumberInfo = new ID(e.idNumber)
this.$set(this.formData, 'birthDate', idNumberInfo.birthday)
this.formData.photo = e.photo ? [{
url: e.photo

6
packages/meta/AppPartyMember/components/neighbourSetting.vue
View File

@@ -43,7 +43,7 @@
<el-row type="flex" justify="space-between" @click.native="handleSelectResident(row)" class="toggle"
:class="{selected:findResident(row.id)>-1}">
<span v-text="row.name"/>
<span v-text="idCardNoUtil.hideId(row.idNumber)"/>
<span v-text="ID.hideId(row.idNumber)"/>
</el-row>
</template>
</el-table-column>
@@ -57,7 +57,7 @@
</template>
<template slot-scope="{row,$index}">
<el-row type="flex" align="middle" justify="space-between">
<div v-text="[row.residentName, idCardNoUtil.hideId(row.idNumber)].join(' ')"/>
<div v-text="[row.residentName, ID.hideId(row.idNumber)].join(' ')"/>
<el-button type="text" @click="form.residentList.splice($index,1)">删除</el-button>
</el-row>
</template>
@@ -70,6 +70,7 @@
<script>
import {mapState} from "vuex";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "neighbourSetting",
@@ -92,6 +93,7 @@ export default {
},
data() {
return {
ID,
search: {residentName: "", ids: ""},
page: {current: 1, size: 10, total: 0},
tableData: [],

6
packages/meta/AppResident/residentDetail.vue
View File

@@ -448,7 +448,7 @@ export default {
data() {
let IdNumberPass = (rule, value, callback) => {
if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) {
if (ID.check(value)) {
callback();
} else {
callback(new Error("身份证号格式错误"));
@@ -568,7 +568,7 @@ export default {
{label: "姓名", prop: "name"},
{label: "性别", prop: "sex", dict: "sex", align: 'center'},
{label: "年龄", prop: "age", align: 'center'},
{label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
{label: "身份证号", render: (h, {row}) => h('p', ID.hideId(row.idNumber))},
{slot: "options"}
]
}
@@ -653,7 +653,7 @@ export default {
},
showFamily(row) {
this.familyInfo = row;
let {birthday} = this.idCardNoUtil.getIdCardInfo(this.familyInfo.idNumber)
let {birthday} = ID.getIdCardInfo(this.familyInfo.idNumber)
this.familyInfo.birthday = birthday
if (this.familyInfo.photo) {
this.familyInfo.imgUrl = this.familyInfo.photo.split(";")[0];

3
packages/party/AppPartyScore/psList.vue
View File

@@ -34,6 +34,7 @@
<script>
import {mapState} from "vuex";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "psList",
@@ -60,7 +61,7 @@ export default {
},
{label: '类型', prop: 'residentType', align: 'center', dict: "residentType"},
{label: '姓名', prop: 'name', align: 'center'},
{label: '身份证号', render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 165},
{label: '身份证号', render: (h, {row}) => h('p', ID.hideId(row.idNumber)), width: 165},
{label: '联系电话', prop: 'phone', align: 'center', width: 120}
]
}

2
packages/work/AppHelpedResident/hrDetail.vue
View File

@@ -522,7 +522,7 @@ export default {
{
label: "证件号",
render: (h, {row}) =>
h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
h("p", null, ID.hideId(row.idNumber)),
},
{slot: "options"},
];

3
packages/work/AppHelpedResident/hrList.vue
View File

@@ -77,6 +77,7 @@
<script>
import {mapState} from "vuex";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "hrList",
@@ -92,7 +93,7 @@ export default {
{type: 'selection'},
{label: "姓名", prop: "name", align: "center"},
{label: "性别", prop: "sex", dict: 'sex', align: "center"},
{label: "证件号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
{label: "证件号", render: (h, {row}) => h('p', ID.hideId(row.idNumber))},
{label: "年龄", prop: "age", align: "center"},
{label: "民族", prop: "nation", align: "center", dict: "fpNation"},
{label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},

7
packages/work/AppRiskWarning/components/Add.vue
View File

@@ -57,6 +57,7 @@
<script>
import { mapState } from 'vuex'
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: 'Add',
@@ -70,7 +71,7 @@
const validatorId = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入身份证号'))
} else if (!this.idCardNoUtil.checkIdCardNo(value)) {
} else if (!ID.check(value)) {
callback(new Error('身份证号格式错误'))
} else {
callback()
@@ -80,10 +81,10 @@
const validatorPhone = function (rule, value, callback) {
if (value === '') {
callback(new Error('请输入联系方式'))
}
}
// else if (!/^1\d{10}$/.test(value)) {
// callback(new Error('手机号格式错误'))
// }
// }
else {
callback()
}

6
packages/work/processManagement/corporateSeal/sealDetail.vue
View File

@@ -95,6 +95,8 @@
</template>
<script>
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "sealDetail",
inject: ['seal'],
@@ -135,11 +137,11 @@ export default {
],
legalIdNumber: [
{required: true, message: "请填写法人身份证号码"},
{validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
{validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
],
agentIdNumber: [
{required: true, message: "请填写代理人身份证号码"},
{validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
{validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
],
}
}

2
packages/work/processManagement/personalSignature/AppPersonalSignature.vue
View File

@@ -95,7 +95,7 @@ export default {
],
idNumber: [
{required: true, message: "请填写身份证号码"},
{validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
{validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
],
}
}