diff --git a/src/views/system/group/user/index.vue b/src/views/system/group/user/index.vue index 62fcc94..d7bd0ec 100644 --- a/src/views/system/group/user/index.vue +++ b/src/views/system/group/user/index.vue @@ -180,8 +180,8 @@ @@ -259,19 +259,20 @@ export default { keyDeptType: '', keyDepeName: '', keyJobLeven: '', - ISCHECK: false, + // 9.11修改 原ISCHECK = false + ISCHECK: true, dialogFormEdit: false, editloading: false, dialogType: 'add', rules: { - EMAIL: [ - { required: true, message: '请输入邮箱', trigger: 'blur' }, - { - pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, - message: '请输入正确的邮箱' - }, - { validator: hasEmail, trigger: 'blur' } - ], + // EMAIL: [ + // { required: true, message: '请输入邮箱', trigger: 'blur' }, + // { + // pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, + // message: '请输入正确的邮箱' + // }, + // { validator: hasEmail, trigger: 'blur' } + // ], ROLE_ID: [ { required: true, message: '角色不能为空', trigger: 'blur' } ], @@ -283,9 +284,9 @@ export default { SEX: [ { required: true, message: '请选择性别', trigger: 'blur' } ], - NATION: [ - { required: true, message: '请选择民族', trigger: 'blur' } - ], + // NATION: [ + // { required: true, message: '请选择民族', trigger: 'blur' } + // ], PHONE: [ { required: true, message: '手机号不能为空', trigger: 'blur' }, { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' }, @@ -309,12 +310,12 @@ export default { ISASSESS: [ { required: true, message: '请选择是否审核人员', trigger: 'blur' } ], - USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, - { - pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, - message: '请输入正确的身份证号' - } - ] + // USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, + // { + // pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + // message: '请输入正确的身份证号' + // } + // ] }, uesrInfoDic: { minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd @@ -598,7 +599,8 @@ export default { }, handleAdd() { this.dialogFormEdit = true - this.ISCHECK = false + // 9.11 修改 原:ISCHECK = false + this.ISCHECK = true this.pd = {} this.dialogType = 'saveUser' this.pd.PASSWORD = 'Aa@123456789' diff --git a/src/views/system/group/userCenter/index.vue b/src/views/system/group/userCenter/index.vue index cf14c79..14467fc 100644 --- a/src/views/system/group/userCenter/index.vue +++ b/src/views/system/group/userCenter/index.vue @@ -85,7 +85,7 @@ 帐号解锁 禁用 启用 - 删除 + 推送