From dd7c750698cb3b70c742b6c84f10072d02c78fc9 Mon Sep 17 00:00:00 2001
From: yinbangzhong <zhongbangyin@126.com>
Date: 星期四, 08 八月 2024 10:50:32 +0800
Subject: [PATCH] 用户部门显示
---
src/views/authority/users/index.vue | 79 +++++++++++++++++++++++++--------------
src/api/authority.ts | 1
2 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/src/api/authority.ts b/src/api/authority.ts
index 64cb6ca..f3a9039 100644
--- a/src/api/authority.ts
+++ b/src/api/authority.ts
@@ -8,6 +8,7 @@
email: string;
phoneNumber: string;
dept: any;
+ deptName:string;
resources: any;
knowledges: any;
dialogs: any;
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index d4cfc99..1509a15 100644
--- a/src/views/authority/users/index.vue
+++ b/src/views/authority/users/index.vue
@@ -369,6 +369,7 @@
let editform = ref<User>({
createTime: '',
dept: undefined,
+ deptName:"",
email: '',
nickName: '',
phoneNumber: '',
@@ -508,8 +509,8 @@
},
{
title: t('鎵�灞為儴闂�'),
- dataIndex: 'dept',
- slotName: 'dept',
+ dataIndex: 'deptName',
+ slotName: 'deptName',
},
{
title: t('鐘舵��'),
@@ -630,7 +631,7 @@
//鍒犻櫎
if (t == 3) {
await UserDelete(record.userId).then((res) => {
- if (res.code == 20000) {
+ if (res.code == 200) {
fetchData();
}
});
@@ -646,28 +647,35 @@
checkStrictlyDialog.value = [];
checkedKeysDialog.value = [];
selectUser.value = record;
- record.resources.forEach((val) => {
- checkStrictlyMenu.value.push({
- menuId: val.menuId,
- menuName: val.menuName,
+ if (record.resources) {
+ record.resources.forEach((val) => {
+ checkStrictlyMenu.value.push({
+ menuId: val.menuId,
+ menuName: val.menuName
+ });
+ checkedKeysMenu.value.push(val.menuId);
+ expandKdysMenu.value.push(val.menuId);
});
- checkedKeysMenu.value.push(val.menuId);
- expandKdysMenu.value.push(val.menuId);
- });
- record.knowledges.forEach((val) => {
- checkStrictlyKnowledge.value.push({
- knowledgeId: val.id,
- knowledgeName: val.name,
+ }
+ if (record.knowledges) {
+ record.knowledges.forEach((val) => {
+ checkStrictlyKnowledge.value.push({
+ knowledgeId: val.id,
+ knowledgeName: val.name
+ });
+ checkedKeysKnowledge.value.push(val.id);
});
- checkedKeysKnowledge.value.push(val.id);
- });
- record.dialogs.forEach((val) => {
- checkStrictlyDialog.value.push({
- dialogId: val.id,
- dialogName: val.name,
+ }
+ if (record.dialogs) {
+ record.dialogs.forEach((val) => {
+ checkStrictlyDialog.value.push({
+ dialogId: val.id,
+ dialogName: val.name
+ });
+ checkedKeysDialog.value.push(val.id);
});
- checkedKeysDialog.value.push(val.id);
- });
+ }
+
}
//鏈烘瀯
if (t == 5) {
@@ -677,14 +685,16 @@
checkStrictly.value = [];
selectUser.value = record;
expandKdys.value.push('0');
- record.dept.forEach((val) => {
- checkStrictly.value.push({
- deptId: val.deptId,
- deptName: val.deptName,
+ if (record.dept) {
+ record.dept.forEach((val) => {
+ checkStrictly.value.push({
+ deptId: val.deptId,
+ deptName: val.deptName
+ });
+ checkedKeys.value.push(val.deptId);
+ expandKdys.value.push(val.deptId);
});
- checkedKeys.value.push(val.deptId);
- expandKdys.value.push(val.deptId);
- });
+ }
}
};
@@ -694,6 +704,17 @@
setLoading(true);
try {
await UserList(params).then((res) => {
+ for (const user of res.rows) {
+ if (user.dept) {
+ for (const d of user.dept) {
+ if (user.deptName) {
+ user.deptName += d.deptName + ",";
+ } else {
+ user.deptName = d.deptName + ",";
+ }
+ }
+ }
+ }
renderData.value = res.rows;
console.log(renderData);
pagination.current = params.current;
--
Gitblit v1.8.0