From c4a52b3bd231c687b6c2e84f01304aa436e48833 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 9 Nov 2023 09:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/group/user/index.vue | 28 ++++++---------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/views/system/group/user/index.vue b/src/views/system/group/user/index.vue
index f70fd06..db9fd7b 100644
--- a/src/views/system/group/user/index.vue
+++ b/src/views/system/group/user/index.vue
@@ -100,7 +100,7 @@
         </div>
       </el-main>
     </el-container>
-    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
+    <el-dialog v-loading="editloading" :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
       <el-form ref="form" :rules="rules" :model="pd" label-width="110px" style="width: 500px;">
         <el-form-item label="角色" prop="ROLE_ID">
           <el-select v-model="pd.ROLE_ID" multiple placeholder="请选择角色">
@@ -246,6 +246,7 @@ export default {
       keyDepeName: '',
       keyJobLeven: '',
       dialogFormEdit: false,
+      editloading: false,
       dialogType: 'add',
       rules: {
         EMAIL: [
@@ -357,6 +358,7 @@ export default {
               }))
               resolve(nodes) // 通过调用resolve将子节点数据返回，通知组件数据加载完成
             }).catch((e) => {
+              this.editloading = false
               this.listLoading = false
             })
           }, 500)
@@ -588,8 +590,6 @@ export default {
       console.log(row)
       this.dialogType = 'editUser'
       this.pd = JSON.parse(JSON.stringify(row))
-      this.dialogFormEdit = true
-      await this.$nextTick()
       const areaRefID = []
       if (this.pd.PROVINCE) {
         areaRefID.push(this.pd.PROVINCE)
@@ -609,14 +609,6 @@ export default {
       refDeptLevelVal.id = this.pd.deptLevenlID
       const deptRefsValue = {}
       deptRefsValue.id = this.pd.DEPARTMENT_ID
-      // this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
-      //   if (this.$refs.refFromDeptTypeID) {
-      //     this.$refs.refFromDeptTypeID.handleNodeClick(refDeptLevelVal)
-      //   }
-      //   if (this.$refs.deptTree) {
-      //     this.$refs.deptTree.handleNodeClick(deptRefsValue)
-      //   }
-      // }
       var arrString = []
       if (this.pd.ROLE_ID != null && this.pd.ROLE_ID != '') {
         arrString.push(this.pd.ROLE_ID)
@@ -631,17 +623,9 @@ export default {
         }
       }
       this.pd.ROLE_ID = arrString
-      // var roleIds = []
-      // if (this.pd.ROLE_ID) {
-      //   roleIds.push(this.pd.ROLE_ID)
-      //   if (this.pd.ROLE_IDS) {
-      //     var roleIDS = this.pd.ROLE_IDS.split(',')
-      //     roleIDS.forEach((item) => {
-      //       roleIds.push(item)
-      //     })
-      //   }
-      // }
-      // this.pd.ROLE_ID = roleIds
+      this.dialogFormEdit = true
+      await this.$nextTick()
+
     },
     handleEditStatus(row, type) {
       const typeName = type == '1' ? '禁用' : '启用'