From d74b495736f0c04522ec54274b70fed0ded2878d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 11:30:06 +0800
Subject: [PATCH] 任务新增导出
---
src/views/system/user.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index bd6ede2..84db507 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -362,6 +362,22 @@
display: false,
},
{
+ label: "所属队伍",
+ prop: "team",
+ overHidden: true,
+ parent: false,
+ type: "tree",
+ searchLabelWidth: 90,
+ searchSpan: 4,
+ dicUrl: "/api/jurisdiction/lazy-team",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ checkStrictly: true,
+ display: false,
+ },
+ {
label: "所属角色",
prop: "roleName",
slot: true,
@@ -517,7 +533,27 @@
rules: [
{
required: false,
- message: "请选择所属辖区",
+ message: "请选择所属工作单位",
+ trigger: "click"
+ }
+ ]
+ },
+ {
+ label: "所属队伍",
+ prop: "team",
+ overHidden: true,
+ parent: false,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-team",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ checkStrictly: true,
+ rules: [
+ {
+ required: false,
+ message: "请选择所属所属队伍",
trigger: "click"
}
]
@@ -951,6 +987,10 @@
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
+
+ if (row.deptId == "") {
+ row.deptId = " ";
+ }
const userMap = {
user: {
account: row.account,
@@ -1137,8 +1177,15 @@
window.open(
`/api/blade-user/export-user?${
this.website.tokenHeader
- }=${getToken()}&account=${this.search.account}&realName=${
+ }=${getToken()}&account=${this.search.account}
+ &realName=${
this.search.realName
+ }
+ &workjurisdiction=${
+ this.search.workjurisdiction
+ }
+ &jurisdiction=${
+ this.search.jurisdiction
}`
);
});
--
Gitblit v1.9.3