fix(UserOperateDialog): 用户新增和编辑时的对话框里,昵称应该是必填项。
feat(User):搜索框组件新增按“所属公司”搜索;index组件新增“所属公司”字段;新增、编辑的对话框应该可以新增或修改“所属公司”。
This commit is contained in:
@@ -23,6 +23,7 @@ interface Props {
|
||||
deptTree: Api.SystemManage.Dept[];
|
||||
postOptions: Api.SystemManage.PostSimple[];
|
||||
roleOptions: Api.SystemManage.RoleSimple[];
|
||||
companyOptions: Api.Dict.DictData[];
|
||||
}
|
||||
|
||||
const props = defineProps<Props>();
|
||||
@@ -80,6 +81,7 @@ function createDefaultModel(): Model {
|
||||
remark: '',
|
||||
deptId: props.currentDeptId ?? 0,
|
||||
positionId: null,
|
||||
company: null,
|
||||
email: '',
|
||||
mobile: '',
|
||||
sex: 1,
|
||||
@@ -100,6 +102,7 @@ const rules = computed(() => {
|
||||
|
||||
return {
|
||||
username: [createRequiredRule($t('page.system.user.form.userName')), patternRules.userName],
|
||||
nickname: [createRequiredRule($t('page.system.user.form.nickName'))],
|
||||
deptId: [createRequiredRule($t('page.system.user.form.deptName'))],
|
||||
positionId: [createRequiredRule($t('page.system.user.form.positionName'))],
|
||||
mobile: getNullableText(model.value.mobile) ? [patternRules.phone] : [],
|
||||
@@ -133,6 +136,7 @@ async function handleInitModel() {
|
||||
remark: user.remark ?? '',
|
||||
deptId: user.deptId,
|
||||
positionId: user.positionId ?? null,
|
||||
company: user.company ?? null,
|
||||
email: user.email ?? '',
|
||||
mobile: user.mobile ?? '',
|
||||
sex: user.sex ?? 0,
|
||||
@@ -155,6 +159,7 @@ async function handleSubmit() {
|
||||
remark: getNullableText(model.value.remark),
|
||||
deptId: model.value.deptId,
|
||||
positionId: model.value.positionId,
|
||||
company: model.value.company,
|
||||
email: getNullableText(model.value.email),
|
||||
mobile: getNullableText(model.value.mobile),
|
||||
sex: model.value.sex,
|
||||
|
||||
Reference in New Issue
Block a user