Web/cn-rdms-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(UserOperateDialog): 用户新增和编辑时的对话框里，昵称应该是必填项。

Browse Source 
feat(User)：搜索框组件新增按“所属公司”搜索；index组件新增“所属公司”字段；新增、编辑的对话框应该可以新增或修改“所属公司”。
This commit is contained in:
dk
2026-04-16 20:27:08 +08:00
parent b265d0d4f1
commit b4878845da
5 changed files with 84 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/views/system/user/index.vue
View File

@@ -1,15 +1,16 @@
<script setup lang="tsx">
import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue';
import type { TableInstance } from 'element-plus';
import { ElButton, ElPopconfirm, ElSwitch, ElTag } from 'element-plus';
import {computed, nextTick, onMounted, reactive, ref, watch} from 'vue';
import type {TableInstance} from 'element-plus';
import {ElButton, ElPopconfirm, ElSwitch, ElTag} from 'element-plus';
import dayjs from 'dayjs';
import type { FlatResponseData } from '@sa/axios';
import { userGenderRecord } from '@/constants/business';
import type {FlatResponseData} from '@sa/axios';
import {userGenderRecord} from '@/constants/business';
import {
fetchBatchDeleteUser,
fetchDeleteDept,
fetchDeleteUser,
fetchGetDeptList,
fetchGetDictDataByCode,
fetchGetPostSimpleList,
fetchGetRoleSimpleList,
fetchGetUser,
@@ -17,11 +18,11 @@ import {
fetchUpdateUser,
fetchUpdateUserStatus
} from '@/service/api';
import { useUIPaginatedTable } from '@/hooks/common/table';
import {useUIPaginatedTable} from '@/hooks/common/table';
import BusinessTableActionCell from '@/components/custom/business-table-action-cell';
import BusinessFormDialog from '@/components/custom/business-form-dialog.vue';
import { $t } from '@/locales';
import { buildMenuTree } from '@/views/system/shared/menu-tree';
import {$t} from '@/locales';
import {buildMenuTree} from '@/views/system/shared/menu-tree';
import UserManagementRelation from '@/views/system/user-management-relation/index.vue';
import UserOperateDialog from './modules/user-operate-dialog.vue';
import UserOrgLeaderDialog from './modules/user-org-leader-dialog.vue';
@@ -31,7 +32,7 @@ import UserResignedDialog from './modules/user-resigned-dialog.vue';
import UserResetPasswordDialog from './modules/user-reset-password-dialog.vue';
import UserSearch from './modules/user-search.vue';
defineOptions({ name: 'UserManage' });
defineOptions({name: 'UserManage'});
function getInitSearchParams(): Api.SystemManage.UserSearchParams {
return {
@@ -41,7 +42,8 @@ function getInitSearchParams(): Api.SystemManage.UserSearchParams {
mobile: undefined,
status: undefined,
deptId: undefined,
roleId: undefined
roleId: undefined,
company: undefined
};
}
@@ -135,6 +137,7 @@ const operateType = ref<UI.TableOperateType>('add');
const editingUserId = ref<number | null>(null);
const postOptions = ref<Api.SystemManage.PostSimple[]>([]);
const roleOptions = ref<Api.SystemManage.RoleSimple[]>([]);
const companyOptions = ref<any>([]);
const resetPasswordVisible = ref(false);
const resetPasswordUserId = ref<number | null>(null);
const resetPasswordUsername = ref<string | null>(null);
@@ -154,7 +157,7 @@ const deptTree = computed(() => buildMenuTree(deptList.value));
const currentDept = computed(() => deptList.value.find(item => item.id === currentDeptId.value) ?? null);
const deptCount = computed(() => deptList.value.length);
const { columns, columnChecks, data, loading, getDataByPage, mobilePagination } = useUIPaginatedTable<
const {columns, columnChecks, data, loading, getDataByPage, mobilePagination} = useUIPaginatedTable<
FlatResponseData<any, Api.SystemManage.UserList>,
Api.SystemManage.User
>({
@@ -178,9 +181,9 @@ const { columns, columnChecks, data, loading, getDataByPage, mobilePagination }
searchParams.pageSize = params.pageSize ?? 10;
},
columns: () => [
{ prop: 'selection', type: 'selection', width: 48 },
{ prop: 'index', type: 'index', label: $t('common.index'), width: 64 },
{ prop: 'username', label: $t('page.system.user.userName'), minWidth: 140, showOverflowTooltip: true },
{prop: 'selection', type: 'selection', width: 48},
{prop: 'index', type: 'index', label: $t('common.index'), width: 64},
{prop: 'username', label: $t('page.system.user.userName'), minWidth: 140, showOverflowTooltip: true},
{
prop: 'nickname',
label: $t('page.system.user.nickName'),
@@ -194,6 +197,16 @@ const { columns, columnChecks, data, loading, getDataByPage, mobilePagination }
showOverflowTooltip: true,
formatter: row => getNullableLabel(row.deptName)
},
{
prop: 'company',
label: '所属公司',
minWidth: 140,
showOverflowTooltip: true,
formatter: row => {
const companyItem = companyOptions.value.find((item: any) => item.value === row.company);
return companyItem?.label || '--';
}
},
{
prop: 'positionName',
label: $t('page.system.user.positionName'),
@@ -260,9 +273,9 @@ const { columns, columnChecks, data, loading, getDataByPage, mobilePagination }
formatter: row => {
const state = getUserResignedState(row);
const stateMap: Record<UserResignedState, { type: UI.ThemeColor; label: App.I18n.I18nKey }> = {
active: { type: 'success', label: 'page.system.user.resignedStateEnum.active' },
pending: { type: 'warning', label: 'page.system.user.resignedStateEnum.pending' },
resigned: { type: 'info', label: 'page.system.user.resignedStateEnum.resigned' }
active: {type: 'success', label: 'page.system.user.resignedStateEnum.active'},
pending: {type: 'warning', label: 'page.system.user.resignedStateEnum.pending'},
resigned: {type: 'info', label: 'page.system.user.resignedStateEnum.resigned'}
};
return <ElTag type={stateMap[state].type}>{$t(stateMap[state].label)}</ElTag>;
@@ -323,7 +336,7 @@ const { columns, columnChecks, data, loading, getDataByPage, mobilePagination }
async function loadDeptTree() {
deptLoading.value = true;
const { error, data: deptItems } = await fetchGetDeptList({
const {error, data: deptItems} = await fetchGetDeptList({
status: 0
});
@@ -347,7 +360,11 @@ async function loadDeptTree() {
}
async function loadFormOptions() {
const [postResult, roleResult] = await Promise.all([fetchGetPostSimpleList(), fetchGetRoleSimpleList()]);
const [postResult, roleResult, companyResult] = await Promise.all([
fetchGetPostSimpleList(),
fetchGetRoleSimpleList(),
fetchGetDictDataByCode('system_user_company')
]);
if (!postResult.error) {
postOptions.value = postResult.data;
@@ -356,6 +373,10 @@ async function loadFormOptions() {
if (!roleResult.error) {
roleOptions.value = roleResult.data.filter(item => item.status === 0);
}
if (!companyResult.error) {
companyOptions.value = companyResult.data;
}
}
async function reloadUserTable(page = searchParams.pageNo) {
@@ -425,7 +446,7 @@ function openOrgLeader(row: Api.SystemManage.Dept) {
}
async function handleDeleteDeptAction(row: Api.SystemManage.Dept) {
const { error } = await fetchDeleteDept(row.id);
const {error} = await fetchDeleteDept(row.id);
if (error) {
return;
@@ -450,7 +471,7 @@ async function handleDeleteAction(row: Api.SystemManage.User) {
return;
}
const { error } = await fetchDeleteUser(row.id);
const {error} = await fetchDeleteUser(row.id);
if (error) {
return;
@@ -469,7 +490,7 @@ async function updateUserResignedAt(userId: number, value: number | null) {
const user = detailResult.data;
const { error } = await fetchUpdateUser({
const {error} = await fetchUpdateUser({
id: userId,
username: user.username,
nickname: user.nickname ?? null,
@@ -521,7 +542,7 @@ async function handleBatchDelete() {
return;
}
const { error } = await fetchBatchDeleteUser(userCheckedRowKeys.value);
const {error} = await fetchBatchDeleteUser(userCheckedRowKeys.value);
if (error) {
return;
@@ -534,7 +555,7 @@ async function handleBatchDelete() {
async function handleToggleStatus(row: Api.SystemManage.User, enabled: boolean) {
statusLoadingIds.value = [...statusLoadingIds.value, row.id];
const { error } = await fetchUpdateUserStatus({
const {error} = await fetchUpdateUserStatus({
id: row.id,
status: enabled ? 0 : 1
});
@@ -624,6 +645,7 @@ onMounted(async () => {
<UserSearch
v-model:model="searchParams"
:role-options="roleOptions"
:company-options="companyOptions"
:disabled="!currentDept"
@reset="handleResetSearch"
@search="handleSearch"
@@ -643,13 +665,13 @@ onMounted(async () => {
<template #default>
<ElButton plain type="primary" :disabled="!currentDept" @click="openAdd">
<template #icon>
<icon-ic-round-plus class="text-icon" />
<icon-ic-round-plus class="text-icon"/>
</template>
{{ $t('common.add') }}
</ElButton>
<ElButton plain type="primary" :disabled="!currentDept" @click="userManagementRelationVisible = true">
<template #icon>
<icon-ic-round-plus class="text-icon" />
<icon-ic-round-plus class="text-icon"/>
</template>
管理链路
</ElButton>
@@ -657,7 +679,7 @@ onMounted(async () => {
<template #reference>
<ElButton type="danger" plain :disabled="userCheckedRowKeys.length === 0">
<template #icon>
<icon-ic-round-delete class="text-icon" />
<icon-ic-round-delete class="text-icon"/>
</template>
{{ $t('common.batchDelete') }}
</ElButton>
@@ -679,7 +701,7 @@ onMounted(async () => {
:data="data"
@selection-change="handleUserSelectionChange"
>
<ElTableColumn v-for="col in columns" :key="String(col.prop)" v-bind="col" />
<ElTableColumn v-for="col in columns" :key="String(col.prop)" v-bind="col"/>
</ElTable>
</div>
<div class="mt-20px flex justify-end">
@@ -694,7 +716,7 @@ onMounted(async () => {
</template>
<div v-else class="h-full flex items-center justify-center">
<ElEmpty :description="$t('page.system.user.emptyOrg')" />
<ElEmpty :description="$t('page.system.user.emptyOrg')"/>
</div>
</ElCard>
</div>
@@ -707,6 +729,7 @@ onMounted(async () => {
:dept-tree="deptTree"
:post-options="postOptions"
:role-options="roleOptions"
:company-options="companyOptions"
@submitted="handleSubmitted"
/>
@@ -733,7 +756,7 @@ onMounted(async () => {
@submitted="handleDeptSubmitted"
/>
<UserOrgLeaderDialog v-model:visible="orgLeaderVisible" :dept="leaderDeptData" />
<UserOrgLeaderDialog v-model:visible="orgLeaderVisible" :dept="leaderDeptData"/>
<BusinessFormDialog
v-model="userManagementRelationVisible"
@@ -742,7 +765,7 @@ onMounted(async () => {
:show-footer="false"
max-body-height="70vh"
>
<UserManagementRelation :from-user-index="true" :dept-id="currentDeptId" />
<UserManagementRelation :from-user-index="true" :dept-id="currentDeptId"/>
</BusinessFormDialog>
</div>
</template>

5
src/views/system/user/modules/user-operate-dialog.vue
View File

@@ -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,

14
src/views/system/user/modules/user-search.vue
View File

@@ -8,6 +8,7 @@ defineOptions({ name: 'UserSearch' });
interface Props {
roleOptions: Api.SystemManage.RoleSimple[];
companyOptions: Api.Dict.DictData[];
disabled?: boolean;
}
@@ -72,6 +73,19 @@ const model = defineModel<Api.SystemManage.UserSearchParams>('model', { required
</ElSelect>
</ElFormItem>
</ElCol>
<ElCol :lg="6" :md="8" :sm="12">
<ElFormItem label="所属公司" prop="company">
<ElSelect
v-model="model.company"
clearable
filterable
:disabled="disabled"
placeholder="请选择所属公司"
>
<ElOption v-for="item in companyOptions" :key="item.value" :label="item.label" :value="item.value" />
</ElSelect>
</ElFormItem>
</ElCol>
<ElCol :lg="6" :md="8" :sm="12">
<ElFormItem :label="$t('page.system.user.userRole')" prop="roleId">
<ElSelect