修改新增用户界面
This commit is contained in:
parent
4683a3de53
commit
13fe873d98
@ -1113,6 +1113,10 @@ const local: App.I18n.Schema = {
|
||||
avatar: '头像',
|
||||
remark: '备注',
|
||||
form: {
|
||||
userCategory: {
|
||||
required: '请选择用户种类',
|
||||
invalid: '用户种类不能为空'
|
||||
},
|
||||
userName: {
|
||||
required: '请输入登录名',
|
||||
invalid: '登录名不能为空'
|
||||
|
5
cds-fontend-2025.V1/src/typings/app.d.ts
vendored
5
cds-fontend-2025.V1/src/typings/app.d.ts
vendored
@ -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;
|
||||
|
@ -408,7 +408,7 @@ const {
|
||||
);
|
||||
};
|
||||
|
||||
// 只有当checkType为'9'时才显示编辑按钮
|
||||
// 只有当checkType为'9'时才显示编辑和删除按钮
|
||||
// if (row.checkFlag !== '9') {
|
||||
// return null;
|
||||
// }
|
||||
|
@ -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<keyof Model, 'userName' | 'nickName' | 'idCard'| 'mktNo'| 'password' | 'status' | 'phonenumber'>;
|
||||
|
||||
type RuleKey = Extract<
|
||||
keyof Model,
|
||||
| 'userName'
|
||||
| 'nickName'
|
||||
| 'idCard'
|
||||
| 'mktNo'
|
||||
| 'password'
|
||||
| 'status'
|
||||
| 'phonenumber'
|
||||
| 'deptId'
|
||||
| 'userCategory'
|
||||
>;
|
||||
|
||||
const rules: Record<RuleKey, App.Global.FormRule[]> = {
|
||||
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, () => {
|
||||
/>
|
||||
</NFormItem>
|
||||
|
||||
<NFormItem label="用户类别" path="userCategory">
|
||||
<NSelect
|
||||
v-model:value="model.userCategory"
|
||||
placeholder="请选择用户类别"
|
||||
:options="mpsUserCategory"
|
||||
|
||||
filterable
|
||||
/>
|
||||
</NFormItem>
|
||||
<!-- <NFormItem label="用户类别" path="userCategory">-->
|
||||
<!-- <NSelect-->
|
||||
<!-- v-model:value="model.userCategory"-->
|
||||
<!-- placeholder="请选择用户类别"-->
|
||||
<!-- :options="mpsUserCategory"-->
|
||||
<!-- filterable-->
|
||||
<!-- />-->
|
||||
<!-- </NFormItem>-->
|
||||
|
||||
<NFormItem v-if="model.userCategory === '0'" label="营销编号" path="mktNo">
|
||||
<NInput v-model:value="model.mktNo" :placeholder="$t('page.system.user.form.mktNo.required')" />
|
||||
|
Loading…
Reference in New Issue
Block a user