账号编辑、账号组编辑bug修复

src/components/loginpolicy/index.vue

@@ -138,7 +138,7 @@ export default {
               const datas = returnData.records;
               datas.forEach((element) => {
                 // element["checked"] = false;
-                if (this.checkedList.findIndex(element1 => element.TacId === element1.TacId) !== -1) {
+                if (this.checkedList.some(element1 => element.TacId === element1.TacId)) {
                   element['checked'] = true
                 } else {
                   element['checked'] = false

src/components/rolelist/index.vue

@@ -283,6 +283,9 @@ export default {
           });
           this.dataList = msgs;
           this.total = num;
+
+          this.$emit('roleListChange', msgs)
+
           this.loading = false;
         } else {
           this.$message.error(result.message);
@@ -316,6 +319,7 @@ export default {
           } else {
             this.dataList = msgs;
           }
+          this.$emit('roleListChange', msgs)
           // this.checkBoxs(this.dataList, "RoleId");
           this.loading = false;
         } else {

src/components/usergrouptree/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-02-09 15:47:09
- * @LastEditTime: 2022-02-21 11:08:39
+ * @LastEditTime: 2022-02-23 12:18:38
  * @LastEditors: your name
  * @Description: 用户组树
  * @FilePath: \Foshan4A4.0\src\components\usergrouptree\index.vue
@@ -69,6 +69,10 @@ export default {
         children: 'children',
         label: 'GroupName'
       })
+    },
+    checkDisabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -113,6 +117,11 @@ export default {
         PageSize: this.pageSize
       })
       const datas = result.returnData
+      if (this.checkDisabled) {
+        datas.forEach(data => {
+          data.disabled = true
+        })
+      }
       const tree = translateDataToTreeAll(datas, 'GroupUpid', 'GroupId')
       const obj = {
         AuthCount: 0,

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -52,6 +52,7 @@
             <AccountGroupTree
               title="上级账号组"
               nodekey="GroupId"
+              :check-disabled="doesGroupExist"
               :type="true"
               :defaultProps="defaultProps"
               :checkedKeys="accountGroupTreeCheckedList"
@@ -66,12 +67,13 @@
               <RoleList
                 title="角色列表"
                 :roleType="roleType"
-                :GroupIds="accountGroupTreeCheckedTemp"
+                :GroupIds="groupIds"
                 :checkBoxList="roleListCheckedList"
                 :number="8"
                 :active="true"
                 @checkChange="getRoleListChecked"
                 @checkClick="selectRole"
+                @roleListChange="roleListCheckedChange"
               />
             </div>
           </el-col>
@@ -95,7 +97,7 @@
                 title="权限树"
                 :checkedKeys="permissionTreeChckedKeys"
                 :queryType="queryType"
-                :queryIds="accountGroupTreeCheckedTemp"
+                :queryIds="queryIds"
                 @getTreeData="getPermissionTreeChecked"
               />
             </div>
@@ -169,6 +171,8 @@ export default {
       rulesOfCompetency: null, // 当前编辑的权限规则
       queryType: '',
       roleType: '',
+      groupIds: [],
+      queryIds: [],
       currentSelectedRoleId: 0,
       checkedRoles: [],
       editForm: {
@@ -193,7 +197,6 @@ export default {
     }
   },
   created() {
-    console.log(typeof this.GroupUpId)
     let obj
     if (typeof this.systemSet === 'string') {
       obj = JSON.parse(this.systemSet)
@@ -203,15 +206,17 @@ export default {
     // console.log(obj)
     const { OpenRole } = obj
     this.openRole = OpenRole
-    this.queryType = this.GroupUpId === -1 ? 'all' : 'group'
     this.accountGroupTreeCheckedTemp = [this.GroupUpId]
+    this.groupIds.push(this.GroupUpId)
+    this.queryIds.push(this.GroupUpId)
   },
   mounted() {
-    this.roleType = this.GroupUpId === -1 ? 'onlyRole' : 'roleByUpId'
-    this.accountGroupTreeCheckedList = [this.GroupUpId]
     if (this.doesGroupExist) {
       this.GroupId = this.$route.query.GroupId
       this.getGroupDetails()
+    } else {
+      this.roleType = 'onlyRole'
+      this.queryType = 'all'
     }
   },
   methods: {
@@ -231,7 +236,7 @@ export default {
           RoleList &&
             RoleList.length &&
             RoleList.forEach(role => {
-              role.IsSelected && (this.roleListCheckedList.push(role.RoleId), this.roleListCheckedTemp.push(role))
+              role.IsSelected && this.roleListCheckedTemp.push(role)
             })
 
           AuthList &&
@@ -240,6 +245,8 @@ export default {
               this.permissionTreeChckedKeys.push(auth.AuthId)
               this.permissionTreeChckedTemp.push(auth)
             })
+          this.roleType = this.GroupUpId === -1 ? 'onlyRole' : 'roleByUpId'
+          this.queryType = this.GroupUpId === -1 ? 'all' : 'group'
         } else {
           this.$message.error(res.message)
         }
@@ -266,20 +273,33 @@ export default {
     // 获取当前勾选的账号组
     getAccountGroupChecked(arr) {
       if (arr && arr.length && arr[0] !== -1) {
-        this.queryType = 'group'
+        const GroupIds = arr.map(item => item.GroupId)
+        this.accountGroupTreeCheckedTemp = GroupIds
         this.roleType = 'roleByUpId'
-        const GroupUpId = arr[0].GroupId
-        this.accountGroupTreeCheckedTemp = [GroupUpId]
+        this.groupIds = GroupIds
+        this.queryType = 'group'
+        this.queryIds = GroupIds
       } else {
-        this.queryType = 'all'
-        this.roleType = 'onlyRole'
         this.accountGroupTreeCheckedTemp = [-1]
+        this.roleType = 'onlyRole'
+        this.queryType = 'all'
       }
     },
     // 角色选取
     getRoleListChecked(arr) {
       this.roleListCheckedTemp = arr
     },
+    roleListCheckedChange(arr) {
+      console.log(arr)
+      if (arr && arr.length) {
+        this.roleListCheckedTemp = this.roleListCheckedTemp.filter(role =>
+          arr.some(data => data.RoleId === role.RoleId)
+        )
+      } else {
+        this.roleListCheckedTemp = []
+      }
+      this.roleListCheckedList = this.roleListCheckedTemp.map(role => role.RoleId)
+    },
     // 获取当前编辑的权限规则
     getRulesOfCompetency(obj) {
       this.rulesOfCompetency = obj

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-08 09:27:43
- * @LastEditTime: 2022-02-21 09:49:21
+ * @LastEditTime: 2022-02-23 11:57:32
  * @LastEditors: your name
  * @Description: 用户组管理
  * @FilePath: \Foshan4A2.0\src\views\accountGroupManagement\components\home.vue
@@ -97,11 +97,11 @@
                         <span>{{ data.OfficerCount }}</span>
                       </el-col> -->
                       <el-col :span="24" v-if="data.GroupId != -1">
-                        <span class="msg">账号项数：</span>
+                        <span class="msg">账号数：</span>
                         <span style="margin-right: 90px">{{
                           data.UserCount
                         }}</span>
-                        <span class="msg">权限：</span>
+                        <span class="msg">权限数：</span>
                         <span>{{ data.AuthCount }}</span>
                       </el-col>
                       <el-col :span="12" v-if="data.GroupId != -1">
@@ -204,12 +204,12 @@
                         </div>
                       </el-col>
                       <el-col :span="24" v-if="data.GroupId != -1">
-                        <span class="msg">权限：</span>
-                        <span style="margin-right: 120px">{{
-                          data.AuthCount
+                        <span class="msg">账号数：</span>
+                        <span style="margin-right: 90px">{{
+                          data.UserCount
                         }}</span>
-                        <span class="msg">账号：</span>
-                        <span>{{ data.UserCount }}</span>
+                        <span class="msg">权限数：</span>
+                        <span>{{ data.AuthCount }}</span>
                       </el-col>
                       <el-col :span="12" v-if="data.GroupId != -1">
                         <span class="msg">状态：</span>

src/views/accountManagement/components/accountEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-15 11:37:42
- * @LastEditTime: 2022-02-22 13:05:30
+ * @LastEditTime: 2022-02-23 19:24:51
  * @LastEditors: your name
  * @Description: 编辑账号
  * have a nice day!
@@ -148,12 +148,13 @@
             <RoleList
               title="角色列表"
               :role-type="roleType"
-              :group-ids="accountGroupTreeCheckedTemp"
+              :group-ids="groupIds"
               :check-box-list="roleListCheckedList"
               :number="8"
               :active="true"
               @checkChange="getRoleListChecked"
               @checkClick="selectRole"
+              @roleListChange="roleListCheckedChange"
             />
           </div>
         </el-col>
@@ -196,7 +197,7 @@
             <PermissionTree
               title="权限树"
               :query-type="queryType"
-              :query-ids="accountGroupTreeCheckedTemp"
+              :query-ids="queryIds"
               :checked-keys="permissionTreeChckedKeys"
               @getTreeData="getPermissionTreeChecked"
             />
@@ -317,9 +318,11 @@ export default {
       roleListCheckedList: [], // 角色列表初始勾选项
       roleListCheckedTemp: [], // 角色列表当前勾选项
       roleType: '',
+      queryType: '',
       checkedRoles: [],
       currentSelectedRoleId: 0,
-      queryType: '',
+      groupIds: [],
+      queryIds: [],
       // dialogVisible: false,
       formRules: {
         name: [
@@ -361,13 +364,15 @@ export default {
     this.pwdStruc = PwdStruc
     this.pwdLengthBegin = PwdLengthBegin
     this.pwdLengthEnd = PwdLengthEnd
-    this.openRole && (this.roleType = this.openGroup ? 'roleByUpId' : 'onlyRole')
-    this.queryType = this.openGroup ? 'group' : 'all'
+  },
+  mounted() {
     if (this.doesAccountExist) {
       this.userId = this.$route.query.userId
       this.getAccountInfo()
     } else {
       this.resetPwd()
+      this.roleType = 'onlyRole'
+      this.queryType = 'all'
     }
   },
   methods: {
@@ -397,12 +402,14 @@ export default {
             GroupList.forEach(group => {
               this.accountGroupTreeCheckedList.push(group.GroupId)
               this.accountGroupTreeCheckedTemp.push(group.GroupId)
+              this.groupIds.push(group.GroupId)
+              this.queryIds.push(group.GroupId)
             })
 
           RoleList &&
             RoleList.length &&
             RoleList.forEach(role => {
-              role.IsSelected && (this.roleListCheckedList.push(role.RoleId), this.roleListCheckedTemp.push(role))
+              role.IsSelected && this.roleListCheckedTemp.push(role)
             })
 
           TacList &&
@@ -411,7 +418,8 @@ export default {
               tac.IsSelected && this.loginPolicyCheckedList.push(tac)
               tac.IsSelected && this.loginPolicyCheckedTemp.push(tac)
             })
-          // console.log(this.loginPolicyCheckedTemp)
+          this.roleType = this.openGroup ? 'roleByUpId' : 'onlyRole'
+          this.queryType = this.openGroup ? 'group' : 'all'
         } else {
           this.$message.error(res.message)
         }
@@ -437,17 +445,33 @@ export default {
     },
     // 获取当前勾选的账号组
     getAccountGroupChecked(arr) {
-      if (arr && arr.length) {
+      if (arr && arr.length && arr[0] !== -1) {
         const GroupIds = arr.map(item => item.GroupId)
         this.accountGroupTreeCheckedTemp = GroupIds
+        this.roleType = 'roleByUpId'
+        this.groupIds = GroupIds
+        this.queryType = 'group'
+        this.queryIds = GroupIds
       } else {
         this.accountGroupTreeCheckedTemp = [-1]
+        this.roleType = 'onlyRole'
+        this.queryType = 'all'
       }
     },
     // 获取当前勾选的角色列表
     getRoleListChecked(arr) {
       this.roleListCheckedTemp = arr
     },
+    roleListCheckedChange(arr) {
+      if (arr && arr.length) {
+        this.roleListCheckedTemp = this.roleListCheckedTemp.filter(role =>
+          arr.some(data => data.RoleId === role.RoleId)
+        )
+      } else {
+        this.roleListCheckedTemp = []
+      }
+      this.roleListCheckedList = this.roleListCheckedTemp.map(role => role.RoleId)
+    },
     // 点击角色后显示对应权限列表
     async selectRole(data) {
       if (this.currentSelectedRoleId === data.RoleId) return

src/views/dashboard/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 17:17:53
- * @LastEditTime: 2022-02-23 14:49:51
+ * @LastEditTime: 2022-02-23 18:58:46
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\dashboard\index.vue
@@ -186,7 +186,7 @@ export default {
     isPower () {
       const obj = typeof (this.systemSet) === 'string' ? JSON.parse(this.systemSet) : this.systemSet
       const { OpenGroup, OpenRole, UserOfficerMulti } = obj
-      if (!OpenGroup || !UserOfficerMulti) {
+      if (!OpenGroup) {
         this.selectArr.forEach((item, index) => {
           if (item.id === 2) {
             this.selectArr.splice(index, 1)
@@ -201,6 +201,14 @@ export default {
           }
         })
       }
+      if (!UserOfficerMulti) {
+        this.selectArr.forEach((item, index) => {
+          if (item.id === 1) {
+            this.roleFlag = false
+            this.selectArr.splice(index, 1)
+          }
+        })
+      }
     },
     handleChange (val) {
       if (val !== 10) {