From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 6184ec2..24b45f4 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -6,7 +6,7 @@
<basic-container>
<div style="height: calc(100vh - 142px);!important;">
<div class="headerCon" style="display: flex; flex-wrap: wrap;margin-bottom: 5px">
- <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞
+ <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞
</el-button>
<el-button v-if="permissionList.TreeEditStatus" plain size="small" type="primary" @click="TreeEdit">淇敼
</el-button>
@@ -31,6 +31,10 @@
<el-button v-if="permissionList.classifyAuth" 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"
+ style="width: 56px;text-align: center;padding-left: 3px" type="primary"
+ @click="dataAuthHandler">鏁版嵁鎺堟潈
</el-button>
</div>
<!-- 宸︿晶鏍�-->
@@ -116,6 +120,12 @@
:classifyData="classifyData"
:visible.sync="classifyAuthVisible"
></classify-auth-dialog>
+ <!-- 鏁版嵁鎺堟潈瀵硅瘽妗� -->
+ <data-auth-dialog
+ :classifyData="classifyData"
+ :visible.sync="dataAuthVisible"
+ :TreeNode="TreeEditObj"
+ ></data-auth-dialog>
</basic-container>
</el-aside>
<el-main>
@@ -386,13 +396,14 @@
BtmdialogVisible: false,
SelectOption: [
{
- value: 'name',
- label: '涓枃鍚嶇О'
+ value: 'id',
+ label: '鑻辨枃鍚嶇О',
},
{
- value: 'id',
- label: '鑻辨枃鍚嶇О'
+ value: 'name',
+ label: '涓枃鍚嶇О'
}
+
],
btmSelectOption: [
{
@@ -451,6 +462,8 @@
TreeAddFormVisible: false,
//鍒嗙被鎺堟潈瀵硅瘽妗�
classifyAuthVisible: false,
+ //鏁版嵁鎺堟潈瀵硅瘽妗�
+ dataAuthVisible: false,
//褰撳墠鐐瑰嚮椤�
nodeClickList: "",
ClonenodeClickList: "",
@@ -759,6 +772,15 @@
this.classifyData = this.nodeClickList;
this.classifyAuthVisible = true;
},
+ // 鏁版嵁鎺堟潈瀵硅瘽妗嗘墦寮�
+ dataAuthHandler() {
+ if (this.nodeClickList.oid === '' || this.nodeClickList.oid === undefined) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
+ return;
+ }
+ this.classifyData = this.nodeClickList;
+ this.dataAuthVisible = true;
+ },
flowingDependHandler() {
if (this.nodeClickList.length <= 0) {
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
@@ -855,7 +877,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;
@@ -1115,7 +1142,7 @@
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- getAuthButtonList({classifyId: data.oid}).then(res => {
+ 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