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 |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index d267825..24b45f4 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -124,6 +124,7 @@
         <data-auth-dialog
           :classifyData="classifyData"
           :visible.sync="dataAuthVisible"
+          :TreeNode="TreeEditObj"
         ></data-auth-dialog>
       </basic-container>
     </el-aside>
@@ -876,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;
@@ -1139,7 +1145,7 @@
       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