职员修改

src/views/staffManagement/compontents/staffEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-02-11 14:03:16
+ * @LastEditTime: 2022-02-11 14:56:36
  * @LastEditors: Please set LastEditors
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
@@ -280,6 +280,7 @@ export default {
           this.JobId = JobId;
           this.lessChecksData = DepJobList;
           this.isMainJob = false;
+          this.AppId = OrganId;
           this.getJobListByOrgan(OrganId);
           if (this.OpenAuthData) {
             this.roleType = 'account';
@@ -476,17 +477,8 @@ export default {
     },
     //角色选取
     checkChange (arr) {
-      const datas = [];
-      for (let i = 0; i < arr.length; i++) {
-        if (this.openRole) {
-          datas.push(this.arrs[arr[i]]);
-        }
-        else {
-          datas.push(this.authArrs[arr[i]]);
-        }
-      }
-      this.checkRoles = datas;
-      this.onCheckedArr = datas;
+      this.checkRoles = arr;
+      this.onCheckedArr = arr;
     },
     //获取权限规则
     getData (obj) {
@@ -520,32 +512,38 @@ export default {
         }
         const datas = [];
         const checks = [];
+        const GroupIds = [];
         this.checkTrees.forEach((item) => {
           datas.push(item.AuthList);
         });
+        this.GroupIds.forEach(item => {
+          const obj = {
+            GroupId: item
+          }
+          GroupIds.push(obj);
+        });
+        this.checkRoles.forEach(item => {
+          item.IsSelected = 1;
+          checks.push(item);
+        });
         if (this.OpenGroup && !this.openRole) {
           this.checkRoles = this.onCheckedArr;
         }
-        this.checkRoles.forEach(item => {
-          if (item) {
-            checks.push(item);
-          }
-        });
         const res = await newstaffmod({
           OfficerName: this.form.name,
           OfficerDesc: this.form.app,
           OfficerLoginName: this.form.loginName,
           OfficerPwd: this.form.loginPwd,
-          RoleList: this.openRole ? checks : [],
+          RoleList: this.openRole || (this.openRole && this.OpenGroup) ? checks : [],
           AuthList: this.openRole ? [] : datas,
           TacList: this.loginCheckBoxs,
           DepJobList: this.lessChecksData,
-          GroupList: this.OpenGroup ? checks : [],
+          GroupList: this.OpenGroup || (this.openRole && this.OpenGroup) ? GroupIds : [],
           JobId: this.JobId,
           Status: Number(this.Status),
           OrganId: this.AppId,
           OfficerId: this.OfficerId,
-          UserList: this.checkBoxList
+          UserList: this.OpenAuthData ? this.checkBoxList : []
         });
         if (res.code === 0) {
           this.$message.success(res.message);