From d5f65a731126e37bd3d1498b54db7d6093fec5b2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 25 一月 2024 11:00:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 86 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index c567321..59a9275 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>
@@ -43,7 +49,7 @@
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
- style="height: 690px"
+ style="height: 610px"
@node-click="nodeClick"
>
<template slot-scope="{ node, data }" class="el-tree-node__label">
@@ -117,11 +123,13 @@
</el-dialog>
<!-- 鍒嗙被鎺堟潈瀵硅瘽妗�-->
<classify-auth-dialog
+ :TreeNode="TreeEditObj"
:classifyData="classifyData"
:visible.sync="classifyAuthVisible"
></classify-auth-dialog>
<!-- 鏁版嵁鎺堟潈瀵硅瘽妗� -->
<data-auth-dialog
+ :TreeNode="TreeEditObj"
:classifyData="classifyData"
:visible.sync="dataAuthVisible"
></data-auth-dialog>
@@ -371,6 +379,7 @@
name: "classifyTrees.vue",
data() {
return {
+ allButtons: Boolean,
btnAuthList: [],
activeName: 'first',
masterRow: null,
@@ -504,6 +513,7 @@
Treedata: [],
CloneTreedata: [],
Treeoption: {
+ height:'auto',
addBtn: false,
editBtn: false,
delBtn: false,
@@ -672,6 +682,7 @@
this.$refs.tree.setCurrentKey(null);
this.nodeClickList = {};
this.TreeFlagCode = true;
+ this.allButtons = false;
// this.$nextTick(()=>{
// this.btnAuthList = [];
// })
@@ -682,7 +693,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),
@@ -699,7 +710,7 @@
},
treeStyle() {
return {
- height: this.btnAuthList.length > 0 ? '620px' : '785px',
+ height: this.allButtons ? '610px' : '690px',
};
},
crudTreeOption() {
@@ -707,7 +718,8 @@
index: true,
border: true,
columnBtn: false,
- height: 180,
+ height: 150,
+ refreshBtn: false,
addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
editBtn: false,
delBtn: false,
@@ -768,7 +780,7 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- this.classifyData = this.nodeClickList;
+ // this.classifyData = this.nodeClickList;
this.classifyAuthVisible = true;
},
// 鏁版嵁鎺堟潈瀵硅瘽妗嗘墦寮�
@@ -777,7 +789,7 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- this.classifyData = this.nodeClickList;
+ // this.classifyData = this.nodeClickList;
this.dataAuthVisible = true;
},
flowingDependHandler() {
@@ -876,7 +888,12 @@
getAttr() {
this.loading = true;
return new Promise((resolve, reject) => {
- getAtrrList()
+ let conditionMaps = {};
+ conditionMaps["conditionMap[authType]"] = "classify_auth";
+ conditionMaps["conditionMap[buttonCode]"] = "classifyTree";
+ // 鍒嗙被鎺堟潈涓槸鍚﹀叿澶囨煡鐪嬫潈闄�
+ conditionMaps["conditionMap[menuCode]"] = "classify_view";
+ getAtrrList(conditionMaps)
.then(res => {
this.Treedata = res.data;
this.CloneTreedata = res.data;
@@ -1136,7 +1153,12 @@
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- getAuthButtonList({classifyId: data.oid,code: "classifyTree",authType: "classify_auth"}).then(res => {
+ const response = this.findTheTopLevelNode(data,this.Treedata)
+ this.classifyData = response;
+ // console.log(response)
+ // console.log('response',response.attributes.id)
+ this.allButtons = true;
+ getAuthButtonList({classifyId: data.oid, code: "classifyTree", authType: "classify_auth"}).then(res => {
this.btnAuthList = res.data.data;
}).catch(error => {
console.log(error)
@@ -1180,6 +1202,32 @@
}
},
+ // 閫掑綊鏌ユ壘椤跺眰鑺傜偣Id
+ findTheTopLevelNode(data,TreeData){
+ if(data.parentId === ""){
+ return data;
+ }
+ const parentNode = this.findParentNode(data.parentId, TreeData);
+ if (parentNode) {
+ return this.findTheTopLevelNode(parentNode, TreeData); // 缁х画鏌ユ壘鐖惰妭鐐�
+ }
+ },
+ // 閫掑綊鏌ユ壘鍑烘潵澶氬眰鑺傜偣鐨勭埗鑺傜偣
+ findParentNode(parentId, TreeData){
+ for (const node of TreeData) {
+ if (node.oid === parentId) {
+ return node;
+ }
+ // 濡傛灉褰撳墠鑺傜偣杩樻湁瀛愯妭鐐癸紝缁х画鍘绘煡瀛愯妭鐐圭殑鐖惰妭鐐�
+ if (node.children) {
+ const parentNode = this.findParentNode(parentId, node.children);
+ if (parentNode) {
+ return parentNode;
+ }
+ }
+ }
+ return null;
+ },
async gridCode() {
try {
const res = await gridCodeClassifyTemplateAttr({
--
Gitblit v1.9.3