权限项修改

src/components/rolelist/index.vue

@@ -105,6 +105,7 @@ export default {
       pageNum: 1,
       total: "",
       loading: false,
+      asyncData: []
     };
   },
   watch: {
@@ -130,36 +131,44 @@ export default {
     },
     dataList: {
       handler (arr) {
-        if (this.roleType == "account") {
-          this.checkBoxs(arr, this.checkBoxList, "UserId");
-        }
-        if (this.roleType == "role") {
-          this.checkRole(arr);
-        }
-        if (this.roleType == "onlyRole") {
-          this.checkRole(arr);
+        if (arr && arr.length) {
+          this.asyncData.push(true);
         }
       },
       deep: true,
     },
     checkBoxList: {
       handler (arr) {
-        if (this.roleType == "roleByUpId") {
-          const datas = [];
-          this.dataList.forEach((item, index) => {
-            arr.forEach((p) => {
-              if (item.RoleId == p.RoleId) {
-                datas.push(index);
-              }
-            });
-          });
-          this.checkList = datas;
+        if (arr && arr.length) {
+          this.asyncData.push(true);
         }
-        // console.log(this.dataList)
-        // this.checkBoxs(this.dataList, arr, "RoleId");
+        // if (this.roleType == "roleByUpId") {
+        //   const datas = [];
+        //   this.dataList.forEach((item, index) => {
+        //     arr.forEach((p) => {
+        //       if (item.RoleId == p.RoleId) {
+        //         datas.push(index);
+        //       }
+        //     });
+        //   });
+        //   this.checkList = datas;
+        // }
       },
       deep: true,
     },
+    asyncData: {
+      handler (arr) {
+        if (arr && arr.length == 2) {
+          if (this.roleType == "account") {
+            this.checkBoxs("UserId");
+          }
+          if (this.roleType == "onlyRole" || this.roleType == 'roleByUpId') {
+            this.checkBoxs("RoleId");
+          }
+        }
+      },
+      deep: true
+    },
     GroupIds: {
       handler () {
         this.getRoleDataByUpId();
@@ -210,20 +219,31 @@ export default {
       return datas;
     },
     //多选框默认选中
-    checkBoxs (arr, msgs, ids) {
+    checkBoxs (ids) {
       const datas = [];
-      arr.forEach((item, index) => {
-        msgs.forEach((p) => {
-          if (item[ids] == p) {
-            datas.push(index);
-          }
+      const type = typeof this.checkBoxList[0];
+      if (type == 'object') {
+        this.dataList.forEach((item, index) => {
+          this.checkBoxList.forEach((p) => {
+            if (item[ids] == p[ids]) {
+              datas.push(index);
+            }
+          });
         });
-      });
+      } else {
+        this.dataList.forEach((item, index) => {
+          this.checkBoxList.forEach((p) => {
+            if (item[ids] == p) {
+              datas.push(index);
+            }
+          });
+        });
+      }
       this.checkList = datas;
     },
-    checkRole (arr) {
+    checkRole () {
       const datas = [];
-      arr.forEach((item, index) => {
+      this.dataList.forEach((item, index) => {
         this.checkBoxList.forEach((p) => {
           if (item.RoleId == p.RoleId) {
             datas.push(index);

src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-01-12 16:20:49
+ * @LastEditTime: 2022-02-15 14:56:26
  * @LastEditors: Please set LastEditors
  * @Description:权限项
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -11,83 +11,53 @@
     <!--新增权限项-->
     <div class="addApp-form">
       <div class="addApp-form-title flex">
-        <div class="title">新增权限项</div>
+        <div class="title">
+          编辑权限项
+          <!-- <span class="isqy">
+            <span>是否启用</span>
+            <el-radio v-model="radio" :label="1">是</el-radio>
+            <el-radio v-model="radio" :label="0">否</el-radio>
+          </span> -->
+        </div>
         <div class="btn">
+          <!-- <el-button @click="deleteAuth" class="r24" type="danger">删除</el-button> -->
           <el-button @click="saveBtn('form')" type="primary">保存</el-button>
         </div>
       </div>
       <div class="addApp-form-content dialog-public-background">
-        <el-form
-          :inline="true"
-          ref="form"
-          :rules="rules"
-          class="form"
-          :model="form"
-        >
+        <el-form :inline="true" ref="form" :rules="rules" class="form" :model="form">
           <el-form-item prop="name" label="权限项名称">
-            <el-input
-              placeholder="请输入权限项名称"
-              maxlength="32"
-              v-model="form.name"
-            ></el-input>
+            <el-input placeholder="请输入权限项名称" maxlength="32" v-model="form.name"></el-input>
           </el-form-item>
           <el-form-item prop="id" label="标识符">
-            <el-input
-              placeholder="请输入标识符"
-              maxlength="32"
-              v-model="form.id"
-            ></el-input>
+            <el-input placeholder="请输入标识符" maxlength="32" v-model="form.id"></el-input>
           </el-form-item>
           <el-form-item label="描述">
-            <el-input
-              style="width: 640px"
-              maxlength="200"
-              placeholder="请输入描述"
-              v-model="form.app"
-            ></el-input>
+            <el-input style="width: 640px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
           </el-form-item>
         </el-form>
       </div>
     </div>
     <div class="power-content flex-wrap">
-      <div
-        :class="!openRole && !UserOfficerMulti ? '' : 'r24'"
-        class="flex1 part"
-      >
-        <Organization
-          :defaultProps="defaultProps"
-          :data="data"
-          nodekey="AuthId"
-          @getTreeData="getTreeData"
-          title="上级权限项"
-        />
+      <div :class="!openRole && !OpenGroup ? '' : 'r24'" class="flex1 part">
+        <Organization :defaultProps="defaultProps" :checkedKeys="checkedKeys" @getTreeData="getTreeData" :orgType="orgType" :data="data" nodekey="AuthId" title="上级权限项" />
       </div>
       <!--有角色-->
       <template v-if="openRole">
         <div class="r24 flex1 part">
-          <Rulesofcompetency @getData="getData" title="权限规则" />
+          <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />
         </div>
         <div class="flex1 part">
-          <Rolelist
-            @checkChange="checkChange"
-            :dataList="roleList"
-            :number="8"
-            title="角色"
-          />
+          <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="角色" />
         </div>
       </template>
-      <!--有多对多-->
-      <template v-else-if="UserOfficerMulti">
+      <!--有账号组-->
+      <template v-else-if="OpenGroup">
         <div class="r24 flex1 part">
-          <Rulesofcompetency @getData="getData" title="权限规则" />
+          <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />
         </div>
         <div class="flex1 part">
-          <Rolelist
-            @checkChange="checkChange"
-            :dataList="roleList"
-            :number="8"
-            title="账号授权"
-          />
+          <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="账号授权" />
         </div>
       </template>
     </div>
@@ -98,24 +68,28 @@
 import Rolelist from "@/components/rolelist";
 import Rulesofcompetency from "@/components/rulesofcompetency";
 import Organization from "@/components/organization";
-import { SaveAuth, QueryRole, GetUserList } from "@/api/apiAuthority";
+import {
+  GetAuthDetails,
+  QueryRole,
+  GetUserList,
+  SaveAuth,
+  DeleteAuth,
+} from "@/api/apiAuthority";
 import treeData from "../minixs/treeData";
 import { mapGetters } from "vuex";
 export default {
   name: "AuthorityPower",
-  mixins: [treeData],
   components: { Rolelist, Rulesofcompetency, Organization },
-  data() {
+  mixins: [treeData],
+  data () {
     return {
-      Status: null,
-      AppId: null,
+      radio: 1,
       form: {
         //应用表单
         name: "",
         id: "",
         app: "",
       },
-      title: "角色",
       rules: {
         //表单验证
         name: [
@@ -127,14 +101,21 @@ export default {
         children: "children",
         label: "AuthName",
       },
+      AppId: null, //参数类型
+      UpAuthId: null,
+      data: [],
       openRole: null,
-      UserOfficerMulti: null,
-      dataObj: {}, //上级权限指定树数据
-      data: [], //上级权限
-      roleList: [], //角色
-      checkRoles: [], //选中的角色
-      checkTrees: [], //上级权限选中树数据
-      rulesObj: {}, //权限规则数据
+      OpenGroup: null,
+      roleList: [],
+      title: "角色",
+      editRoles: [],
+      checkBoxList: [],
+      authTo: {},
+      rulesObj: {},
+      msgDatas: [],
+      roleType: '',
+      orgType: '',
+      checkedKeys: []
     };
   },
   computed: {
@@ -142,42 +123,39 @@ export default {
   },
   watch: {
     dataList: {
-      handler(val) {
-        const arr = val.children;
+      handler (val) {
+        const arr = [val];
         this.decompose(arr, this.AppId);
-        if (Array.isArray(this.dataObj)) {
-          this.data = this.dataObj;
-        } else {
-          this.data = [this.dataObj];
-        }
+        this.data = [this.dataObj];
+        this.checkedKeys = [this.AppId];
       },
       deep: true,
     },
   },
-  created() {
-    this.getAuthTree();
-    const { AuthId, Status } = this.$route.query;
-    const { OpenRole, UserOfficerMulti } =
+  created () {
+    const { AuthId, Status, UpAuthId } = this.$route.query;
+    const { OpenRole, OpenGroup } =
       typeof this.systemSet === "string"
         ? JSON.parse(this.systemSet)
         : this.systemSet; //1是请求角色 0是请求用户
-    this.Status = Status;
+    this.radio = Status;
     this.AppId = AuthId;
+    this.UpAuthId = UpAuthId;
     this.openRole = OpenRole;
-    this.UserOfficerMulti = UserOfficerMulti;
-    if (OpenRole) {
-      this.queryRole();
-    } else {
-      this.getUserList();
+    this.OpenGroup = OpenGroup;
+    this.getAuthTree();
+  },
+  mounted () {
+    if (this.openRole) {
+      this.roleType = 'onlyRole';
+    } else if (this.OpenGroup) {
+      this.roleType = 'account';
     }
+    this.orgType = 'auth';
   },
   methods: {
-    //获取选中的树数据
-    getTreeData(arr) {
-      this.checkTrees = arr;
-    },
     //获取指定数据
-    decompose(data, id) {
+    decompose (data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].AuthId == id) {
           this.dataObj = data[i];
@@ -187,8 +165,84 @@ export default {
         }
       }
     },
+    //保存
+    saveBtn (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.editAuth();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    //获取权限树回调
+    getTreeData (arr) {
+      const { AuthId, UpAuthId } = arr[0];
+      this.AppId = AuthId;
+      this.UpAuthId = UpAuthId;
+    },
+    //获取权限规则
+    getData (obj) {
+      this.rulesObj = obj;
+    },
+    //获取应用详情
+    async getAuthDetails (id) {
+      try {
+        const res = await GetAuthDetails({
+          AuthId: id,
+        });
+        if (res.code === 0) {
+          const {
+            AuthDesc,
+            AuthName,
+            AuthIdent,
+            RoleInfo,
+            AuthTo,
+            UserInfo,
+            AuthStatus,
+          } = res.returnData;
+          this.form.name = AuthName;
+          this.form.id = AuthIdent;
+          this.form.app = AuthDesc;
+          this.radio = AuthStatus;
+          if (AuthTo) {
+            this.authTo = AuthTo;
+            this.$store.dispatch("auth/changeAuthId", AuthTo.AuthId);
+            this.$store.dispatch("auth/changeAuthArrs", [AuthTo]);
+          }
+          if (this.openRole) {
+            if (RoleInfo && RoleInfo.length) {
+              RoleInfo.forEach((item) => {
+                if (item.IsSelected) {
+                  this.msgDatas.push(item);
+                }
+              });
+              this.checkBoxList = this.msgDatas;
+            } else {
+              this.msgDatas = [];
+            }
+          } else if (this.OpenGroup) {
+            if (UserInfo && UserInfo.length) {
+              UserInfo.forEach((item) => {
+                if (item.IsSelected) {
+                  this.msgDatas.push(item);
+                }
+              });
+              this.checkBoxList = this.msgDatas;
+            } else {
+              this.msgDatas = [];
+            }
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      } catch (error) {
+        console.log("出错了", error);
+      }
+    },
     //角色列表
-    async queryRole() {
+    async queryRole () {
       try {
         const res = await QueryRole({
           QueryName: "",
@@ -207,7 +261,7 @@ export default {
       }
     },
     //账号列表
-    async getUserList() {
+    async getUserList () {
       try {
         const res = await GetUserList({
           QueryName: "",
@@ -226,39 +280,27 @@ export default {
       }
     },
     //角色选取
-    checkChange(arr) {
-      const datas = [];
-      for (let i = 0; i < arr.length; i++) {
-        datas.push(this.roleList[arr[i]]);
-      }
-      this.checkRoles = datas;
-    },
-    //获取权限规则
-    getData(obj) {
-      this.rulesObj = obj;
-    },
-    //保存
-    saveBtn(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.saveAuth();
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
+    checkChange (arr) {
+      this.msgDatas = arr;
     },
     //权限新增保存
-    async saveAuth() {
+    async editAuth () {
       try {
+        const datas = this.msgDatas;
+        if (datas && datas.length) {
+          datas.forEach((item) => {
+            item.IsSelected = 1;
+          });
+        }
         const res = await SaveAuth({
           AuthName: this.form.name,
           AuthIdent: this.form.id,
           AuthDesc: this.form.app,
           UpAuthId: this.AppId,
-          RoleInfo: this.openRole ? this.checkRoles : [],
-          UserInfo: this.openRole ? [] : this.checkRoles,
+          RoleInfo: this.openRole ? datas : [],
+          UserInfo: this.openRole ? [] : datas,
           AuthTo: this.rulesObj,
+          AuthStatus: this.radio,
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -271,6 +313,24 @@ export default {
         console.log("出错了", error);
       }
     },
+    //删除权限
+    async deleteAuth () {
+      try {
+        const res = await DeleteAuth({
+          AuthId: this.AppId,
+        });
+        if (res.code === 0) {
+          this.$message.success(res.message);
+          setTimeout(() => {
+            this.$router.push("/authority");
+          }, 2000);
+        } else {
+          this.$message.error(res.message);
+        }
+      } catch (error) {
+        console.log("出错了", error);
+      }
+    },
   },
 };
 </script>
@@ -278,7 +338,7 @@ export default {
 <style lang="scss" scoped>
 .authorityPower {
   padding: 0 64px;
-  padding-top: 30px;
+  padding-top: 32px;
 }
 .addApp-form {
   background: #ffffff;

src/views/authorityManagement/components/authorityPowerEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-02-15 10:51:06
+ * @LastEditTime: 2022-02-15 14:46:37
  * @LastEditors: Please set LastEditors
  * @Description:权限项
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -45,19 +45,19 @@
       <!--有角色-->
       <template v-if="openRole">
         <div class="r24 flex1 part">
-          <Rulesofcompetency @getData="getData" title="权限规则" />
+          <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />
         </div>
         <div class="flex1 part">
-          <Rolelist @checkChange="checkChange" :roleType="roleType" :number="8" title="角色" />
+          <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="角色" />
         </div>
       </template>
       <!--有账号组-->
       <template v-else-if="OpenGroup">
         <div class="r24 flex1 part">
-          <Rulesofcompetency @getData="getData" title="权限规则" />
+          <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />
         </div>
         <div class="flex1 part">
-          <Rolelist @checkChange="checkChange" :roleType="roleType" :number="8" title="账号授权" />
+          <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="账号授权" />
         </div>
       </template>
     </div>
@@ -132,7 +132,6 @@ export default {
     },
   },
   created () {
-    this.getAuthTree();
     const { AuthId, Status, UpAuthId } = this.$route.query;
     const { OpenRole, OpenGroup } =
       typeof this.systemSet === "string"
@@ -143,6 +142,7 @@ export default {
     this.UpAuthId = UpAuthId;
     this.openRole = OpenRole;
     this.OpenGroup = OpenGroup;
+    this.getAuthTree();
     this.getAuthDetails(AuthId);
   },
   mounted () {
@@ -218,16 +218,18 @@ export default {
                   this.msgDatas.push(item);
                 }
               });
+              this.checkBoxList = this.msgDatas;
             } else {
               this.msgDatas = [];
             }
-          } else {
+          } else if (this.OpenGroup) {
             if (UserInfo && UserInfo.length) {
               UserInfo.forEach((item) => {
                 if (item.IsSelected) {
                   this.msgDatas.push(item);
                 }
               });
+              this.checkBoxList = this.msgDatas;
             } else {
               this.msgDatas = [];
             }
@@ -279,16 +281,11 @@ export default {
     },
     //角色选取
     checkChange (arr) {
-      const datas = [];
-      for (let i = 0; i < arr.length; i++) {
-        datas.push(this.roleList[arr[i]]);
-      }
-      this.msgDatas = datas;
+      this.msgDatas = arr;
     },
     //权限新增保存
     async editAuth () {
       try {
-        const arr = this.$store.getters.authArrs;
         const datas = this.msgDatas;
         if (datas && datas.length) {
           datas.forEach((item) => {
@@ -303,7 +300,7 @@ export default {
           AuthId: this.AppId,
           RoleInfo: this.openRole ? datas : [],
           UserInfo: this.openRole ? [] : datas,
-          AuthTo: arr.length ? arr[0].AuthList : {},
+          AuthTo: this.rulesObj,
           AuthStatus: this.radio,
         });
         if (res.code === 0) {