From fb606a4c7f7a1ffec771d9fbc446005b7b4915a2 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sun, 6 Oct 2024 18:59:44 +0800 Subject: [PATCH] =?UTF-8?q?completepage:=20=F0=9F=8D=BB=20=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90,=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=83=A8=E5=88=86=E6=96=87=E4=BB=B6=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/v1/adminUser.ts | 8 ++ src/api/v1/dept.ts | 7 + src/components/Table/TableImage.vue | 2 - .../Table/Userinfo/UserinfoDialog.vue | 11 +- src/components/Table/Userinfo/columns.tsx | 9 +- src/components/TableBar/src/TablePlus.vue | 2 - src/store/system/adminUser.ts | 8 +- src/store/system/dept.ts | 13 +- src/views/i18n/i18n-setting/utils/columns.tsx | 2 +- .../i18n/i18n-type-setting/utils/columns.tsx | 1 + src/views/system/adminUser/utils/columns.tsx | 2 +- src/views/system/dept/dept-dialog.vue | 20 ++- src/views/system/dept/index.vue | 6 +- src/views/system/dept/user-select-search.vue | 133 ++++++++++++++++++ src/views/system/dept/utils/columns.ts | 22 +-- src/views/system/dept/utils/hooks.ts | 4 +- src/views/system/dept/utils/types.ts | 2 +- .../menuIcon/menu-icon-select-icon-name.vue | 2 +- src/views/system/menuIcon/utils/columns.ts | 2 +- src/views/system/power/utils/columns.ts | 2 +- src/views/system/role/utils/columns.ts | 2 +- 21 files changed, 215 insertions(+), 45 deletions(-) create mode 100644 src/views/system/dept/user-select-search.vue diff --git a/src/api/v1/adminUser.ts b/src/api/v1/adminUser.ts index 624eba8..083e9ab 100644 --- a/src/api/v1/adminUser.ts +++ b/src/api/v1/adminUser.ts @@ -8,6 +8,14 @@ export const fetchGetAdminUserList = (data: any) => { return http.request>('get', `user/getAdminUserList/${data.currentPage}/${data.pageSize}`, { params: data }); }; +/** + * 查询用户 + * @param data + */ +export const fetchQueryUser = (data: any) => { + return http.request>('get', 'user/queryUser', { params: data }); +}; + /** * 用户信息---添加用户信息 */ diff --git a/src/api/v1/dept.ts b/src/api/v1/dept.ts index 4e27f9e..c1de5c2 100644 --- a/src/api/v1/dept.ts +++ b/src/api/v1/dept.ts @@ -8,6 +8,13 @@ export const fetchGetDeptList = (data: any) => { return http.request>('get', `dept/getDeptList/${data.currentPage}/${data.pageSize}`, { params: data }); }; +/** + * 部门管理---获取所有部门管理列表 + */ +export const fetchGetAllDeptList = () => { + return http.request>('get', 'dept/getAllDeptList'); +}; + /** * 部门管理---添加部门管理 */ diff --git a/src/components/Table/TableImage.vue b/src/components/Table/TableImage.vue index 65bfb74..3b60d6e 100644 --- a/src/components/Table/TableImage.vue +++ b/src/components/Table/TableImage.vue @@ -13,5 +13,3 @@ defineProps({ - - diff --git a/src/components/Table/Userinfo/UserinfoDialog.vue b/src/components/Table/Userinfo/UserinfoDialog.vue index 5d37916..677ce69 100644 --- a/src/components/Table/Userinfo/UserinfoDialog.vue +++ b/src/components/Table/Userinfo/UserinfoDialog.vue @@ -3,7 +3,6 @@ import userAvatarIcon from '@/assets/svg/user_avatar.svg?component'; import { columns } from './columns'; import TablePlus from '@/components/TableBar/src/TablePlus.vue'; import { onMounted, ref } from 'vue'; -import TableImage from '@/components/Table/TableImage.vue'; import { fetchGetUserinfoById } from '@/api/v1/user'; import { $t } from '@/plugins/i18n'; @@ -48,12 +47,7 @@ onMounted(() => {

{{ $t('user_details') }}

- - - - + @@ -113,9 +107,6 @@ onMounted(() => { line-height: 20px; text-overflow: ellipsis; -webkit-box-orient: vertical; - } - - &--desc { -webkit-line-clamp: 2; } } diff --git a/src/components/Table/Userinfo/columns.tsx b/src/components/Table/Userinfo/columns.tsx index e76c754..089f647 100644 --- a/src/components/Table/Userinfo/columns.tsx +++ b/src/components/Table/Userinfo/columns.tsx @@ -1,11 +1,16 @@ import { $t } from '@/plugins/i18n'; import UserinfoDialog from '@/components/Table/Userinfo/UserinfoDialog.vue'; -import { addDialog } from '@/components/BaseDialog/index'; // 表格列字段 +import { addDialog } from '@/components/BaseDialog/index'; +import TableImage from '@/components/Table/TableImage.vue'; // 表格列字段 // 表格列字段 export const columns = [ { label: $t('id'), prop: 'id' }, - { label: $t('avatar'), prop: 'avatar', slot: 'avatar' }, + { + label: $t('avatar'), + prop: 'avatar', + cellRenderer: ({ row }) => , + }, { label: $t('nickName'), prop: 'nickName' }, { label: $t('username'), prop: 'username' }, { label: $t('email'), prop: 'email', width: 180 }, diff --git a/src/components/TableBar/src/TablePlus.vue b/src/components/TableBar/src/TablePlus.vue index 08da498..7c56ac5 100644 --- a/src/components/TableBar/src/TablePlus.vue +++ b/src/components/TableBar/src/TablePlus.vue @@ -44,5 +44,3 @@ defineProps({ }, }); - - diff --git a/src/store/system/adminUser.ts b/src/store/system/adminUser.ts index bfa071b..12dfb7f 100644 --- a/src/store/system/adminUser.ts +++ b/src/store/system/adminUser.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { fetchAddAdminUser, fetchDeleteAdminUser, fetchGetAdminUserList, fetchUpdateAdminUser } from '@/api/v1/adminUser'; +import { fetchAddAdminUser, fetchDeleteAdminUser, fetchGetAdminUserList, fetchQueryUser, fetchUpdateAdminUser } from '@/api/v1/adminUser'; import { pageSizes } from '@/enums/baseConstant'; import { storeMessage } from '@/utils/message'; import { storePagination } from '@/store/useStorePagination'; @@ -61,6 +61,12 @@ export const useAdminUserStore = defineStore('adminUserStore', { return pagination(result); }, + async queryUser(data: any) { + const result = await fetchQueryUser(data); + if (result.code !== 200) return []; + return result.data; + }, + /** * * 添加用户信息 */ diff --git a/src/store/system/dept.ts b/src/store/system/dept.ts index eea9661..7f64b5b 100644 --- a/src/store/system/dept.ts +++ b/src/store/system/dept.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { fetchAddDept, fetchDeleteDept, fetchGetDeptList, fetchUpdateDept } from '@/api/v1/dept'; +import { fetchAddDept, fetchDeleteDept, fetchGetAllDeptList, fetchGetDeptList, fetchUpdateDept } from '@/api/v1/dept'; import { pageSizes } from '@/enums/baseConstant'; import { storeMessage } from '@/utils/message'; import { storePagination } from '@/store/useStorePagination'; @@ -12,6 +12,8 @@ export const useDeptStore = defineStore('deptStore', { return { // 部门列表 datalist: [], + // 所有部门列表 + allDeptList: [], // 查询表单 form: { // 部门名称 @@ -52,6 +54,15 @@ export const useDeptStore = defineStore('deptStore', { return pagination(result); }, + /** + * * 获取所有部门列表 + */ + async getAllDeptList() { + const result = await fetchGetAllDeptList(); + if (result.code !== 200) return; + this.allDeptList = result.data; + }, + /** * * 添加部门 */ diff --git a/src/views/i18n/i18n-setting/utils/columns.tsx b/src/views/i18n/i18n-setting/utils/columns.tsx index 91e9ac1..3544a36 100644 --- a/src/views/i18n/i18n-setting/utils/columns.tsx +++ b/src/views/i18n/i18n-setting/utils/columns.tsx @@ -4,8 +4,8 @@ import type { FormRules } from 'element-plus'; import { $t } from '@/plugins/i18n'; export const columns: TableColumnList = [ - { type: 'index', index: (index: number) => index + 1 }, { type: 'selection', align: 'left' }, + { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, { label: $t('id'), prop: 'id' }, { label: $t('i18n.keyName'), prop: 'keyName' }, { label: $t('i18n.translation'), prop: 'translation' }, diff --git a/src/views/i18n/i18n-type-setting/utils/columns.tsx b/src/views/i18n/i18n-type-setting/utils/columns.tsx index 46611e8..04bfd0c 100644 --- a/src/views/i18n/i18n-type-setting/utils/columns.tsx +++ b/src/views/i18n/i18n-type-setting/utils/columns.tsx @@ -4,6 +4,7 @@ import { $t } from '@/plugins/i18n'; export const editMap = ref({}); export const columns: TableColumnList = [ + { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, { label: $t('id'), prop: 'id' }, { label: $t('i18n_typeName'), prop: 'typeName' }, { label: $t('i18n_summary'), prop: 'summary' }, diff --git a/src/views/system/adminUser/utils/columns.tsx b/src/views/system/adminUser/utils/columns.tsx index 3f25bd9..b31507c 100644 --- a/src/views/system/adminUser/utils/columns.tsx +++ b/src/views/system/adminUser/utils/columns.tsx @@ -6,7 +6,7 @@ export const isAddUserinfo = ref(false); // 表格列 export const columns: TableColumnList = [ - { type: 'index', index: (index: number) => index + 1 }, + { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, // 主键 { label: $t('id'), prop: 'id' }, // 用户名 diff --git a/src/views/system/dept/dept-dialog.vue b/src/views/system/dept/dept-dialog.vue index cf3016b..24cb332 100644 --- a/src/views/system/dept/dept-dialog.vue +++ b/src/views/system/dept/dept-dialog.vue @@ -1,16 +1,19 @@