From 988cf8b273a2015833c024727deb9acc46060b3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 22 八月 2024 10:41:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
index 937cd36..ad57d3a 100644
--- a/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
+++ b/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
@@ -104,7 +104,7 @@
     return {
       // 瀵硅瘽妗嗘樉绀烘帶鍒�
       isShowDialog: this.visible,
-      isLoading: false,
+      isLoading: true,
       tableHeight: 'calc(100vh - 550px)',
       classifyAuthData: [],
       //鍒楀ご
@@ -128,10 +128,8 @@
         this.loadAuthPage();
       }
     },
-    classifyAuthData(newval){
-
-      this.addIndex = newval.length <= 0 ? 0 :newval.length-1;
-      console.log(this.addIndex)
+    classifyAuthData(newval) {
+      this.addIndex = newval.length <= 0 ? 0 : newval.length - 1;
     }
   },
   computed: {},
@@ -144,7 +142,7 @@
       if (code === "data_view") {
         row.checkTheStatus = check;
       } else if (!row.checkTheStatus) {
-        this.$message.warning('璇峰厛鍕鹃�夋煡鐪嬫寜閽紒');
+        this.$message.warning('娓呭厛鍕鹃�夋煡鐪嬫寜閽紒');
         // 鍦ㄦ潯浠朵笉婊¤冻鏃跺皢澶氶�夋鐘舵�佽缃负false
         row[id] = false;
       }
@@ -173,13 +171,15 @@
 
         //鍜岃〃鏍煎垪杩涜瀵规瘮
         this.classifyAuthHeader.forEach((item) => {
+          // if (item.code !== 'data_view') {
+          //   this.$set(this.classifyAuthData[index].authButton, "allDisabled", true);
+          // }
           const isMatched = filteredItems.some((x) => x.id === item.prop);
           this.$nextTick(() => {
             if (this.classifyAuthData[index]) {
               if (isMatched) {
                 Object.keys(this.classifyAuthData[index]).forEach((key) => {
                   this.$set(this.classifyAuthData[index].authButton, item.code, true);
-
                   //娣诲姞 鈥滄煡鐪嬪叏閮ㄧ鐢ㄦ潯浠垛��
                   if (item.code === "data_view") {
                     this.$set(this.classifyAuthData[index].authButton, "allDisabled", true);
@@ -197,7 +197,7 @@
             }
           });
         });
-
+        // console.log(this.classifyAuthData)
         //寮哄埗鍒锋柊琛ㄦ牸
         this.itemKey = uuidv4();
       });
@@ -251,7 +251,7 @@
         classifyItem: this.classifyData.label,
         authButton: {},
         uuid: uuidv4(),//鐢熸垚鍞竴鐨刬d,
-        index: this.addIndex,
+        index: this.classifyAuthData.length -1,
       }
       //灏嗘寜閽缃繘鍘�
       this.classifyAuthButton.forEach(data => {
@@ -259,7 +259,7 @@
       })
       //console.log(item)
       this.classifyAuthData.push(item)
-      this.roleHandlerMethods(this.roleList[0].id, 'add', this.addIndex)
+      this.roleHandlerMethods(this.roleList[0].id, 'add', this.classifyAuthData.length -1)
     },
     // 鍒犻櫎琛�
     subClassifyAuth() {
@@ -289,6 +289,7 @@
         classifyAuthList: [],
         isCLear: false, //榛樿鏄竻绌�
         classifyId: this.TreeNode.oid,
+        authType: 'data_auth',
       };
       let isRepeat = false;
       if (this.classifyAuthData.length > 0) {
@@ -314,7 +315,7 @@
           let itemButtonList = [];
           //绛涢�夊嚭鎸夐挳鍕鹃�変负true鐨勫垪
           for (let key in item) {
-            if (item[key] === true) {
+            if (item[key] === true && key !== 'checkTheStatus') {
               itemButtonList.push(key);
             }
           }
@@ -369,7 +370,7 @@
     },
     loadAuthPage() {
       return new Promise((resolve, reject) => {
-        // console.log(this.classifyData);
+        this.isLoading = true;
         getButtonByParentCode({code: this.classifyData.attributes.id}).then(res => {
           // 璁板綍鎸夐挳鏁版嵁
           this.classifyAuthButton = res.data.data;
@@ -431,6 +432,7 @@
             })
           }
         });
+        this.isLoading = false;
       });
     },
   },

--
Gitblit v1.9.3