From 7577e0d40354021d70b78d58b712ff8c2e8ad485 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 03 一月 2025 10:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index 288f0ad..b65c440 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -15,21 +15,32 @@
@current-row-change="handleCurrentRowChange"
>
<template slot="menu" slot-scope="{row,size,type}">
- <el-button icon="el-icon-circle-plus-outline" size="small" type="text" @click="handleAdd()">鏂板瀛愮骇</el-button>
- <el-button v-if="row.ALLDept !== 'ALLDept'" icon="el-icon-edit" size="small" type="text"
+ <el-button v-if="permissionList.departmentAddChildrenBtn" icon="el-icon-circle-plus-outline" size="small"
+ type="text" @click="handleAdd()">鏂板瀛愮骇
+ </el-button>
+ <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.editBtn" icon="el-icon-edit" size="small"
+ type="text"
@click="editBtnClick(row)">缂栬緫
</el-button>
- <el-button v-if="row.ALLDept !== 'ALLDept'" icon="el-icon-delete" size="small" type="text"
+ <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.delBtn" icon="el-icon-delete" size="small"
+ type="text"
@click="rowDeleteHandler(row)">鍒犻櫎
</el-button>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button icon="el-icon-school" plain size="small" type="primary" @click="assignMembersHandler">鍒嗛厤鎴愬憳
+ <el-button v-if="permissionList.assignMembersBtn" icon="el-icon-school" plain size="small" type="primary"
+ @click="assignMembersHandler">鍒嗛厤鎴愬憳
</el-button>
- <el-button icon="el-icon-user" plain size="small" type="primary" @click="statisticsHandler">缁熻</el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadHandler">瀵煎叆閮ㄩ棬</el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="downLoadHandler">涓嬭浇瀵煎叆妯℃澘</el-button>
+ <el-button v-if="permissionList.statisticsBtn" icon="el-icon-user" plain size="small" type="primary"
+ @click="statisticsHandler">缁熻
+ </el-button>
+ <el-button v-if="permissionList.importDepartmentBtn" icon="el-icon-upload2" plain size="small" type="primary"
+ @click="upLoadHandler">瀵煎叆閮ㄩ棬
+ </el-button>
+ <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
+ type="primary" @click="downLoadHandler">涓嬭浇瀵煎叆妯℃澘
+ </el-button>
</template>
</avue-crud>
@@ -37,7 +48,6 @@
<el-dialog
v-dialogDrag
v-loading="statisticsLoading"
- :destroy-on-close="true"
:visible.sync="statisticsVisible"
append-to-body="true"
class="avue-dialog"
@@ -86,6 +96,7 @@
import basicOption from '@/util/basic-option';
import {column} from './option'
import func from "@/util/func";
+import {mapGetters} from "vuex";
export default {
name: "departmentManage",
@@ -96,12 +107,15 @@
...basicOption,
rowKey: 'oid',
rowParentKey: 'parentId',
+ expandRowKeys: [],
selection: false,
addBtn: false,
editBtn: false,
delBtn: false,
gridBtn: false,
+ menuWidth: 280,
highlightCurrentRow: true,
+ calcHeight: -50,
column: column
},
tableLoading: false,
@@ -115,7 +129,9 @@
selection: false,
refreshBtn: false,
addBtn: false,
+ header: false,
menu: false,
+ calcHeight: 80,
column: [
{
label: '閮ㄩ棬',
@@ -148,11 +164,26 @@
fileUrl: 'api/departmentQueryController/importDept',
}
},
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
+ editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
+ assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].assignMembers, false),
+ departmentAddChildrenBtn: this.vaildData(this.permission[this.$route.query.id].departmentAddChildren, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
+ importDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].importDepartment, false),
+ statisticsBtn: this.vaildData(this.permission[this.$route.query.id].statistics, false),
+ };
+ },
+ },
methods: {
// 琛ㄦ牸鍒濆鍖栬姹�
getTableList() {
refTree({queryAllLevel: true, 'extandParamsMap[showAllDepartmentNode]': true}).then(res => {
this.tableData = this.departDtaFormAtter(res.data.treeData);
+ this.option.expandRowKeys = [res.data.treeData[0].oid];
})
},
@@ -161,6 +192,7 @@
return items.map(item => {
// 杞崲褰撳墠鑺傜偣鐨勫睘鎬�
const formList = {
+ expanded: item.expanded,
oid: item.oid,
id: item.attributes.id,
name: item.attributes.name,
@@ -204,7 +236,6 @@
done();
}
}).catch(err => {
- console.log(err);
loading();
})
@@ -232,7 +263,6 @@
done();
}
}).catch(err => {
- console.log(err);
loading();
})
},
@@ -326,19 +356,17 @@
this.rightTransferData = byRoleRes.data.data.map(item => item.oid);
this.$refs.transfer.visible = true;
}
- }).catch(err => {
- console.error(err);
});
},
// 鍒嗛厤鎴愬憳绌挎妗嗗洖濉�
departTransferSend(row) {
let params = {
- userOids: row.join(','),
+ userOIds: row.join(','),
deptId: this.departCurrenRow.oid
}
saveUsersDepts(params).then(res => {
- console.log(res);
+ //console.log(res);
this.$message.success(res.data.obj);
this.getTableList();
}).catch(err => {
@@ -351,9 +379,7 @@
download().then(res => {
func.downloadFileByBlobHandler(res);
this.$message.success('涓嬭浇鎴愬姛')
- }).catch(err => {
- this.$message.error(err);
- })
+ });
},
// 瀵煎叆閮ㄩ棬
--
Gitblit v1.9.3