From 439562754fc9b86a8ebd6e98a1ba298ec404b36f Mon Sep 17 00:00:00 2001
From: anhc <3442943606@qq.com>
Date: Sat, 9 Jul 2022 19:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9dialog=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/role/RoleUpdate.vue             | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue b/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue
index 958a541..bd41ad4 100644
--- a/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue
+++ b/com.actionsoft.apps.coe.pal.cooperation/src/views/role/RoleUpdate.vue
@@ -40,6 +40,7 @@
                                   <div v-if="roleForm.isAllDataPerm"> 全部</div>
                                   <div v-else class="tree">
                                     <el-tree
+                                      v-loading="loading"
                                       ref="tree"
                                       :props="treeProps"
                                       :default-checked-keys="roleForm.dataPerm"
@@ -224,6 +225,12 @@
                         that.roleForm.appPerm = data.appPerm;
                         that.roleForm.actionPerm = data.actionPerm;
                         that.roleForm.dataPermText = data.dataPermText;
+                        //每次初始化重新加载el-tree
+                        that.$nextTick(()=>{
+                          let node = that.$refs.tree.root;
+                          node.loaded = false;
+                          node.expand();
+                        })
                     } else {
                         that.$message.error(ro.msg);
                     }
@@ -277,6 +284,13 @@
                     appPerm: [],
                     actionPerm: [],
                 };
+                if (!that.isOlderVersion){
+                  that.$refs.tree.setCheckedNodes([]);
+                  that.$refs.tree.$children = [];
+                  that.treeChecked = [];
+                  that.dataActionPerm =  [];
+                  that.dataActionPermOpts = [];
+                }
 
             },
             handleClose(done) {
@@ -342,9 +356,6 @@
                             data: JSON.stringify(data)
                         }
                     };
-
-                    // console.log("submit:",data)
-                    // console.log("data:",that.roleForm.dataPerm)
                     awsuiAxios.post(params).then(function (ro) {
                         that.loading = false;
                         if (ro.result == 'ok') {
@@ -353,7 +364,6 @@
                                 type: 'success'
                             });
                             that.$emit('getResult', 'ok');
-                            that.dialogVisible = false;
                             // 清空所有数据
                             that.clearAllData();
                         } else {
@@ -370,7 +380,6 @@
                     })
                 } else {
                     that.$emit('cancel');
-                    that.dialogVisible = false;
                     // 清空所有数据
                     that.clearAllData();
                 }
@@ -469,11 +478,7 @@
                 let data = ro.data;
                 for (let i = 0; i < data.length; i++) {
                   let item = data[i];
-                  // console.log("@@",that.dataActionPerm)
-                  // console.log("@@",item.versionId)
-                  // console.log("@@",that.dataActionPerm[item.versionId])
                   if (that.dataActionPerm[item.versionId] != undefined){
-                    // console.log("join")
                     Object.assign(item,{dataActionPerm:that.dataActionPerm[item.versionId]})
                   }else {
                     Object.assign(item,{dataActionPerm:[]})