From 795b4cacb10ec7f89154b9ce9e19bf7878051d8d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 一月 2024 16:25:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index d267825..44d1c34 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -122,6 +122,7 @@
         ></classify-auth-dialog>
         <!-- 鏁版嵁鎺堟潈瀵硅瘽妗� -->
         <data-auth-dialog
+          :TreeNode="TreeEditObj"
           :classifyData="classifyData"
           :visible.sync="dataAuthVisible"
         ></data-auth-dialog>
@@ -707,7 +708,8 @@
         index: true,
         border: true,
         columnBtn: false,
-        height: 180,
+        height: 150,
+        refreshBtn: false,
         addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
         editBtn: false,
         delBtn: false,
@@ -876,7 +878,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,10 +1143,10 @@
     },
     //鏍戠偣鍑讳簨浠�
     async nodeClick(data) {
-      getAuthButtonList({classifyId: data.oid,code: "classifyTree",authType: "classify_auth"}).then(res => {
+      getAuthButtonList({classifyId: data.oid, code: "classifyTree", authType: "classify_auth"}).then(res => {
         this.btnAuthList = res.data.data;
       }).catch(error => {
-        window.console.log(error)
+        console.log(error)
       })
       //鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌
       this.TreeFlagCode = !data;

--
Gitblit v1.9.3