guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员中台bug修复 - 用户新增, 用户编辑, 校验去掉身份证号民族邮箱限制

hyx_2024-9-29_tongbu
water_xu 2024-09-11 15:39:36 +08:00
parent c1800c43ad
commit ae4f124223
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/views/system/group/user/index.vue
View File

@ -180,8 +180,8 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormEdit = false">取 消</el-button> <el-button @click="dialogFormEdit = false">取 消</el-button>
<el-button v-show="ISCHECK" type="primary" @click="confirm">确 定</el-button> <el-button type="primary" @click="confirm">确 定</el-button>
<el-button v-show="!ISCHECK" type="primary" @click="goCheck">校 验</el-button> <!-- <el-button v-show="!ISCHECK" type="primary" @click="goCheck">校 验</el-button> -->
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -259,19 +259,20 @@ export default {
keyDeptType: '', keyDeptType: '',
keyDepeName: '', keyDepeName: '',
keyJobLeven: '', keyJobLeven: '',
ISCHECK: false, // 9.11修改 原ISCHECK = false
ISCHECK: true,
dialogFormEdit: false, dialogFormEdit: false,
editloading: false, editloading: false,
dialogType: 'add', dialogType: 'add',
rules: { rules: {
EMAIL: [ // EMAIL: [
{ required: true, message: '请输入邮箱', trigger: 'blur' }, // { required: true, message: '请输入邮箱', trigger: 'blur' },
{ // {
pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, // pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
message: '请输入正确的邮箱' // message: '请输入正确的邮箱'
}, // },
{ validator: hasEmail, trigger: 'blur' } // { validator: hasEmail, trigger: 'blur' }
], // ],
ROLE_ID: [ ROLE_ID: [
{ required: true, message: '角色不能为空', trigger: 'blur' } { required: true, message: '角色不能为空', trigger: 'blur' }
], ],
@ -283,9 +284,9 @@ export default {
SEX: [ SEX: [
{ required: true, message: '请选择性别', trigger: 'blur' } { required: true, message: '请选择性别', trigger: 'blur' }
], ],
NATION: [ // NATION: [
{ required: true, message: '请选择民族', trigger: 'blur' } // { required: true, message: '请选择民族', trigger: 'blur' }
], // ],
PHONE: [ PHONE: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },
{ min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' }, { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
@ -309,12 +310,12 @@ export default {
ISASSESS: [ ISASSESS: [
{ required: true, message: '请选择是否审核人员', trigger: 'blur' } { required: true, message: '请选择是否审核人员', trigger: 'blur' }
], ],
USER_ID_CARD: [{ 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)$/, // 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: '请输入正确的身份证号' // message: '请输入正确的身份证号'
} // }
] // ]
}, },
uesrInfoDic: { uesrInfoDic: {
minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd
@ -598,7 +599,8 @@ export default {
}, },
handleAdd() { handleAdd() {
this.dialogFormEdit = true this.dialogFormEdit = true
this.ISCHECK = false // 9.11 修改 原:ISCHECK = false
this.ISCHECK = true
this.pd = {} this.pd = {}
this.dialogType = 'saveUser' this.dialogType = 'saveUser'
this.pd.PASSWORD = 'Aa@123456789' this.pd.PASSWORD = 'Aa@123456789'

2
src/views/system/group/userCenter/index.vue
View File

@ -85,7 +85,7 @@
<el-button v-show="edit && row.STATUS === '99'" type="warning" icon="el-icon-unlock" size="mini" @click="unLockUser(row.USER_ID, row.NAME)">帐号解锁</el-button> <el-button v-show="edit && row.STATUS === '99'" type="warning" icon="el-icon-unlock" size="mini" @click="unLockUser(row.USER_ID, row.NAME)">帐号解锁</el-button>
<el-button v-show="row.STATUS== 0" type="primary" icon="el-icon-edit" size="mini" @click="handleEditStatus(row,'1', row.USER_ID)">禁用</el-button> <el-button v-show="row.STATUS== 0" type="primary" icon="el-icon-edit" size="mini" @click="handleEditStatus(row,'1', row.USER_ID)">禁用</el-button>
<el-button v-show="row.STATUS== 1" type="primary" icon="el-icon-edit" size="mini" @click="handleEditStatus(row,'0', row.USER_ID)">启用</el-button> <el-button v-show="row.STATUS== 1" type="primary" icon="el-icon-edit" size="mini" @click="handleEditStatus(row,'0', row.USER_ID)">启用</el-button>
<el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button> <!-- <el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button> -->
<el-button v-if="row.ISPUSH != '1'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button> <el-button v-if="row.ISPUSH != '1'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
</template> </template>
</el-table-column> </el-table-column>