From e581891072a36f0d0f7f57246366ded965e2ab8a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期四, 25 一月 2024 10:11:17 +0800
Subject: [PATCH] 获取集团分类根节点前端传null传入后端直接改为空字符串bug修复
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 3b3b566..2e37a1b 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -6,33 +6,39 @@
<basic-container>
<div style="height: calc(100vh - 142px);!important;">
<div class="headerCon" style="display: flex; flex-wrap: wrap;margin-bottom: 5px">
- <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞
+ <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞
</el-button>
- <el-button v-if="permissionList.TreeEditStatus" plain size="small" type="primary" @click="TreeEdit">淇敼
+ <el-button v-if="permissionList.TreeEditStatus" v-show="allButtons" plain size="small" type="primary"
+ @click="TreeEdit">淇敼
</el-button>
- <el-button v-if="permissionList.TreeDelStatus" plain size="small" type="primary" @click="TreeDel">鍒犻櫎
+ <el-button v-if="permissionList.TreeDelStatus" v-show="allButtons" plain size="small" type="primary"
+ @click="TreeDel">鍒犻櫎
</el-button>
- <el-button v-if="permissionList.flushedStatus" plain size="small" type="primary" @click="flushed">鍒锋柊
+ <el-button v-if="permissionList.flushedStatus" v-show="allButtons" plain size="small" type="primary"
+ @click="flushed">鍒锋柊
</el-button>
- <el-button v-if="permissionList.EnableStatus" plain size="small" type="primary" @click="Enable">鍚敤
+ <el-button v-if="permissionList.EnableStatus" v-show="allButtons" plain size="small" type="primary"
+ @click="Enable">鍚敤
</el-button>
- <el-button v-if="permissionList.DeactivateStatus" plain size="small" type="primary" @click="Deactivate">鍋滅敤
+ <el-button v-if="permissionList.DeactivateStatus" v-show="allButtons" plain size="small" type="primary"
+ @click="Deactivate">鍋滅敤
</el-button>
- <el-button v-if="permissionList.ImportExcelStatus" plain size="small" type="primary"
+ <el-button v-if="permissionList.ImportExcelStatus" v-show="allButtons" plain size="small" type="primary"
@click.native="ImportExcel">瀵煎叆
</el-button>
- <el-button v-if="permissionList.ExportExcelStatus" plain size="small" type="primary" @click="ExportExcel">
+ <el-button v-if="permissionList.ExportExcelStatus" v-show="allButtons" plain size="small" type="primary"
+ @click="ExportExcel">
瀵煎嚭
</el-button>
- <el-button v-if="permissionList.flowingBtnStuatus" plain
+ <el-button v-if="permissionList.flowingBtnStuatus" v-show="allButtons" plain
size="small" style="width: 56px;text-align: center;padding-left: 3px" type="primary"
@click="flowingDependHandler">娴佹按澶勭悊
</el-button>
- <el-button v-if="permissionList.classifyAuth" plain size="small"
+ <el-button v-if="permissionList.classifyAuth" v-show="allButtons" plain size="small"
style="width: 56px;text-align: center;padding-left: 3px" type="primary"
@click="classifyAuthHandler">鍒嗙被鎺堟潈
</el-button>
- <el-button v-if="permissionList.classifyAuth" plain size="small"
+ <el-button v-if="permissionList.classifyAuth" v-show="allButtons" plain size="small"
style="width: 56px;text-align: center;padding-left: 3px" type="primary"
@click="dataAuthHandler">鏁版嵁鎺堟潈
</el-button>
@@ -122,9 +128,9 @@
></classify-auth-dialog>
<!-- 鏁版嵁鎺堟潈瀵硅瘽妗� -->
<data-auth-dialog
+ :TreeNode="TreeEditObj"
:classifyData="classifyData"
:visible.sync="dataAuthVisible"
- :TreeNode="TreeEditObj"
></data-auth-dialog>
</basic-container>
</el-aside>
@@ -372,6 +378,7 @@
name: "classifyTrees.vue",
data() {
return {
+ allButtons: Boolean,
btnAuthList: [],
activeName: 'first',
masterRow: null,
@@ -673,6 +680,7 @@
this.$refs.tree.setCurrentKey(null);
this.nodeClickList = {};
this.TreeFlagCode = true;
+ this.allButtons = false;
// this.$nextTick(()=>{
// this.btnAuthList = [];
// })
@@ -683,7 +691,7 @@
...mapGetters(["permission"]),
permissionList() {
return {
- TreeAddStatus: this.vaildData(this.btnAuthList.tree_add, false),
+ TreeAddStatus: this.vaildData(this.permission.classifyTree.tree_add, false),
TreeEditStatus: this.vaildData(this.btnAuthList.tree_edit, false),
TreeDelStatus: this.vaildData(this.btnAuthList.tree_delete, false),
flushedStatus: this.vaildData(this.btnAuthList.tree_break, false),
@@ -709,7 +717,7 @@
border: true,
columnBtn: false,
height: 150,
- refreshBtn:false,
+ refreshBtn: false,
addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
editBtn: false,
delBtn: false,
@@ -1143,7 +1151,8 @@
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- getAuthButtonList({classifyId: data.oid,code: "classifyTree",authType: "classify_auth"}).then(res => {
+ this.allButtons = true;
+ getAuthButtonList({classifyId: data.oid, code: "classifyTree", authType: "classify_auth"}).then(res => {
this.btnAuthList = res.data.data;
}).catch(error => {
console.log(error)
--
Gitblit v1.9.3