diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
index b8d8cf0d..b759f63e 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -632,7 +632,8 @@ export default {
examines: this.form.examines.length ? this.form.examines.map(v => {
return {
...v,
- examineUserId: v.id
+ examineUserId: v.id,
+ examineUserName: v.name
}
}) : []
}).then(res => {
diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
index c29062da..dfe924fd 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
@@ -33,7 +33,7 @@

-
{{ item.name }}
+
{{ item.examineUserName }}
@@ -294,11 +294,11 @@
content: '',
currIndex: 0,
colConfigs3: [
- { prop: 'groupOwnerName', label: '群主', openType: 'userName' },
+ { prop: 'groupOwnerName', label: '群主' },
{ prop: 'groupNames', label: '群名称' }
],
colConfigs1: [
- { slot: 'user', label: '成员', openType: 'userName' },
+ { slot: 'user', label: '成员' },
{ prop: 'groupCount', label: '预计送达居民群', align: 'center' }
],
colConfigs2: [
diff --git a/project/sass/apps/AppSpecialDrug/components/Add.vue b/project/sass/apps/AppSpecialDrug/components/Add.vue
index 00ba6ebf..19a5f571 100644
--- a/project/sass/apps/AppSpecialDrug/components/Add.vue
+++ b/project/sass/apps/AppSpecialDrug/components/Add.vue
@@ -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: '有无犯罪史',
diff --git a/project/sass/apps/AppSpecialMental/components/Add.vue b/project/sass/apps/AppSpecialMental/components/Add.vue
index 5e963aa6..af06e2f7 100644
--- a/project/sass/apps/AppSpecialMental/components/Add.vue
+++ b/project/sass/apps/AppSpecialMental/components/Add.vue
@@ -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: '目前危险等级',
diff --git a/project/sass/apps/AppSpecialPrison/components/List.vue b/project/sass/apps/AppSpecialPrison/components/List.vue
index 630d8f7b..b8c1f96a 100644
--- a/project/sass/apps/AppSpecialPrison/components/List.vue
+++ b/project/sass/apps/AppSpecialPrison/components/List.vue
@@ -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
})