修改账号编辑/账号组编辑

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -80,7 +80,7 @@
               <PermissionList
                 title="权限列表"
                 class="hucPower"
-                :RoleList="selectedRoles"
+                :RoleList="checkedRoles"
                 :check="true"
                 @Competen="Competen"
               />
@@ -105,8 +105,6 @@
               <RulesOfCompetency
                 title="权限规则"
                 margin-b="20px"
-                :auth-list="authList"
-                :auth-to="authTo"
                 @getData="getRulesOfCompetency"
               />
             </div>
@@ -162,8 +160,6 @@ export default {
       GroupUpId: this.$route.query.GroupUpId,
       // dialogVisible: false,
       openRole: 0,
-      authTo: {},
-      authList: [],
       accountGroupTreeCheckedList: [], // 账号组树初始勾选项
       accountGroupTreeCheckedTemp: [], // 账号组树当前勾选项
       roleListCheckedList: [], // 角色列表初始勾选项
@@ -174,7 +170,7 @@ export default {
       queryType: '',
       roleType: '',
       currentSelectedRoleId: 0,
-      selectedRoles: [],
+      checkedRoles: [],
       editForm: {
         name: '',
         desc: '',
@@ -191,7 +187,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['systemSet', 'authArrs']),
+    ...mapGetters(['systemSet']),
     pageTitle() {
       return this.doesGroupExist ? '编辑账号组' : '新增账号组'
     }
@@ -229,21 +225,20 @@ export default {
           this.editForm.name = GroupName
           this.editForm.desc = GroupDesc
           this.editForm.isUsed = Status
-          this.$store.dispatch('auth/changeAuthList', AuthList)
+          // this.$store.dispatch('auth/changeAuthList', AuthList)
 
           RoleList &&
             RoleList.length &&
             RoleList.forEach(role => {
-              role.IsSelected && this.roleListCheckedList.push(role.RoleId)
+              role.IsSelected && (this.roleListCheckedList.push(role.RoleId), this.roleListCheckedTemp.push(role))
             })
-          this.roleListCheckedTemp = RoleList
+
           AuthList &&
             AuthList.length &&
-            (AuthList.forEach(auth => {
+            AuthList.forEach(auth => {
               this.permissionTreeChckedKeys.push(auth.AuthId)
-            }),
-            (this.authTo = AuthList[0]),
-            (this.authList = this._.cloneDeep(AuthList)))
+              this.permissionTreeChckedTemp.push(auth)
+            })
         } else {
           this.$message.error(res.message)
         }
@@ -294,7 +289,7 @@ export default {
         }
         const res = await RoleAuths(params)
         if (res.code === 0) {
-          this.selectedRoles = res.returnData
+          this.checkedRoles = res.returnData
           this.currentSelectedRoleId = data.RoleId
         } else {
           this.$message.error(res.message)
@@ -330,9 +325,14 @@ export default {
     },
     // 账号组编辑保存
     async handleSaveEdit() {
-      const AuthList = this.permissionTreeChckedTemp.map(auth => auth.AuthList)
+      const AuthList = this.permissionTreeChckedTemp.map(auth => {
+        return {
+          ...auth.AuthList,
+          AuthName: auth.AuthName
+        }
+      })
       const params = {
-        AuthList,
+        AuthList: AuthList,
         GroupName: this.editForm.name,
         GroupDesc: this.editForm.desc,
         GroupUpid: this.accountGroupTreeCheckedTemp[0],

src/views/accountManagement/components/accountEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-15 11:37:42
- * @LastEditTime: 2022-02-21 15:13:47
+ * @LastEditTime: 2022-02-21 17:26:19
  * @LastEditors: your name
  * @Description: 编辑账号
  * have a nice day!
@@ -114,8 +114,6 @@
             <RulesOfCompetency
               title="权限规则"
               margin-b="20px"
-              :auth-list="authList"
-              :auth-to="authTo"
               @getData="getRulesOfCompetency"
             />
           </div>
@@ -164,7 +162,7 @@
             <PermissionList
               title="权限列表"
               class="permission-list"
-              :role-list="selectedRoles"
+              :role-list="checkedRoles"
               :check="true"
               @Competen="Competen"
             />
@@ -209,8 +207,6 @@
             <RulesOfCompetency
               title="权限规则"
               margin-b="20px"
-              :auth-list="authList"
-              :auth-to="authTo"
               @getData="getRulesOfCompetency"
             />
           </div>
@@ -244,7 +240,7 @@
           <div class="content-card content-card-lg">
             <PermissionList
               title="权限列表"
-              :role-list="selectedRoles"
+              :role-list="checkedRoles"
               :check="true"
               class="permission-list"
               @Competen="Competen"
@@ -311,8 +307,6 @@ export default {
       pwdStruc: '',
       pwdLengthBegin: 0,
       pwdLengthEnd: 0,
-      authTo: {},
-      authList: [],
       permissionTreeChckedKeys: [], // 权限树初始勾选项
       permissionTreeChckedTemp: [], // 权限树当前勾选项
       rulesOfCompetency: null, // 当前编辑的权限规则
@@ -323,7 +317,7 @@ export default {
       roleListCheckedList: [], // 角色列表初始勾选项
       roleListCheckedTemp: [], // 角色列表当前勾选项
       roleType: '',
-      selectedRoles: [],
+      checkedRoles: [],
       currentSelectedRoleId: 0,
       queryType: '',
       // dialogVisible: false,
@@ -347,7 +341,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['systemSet', 'authArrs']),
+    ...mapGetters(['systemSet']),
     pageTitle() {
       return this.doesAccountExist ? '编辑账号' : '新增账号'
     }
@@ -389,28 +383,27 @@ export default {
           this.accountForm.name = UserName
           this.accountForm.desc = UserDesc
           this.accountForm.status = Status
-          this.$store.dispatch('auth/changeAuthList', AuthList)
 
           AuthList &&
             AuthList.length &&
-            (AuthList.forEach(auth => {
+            AuthList.forEach(auth => {
               this.permissionTreeChckedKeys.push(auth.AuthId)
-            }),
-            (this.authTo = AuthList[0]),
-            (this.authList = this._.cloneDeep(AuthList)))
-          this.permissionTreeChckedTemp = this.permissionTreeChckedKeys
+              this.permissionTreeChckedTemp.push(auth)
+            })
+
           GroupList &&
             GroupList.length &&
             GroupList.forEach(group => {
               this.accountGroupTreeCheckedList.push(group.GroupId)
             })
           this.accountGroupTreeCheckedTemp = this.accountGroupTreeCheckedList
+
           RoleList &&
             RoleList.length &&
             RoleList.forEach(role => {
-              role.IsSelected && this.roleListCheckedList.push(role.RoleId)
+              role.IsSelected && (this.roleListCheckedList.push(role.RoleId), this.roleListCheckedTemp.push(role))
             })
-          this.roleListCheckedTemp = RoleList
+
           TacList &&
             TacList &&
             TacList.forEach(tac => {
@@ -464,7 +457,7 @@ export default {
         }
         const result = await RoleAuths(params)
         if (result.code === 0) {
-          this.selectedRoles = result.returnData
+          this.checkedRoles = result.returnData
           this.currentSelectedRoleId = data.RoleId
         } else {
           this.$message.error(result.message)
@@ -489,9 +482,15 @@ export default {
       })
     },
     handleSaveEdit() {
-      const AuthList = this.permissionTreeChckedTemp.map(auth => auth.AuthList)
+      // console.log(this.permissionTreeChckedTemp)
+      const AuthList = this.permissionTreeChckedTemp.map(auth => {
+        return {
+          ...auth.AuthList,
+          AuthName: auth.AuthName
+        }
+      })
       const params = {
-        AuthList,
+        AuthList: AuthList,
         GroupList: this.accountGroupTreeCheckedTemp.map(groupId => ({ GroupId: groupId })),
         RoleList: this.roleListCheckedTemp,
         TacList: this.loginPolicyCheckedTemp,