Browse Source

修改权限树选中状态

zhaoke 3 years ago
parent
commit
3ae6237a0c

+ 20 - 4
src/components/permissiontree/index.vue

@@ -130,8 +130,12 @@ export default {
     },
     "$store.state.auth.authList": {
       handler (val) {
-        this.AuthList = val;
-        this.resetData();
+        if (val && val.length) {
+          this.AuthList = val;
+          this.resetData();
+        } else {
+          this.getAuthList();
+        }
       },
       immediate: true,
       deep: true,
@@ -166,17 +170,29 @@ export default {
       deep: true,
     },
     queryIds: {
-      handler() {
+      handler () {
         this.getDefaultDataList()
       },
       deep: true
     }
   },
-  created: function () {
+  created () {
     this.getDataList();
     this.searchId = this.queryId;
   },
   methods: {
+    getAuthList () {
+      let arr = [];
+      setTimeout(() => {
+        arr = this.$store.getters.authList;
+        if (arr && arr.length) {
+          this.AuthList = arr;
+          this.resetData();
+        } else {
+          this.getAuthList();
+        }
+      }, 100);
+    },
     //获取权限列表
     getDataList () {
       GetAuthTree({ QueryName: "" }).then((result) => {

+ 36 - 3
src/views/organizationManagement/components/organizationAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-02-16 11:18:09
+ * @LastEditTime: 2022-02-22 10:04:48
  * @LastEditors: Please set LastEditors
  * @Description:新增组织
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -28,13 +28,30 @@
             </el-select>
           </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: 835px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
           </el-form-item>
+          <div class="top24">
+            <el-form-item label="1级编码">
+              <el-input placeholder="请输入1级编码" maxlength="8" v-model="form.oneCode"></el-input>
+            </el-form-item>
+            <el-form-item class="twoCode" label="2级编码">
+              <el-input placeholder="请输入2级编码" style="width: 202px" maxlength="8" v-model="form.twoCode"></el-input>
+            </el-form-item>
+            <el-form-item label="3级编码">
+              <el-input placeholder="请输入3级编码" maxlength="8" v-model="form.threeCode"></el-input>
+            </el-form-item>
+            <el-form-item label="4级编码">
+              <el-input placeholder="请输入4级编码" maxlength="8" v-model="form.fourCode"></el-input>
+            </el-form-item>
+            <el-form-item label="5级编码">
+              <el-input placeholder="请输入5级编码" maxlength="8" v-model="form.fiveCode"></el-input>
+            </el-form-item>
+          </div>
         </el-form>
       </div>
     </div>
     <div class="power-content flex-wrap">
-      <div class="r24 flex1 part">
+      <div class="flex1 part">
         <Organization :defaultProps="defaultProps" :data="data" nodekey="OrganId" :checkedKeys="checkedKeys" title="上级组织" />
       </div>
     </div>
@@ -71,6 +88,11 @@ export default {
         name: "",
         id: "",
         app: "",
+        oneCode: "",
+        twoCode: "",
+        threeCode: "",
+        fourCode: "",
+        fiveCode: ""
       },
       title: "角色",
       rules: {
@@ -213,6 +235,11 @@ export default {
           RoleList: this.openRole ? this.checkRoles : [],
           AuthList: this.openRole ? [] : datas,
           GroupList: this.OpenGroup ? this.checkRoles : [],
+          L1: this.form.oneCode,
+          L2: this.form.twoCode,
+          L3: this.form.threeCode,
+          L4: this.form.fourCode,
+          L5: this.form.fiveCode
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -272,6 +299,12 @@ export default {
           margin-left: 27px;
         }
       }
+      .top24 {
+        margin-top: 24px;
+        .el-form-item__label {
+          margin-left: 16px;
+        }
+      }
     }
   }
 }

+ 58 - 13
src/views/organizationManagement/components/organizationEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-02-16 11:19:16
+ * @LastEditTime: 2022-02-22 10:07:01
  * @LastEditors: Please set LastEditors
  * @Description:新增组织
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -18,18 +18,37 @@
       </div>
       <div class="addApp-form-content dialog-public-background">
         <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-form-item>
-          <el-form-item prop="id" label="组织类型">
-            <el-select v-model="form.id" placeholder="请选择">
-              <el-option label="集团内" value="1"></el-option>
-              <el-option label="集团外" value="0"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="描述">
-            <el-input style="width: 640px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
-          </el-form-item>
+          <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-form-item>
+            <el-form-item prop="id" label="组织类型">
+              <el-select v-model="form.id" placeholder="请选择">
+                <el-option label="集团内" :value="1"></el-option>
+                <el-option label="集团外" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="描述">
+              <el-input style="width: 835px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
+            </el-form-item>
+            <div class="top24">
+              <el-form-item label="1级编码">
+                <el-input placeholder="请输入1级编码" maxlength="8" v-model="form.oneCode"></el-input>
+              </el-form-item>
+              <el-form-item class="twoCode" label="2级编码">
+                <el-input placeholder="请输入2级编码" style="width: 202px" maxlength="8" v-model="form.twoCode"></el-input>
+              </el-form-item>
+              <el-form-item label="3级编码">
+                <el-input placeholder="请输入3级编码" maxlength="8" v-model="form.threeCode"></el-input>
+              </el-form-item>
+              <el-form-item label="4级编码">
+                <el-input placeholder="请输入4级编码" maxlength="8" v-model="form.fourCode"></el-input>
+              </el-form-item>
+              <el-form-item label="5级编码">
+                <el-input placeholder="请输入5级编码" maxlength="8" v-model="form.fiveCode"></el-input>
+              </el-form-item>
+            </div>
+          </el-form>
         </el-form>
       </div>
     </div>
@@ -71,6 +90,11 @@ export default {
         name: "",
         id: "",
         app: "",
+        oneCode: "",
+        twoCode: "",
+        threeCode: "",
+        fourCode: "",
+        fiveCode: ""
       },
       title: "角色",
       rules: {
@@ -219,10 +243,20 @@ export default {
             RoleList,
             Status,
             GroupList,
+            L1,
+            L2,
+            L3,
+            L4,
+            L5
           } = res.returnData;
           this.form.name = OrganName;
           this.form.id = OrganType;
           this.form.app = OrganDesc;
+          this.form.oneCode = L1;
+          this.form.twoCode = L2;
+          this.form.threeCode = L3;
+          this.form.fourCode = L4;
+          this.form.fiveCode = L5;
           this.Status = Status;
           if (AuthList && AuthList.length) {
             AuthList.forEach((item) => {
@@ -318,6 +352,11 @@ export default {
           RoleList: this.openRole ? this.checkRoles : [],
           AuthList: this.openRole ? [] : datas,
           GroupList: this.OpenGroup ? this.checkRoles : [],
+          L1: this.form.oneCode,
+          L2: this.form.twoCode,
+          L3: this.form.threeCode,
+          L4: this.form.fourCode,
+          L5: this.form.fiveCode
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -377,6 +416,12 @@ export default {
           margin-left: 27px;
         }
       }
+      .top24 {
+        margin-top: 24px;
+        .el-form-item__label {
+          margin-left: 16px;
+        }
+      }
     }
   }
 }