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

Merge branch 'dev' into build

Browse Source
This commit is contained in:
aixianling
2022-08-19 11:54:33 +08:00
parent 097b434712 e6c3c1c857
commit b388d03536
8 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
project/sass/apps/AppSpecialDrug/components/Add.vue
View File

@@ -135,6 +135,19 @@ export default {
}
}
var controlPhone = (rule, value, callback) => {
if (!value) {
callback()
} else {
const reg = /^[0-9]{3,11}$/
if (reg.test(value)) {
callback()
} else {
return callback(new Error('请输入正确的电话号码'))
}
}
}
let IdNumberPass = (rule, value, callback) => {
if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -253,7 +266,7 @@ export default {
type: 'input',
grid: 1,
formDbName: 'controlPhone',
rules: { validator: regPhone, trigger: 'blur' }
rules: { validator: controlPhone, trigger: 'blur' }
},
{
label: '有无犯罪史',

15
project/sass/apps/AppSpecialMental/components/Add.vue
View File

@@ -135,6 +135,19 @@ export default {
}
}
var controlPhone = (rule, value, callback) => {
if (!value) {
callback()
} else {
const reg = /^[0-9]{3,11}$/
if (reg.test(value)) {
callback()
} else {
return callback(new Error('请输入正确的电话号码'))
}
}
}
let IdNumberPass = (rule, value, callback) => {
if (value) {
if (this.idCardNoUtil.checkIdCardNo(value)) {
@@ -239,7 +252,7 @@ export default {
type: 'input',
grid: 1,
formDbName: 'helpPhone',
rules: { validator: regPhone, trigger: 'blur' }
rules: { validator: controlPhone, trigger: 'blur' }
},
{
label: '目前危险等级',

5
project/sass/apps/AppSpecialPrison/components/List.vue
View File

@@ -65,8 +65,8 @@
{ prop: 'name', label: '姓名' },
{ prop: 'idNumber', align: 'center', label: '身份证号' },
{ prop: 'gender', align: 'center', label: '性别' },
{ prop: 'birthday', align: 'center', label: '出生日期' },
{ prop: 'age', align: 'center', label: '年龄', },
{ prop: 'birthday', align: 'center', label: '出生日期' },
{ prop: 'age', align: 'center', label: '年龄', },
{ prop: 'phone', align: 'center', label: '联系方式' }
],
tableData: [],
@@ -103,6 +103,7 @@
let info = this.idCardNoUtil.getIdCardInfo(v.idNumber)
v.birthday = info.birthday
v.age = this.$calcAge(v.idNumber)
v.gender = info.gender
return v
})