diff --git a/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts b/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts index 32a6428..22c0e7b 100644 --- a/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts +++ b/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts @@ -1113,6 +1113,10 @@ const local: App.I18n.Schema = { avatar: '头像', remark: '备注', form: { + userCategory: { + required: '请选择用户种类', + invalid: '用户种类不能为空' + }, userName: { required: '请输入登录名', invalid: '登录名不能为空' diff --git a/cds-fontend-2025.V1/src/typings/app.d.ts b/cds-fontend-2025.V1/src/typings/app.d.ts index 9235081..93395bd 100644 --- a/cds-fontend-2025.V1/src/typings/app.d.ts +++ b/cds-fontend-2025.V1/src/typings/app.d.ts @@ -949,6 +949,8 @@ declare namespace App { title: string; userName: string; nickName: string; + mktNo: string; + idCard: string; deptName: string; phonenumber: string; status: string; @@ -962,8 +964,11 @@ declare namespace App { avatar: string; remark: string; form: { + userCategory: FormMsg; userName: FormMsg; nickName: FormMsg; + mktNo: FormMsg; + idCard: FormMsg; deptId: FormMsg; phonenumber: FormMsg; status: FormMsg; diff --git a/cds-fontend-2025.V1/src/views/mps/market/index.vue b/cds-fontend-2025.V1/src/views/mps/market/index.vue index c011ae9..3a4d2a6 100644 --- a/cds-fontend-2025.V1/src/views/mps/market/index.vue +++ b/cds-fontend-2025.V1/src/views/mps/market/index.vue @@ -408,7 +408,7 @@ const { ); }; - // 只有当checkType为'9'时才显示编辑按钮 + // 只有当checkType为'9'时才显示编辑和删除按钮 // if (row.checkFlag !== '9') { // return null; // } diff --git a/cds-fontend-2025.V1/src/views/system/user/modules/user-operate-drawer.vue b/cds-fontend-2025.V1/src/views/system/user/modules/user-operate-drawer.vue index 4b01e67..30b3e5e 100644 --- a/cds-fontend-2025.V1/src/views/system/user/modules/user-operate-drawer.vue +++ b/cds-fontend-2025.V1/src/views/system/user/modules/user-operate-drawer.vue @@ -58,7 +58,7 @@ function createDefaultModel(): Model { userName: '', nickName: '', idCard: '', - userCategory: '1',//注意跟字典保持一致 + userCategory: '0',//注意跟字典保持一致 mktNo: '', email: '', phonenumber: '', @@ -71,16 +71,30 @@ function createDefaultModel(): Model { }; } -type RuleKey = Extract; + +type RuleKey = Extract< + keyof Model, + | 'userName' + | 'nickName' + | 'idCard' + | 'mktNo' + | 'password' + | 'status' + | 'phonenumber' + | 'deptId' + | 'userCategory' +>; const rules: Record = { userName: [createRequiredRule($t('page.system.user.form.userName.required'))], nickName: [createRequiredRule($t('page.system.user.form.nickName.required'))], - idCard: [createRequiredRule($t('page.system.user.form.idCard.required'))], - mktNo: [createRequiredRule($t('page.system.user.form.mktNo.required'))], + idCard: [createRequiredRule($t('page.system.user.form.idCard.required')),patternRules.idCard], + mktNo: [createRequiredRule($t('page.system.user.form.mktNo.required')),patternRules.mktNo], password: [{ ...patternRules.pwd, required: props.operateType === 'add' }], phonenumber: [patternRules.phone], - status: [createRequiredRule($t('page.system.user.form.status.required'))] + status: [createRequiredRule($t('page.system.user.form.status.required'))], + deptId: [createRequiredRule($t('page.system.user.form.deptId.required'))], + userCategory: [createRequiredRule($t('page.system.user.form.userCategory.required'))] }; async function getUserInfo() { @@ -197,15 +211,14 @@ watch(visible, () => { /> - - - + + + + + + + +