用户管理 角色管理修改

src/views/system/modules/UserModal.vue

@@ -100,6 +100,36 @@
           </a-select>
         </a-form-item>
 
+          <a-form-item
+              label="角色类型"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol">
+            <a-tree-select
+                style="width:100%"
+                :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
+                :treeData="treeRoleData"
+                v-decorator="[ 'roleParentId', validatorRules.name]"
+                placeholder="请选择角色类型"
+            >
+            </a-tree-select>
+          </a-form-item>
+
+
+
+          <a-form-item
+              label="组织机构"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol">
+            <a-tree-select
+                style="width:100%"
+                :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
+                :treeData="treeDepartData"
+                v-decorator="[ 'departId', validatorRules.name]"
+                placeholder="请选择组织机构">
+            </a-tree-select>
+          </a-form-item>
+
+
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入邮箱" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'email', validatorRules.email]" :maxLength="50"/>
         </a-form-item>
@@ -137,7 +167,7 @@ import moment from 'moment'
 import Vue from 'vue'
 import {ACCESS_TOKEN} from "@/store/mutation-types"
 import {getAction} from '@/api/manage'
-import {addUser, editUser, queryUserRole, queryall} from '@/api/api'
+import {addUser, editUser, queryUserRole, queryall, queryDepartTreeList} from '@/api/api'
 import {disabledAuthFilter} from "@/utils/authFilter"
 import {duplicateCheck} from '@/api/api'
 import { isEmail, passwordReg} from "@/utils/validate";
@@ -156,6 +186,12 @@ export default {
       drawerWidth: 700,
       modaltoggleFlag: true,
       confirmDirty: false,
+      // 组织机构 下拉数据
+      treeDepartData:[],
+      // 角色类型下拉数据
+      treeRoleData:[],
+
+
       selectedDepartKeys: [], //保存用户选择部门id
       checkedDepartKeys: [],
       checkedDepartNames: [], // 保存部门的名称 =>title
@@ -303,6 +339,8 @@ export default {
     },
     edit(record) {
       this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
+      // 加载组织机构数据
+      this.loadDepartTreeData()
       // 获取公钥
       this.getPublicKey()
       let that = this;
@@ -341,6 +379,21 @@ export default {
       }
       //update-end-author:taoyan date:2020710 for:多租户配置
     },
+    //  组织机构下拉数据
+    loadDepartTreeData(){
+      const that = this
+      queryDepartTreeList().then((res) => {
+        if(res.success){
+          that.treeDepartData = [];
+          let treeList = res.result
+          for(let a=0;a<treeList.length;a++){
+            let temp = treeList[a];
+            temp.isLeaf = temp.leaf;
+            that.treeDepartData.push(temp);
+          }
+        }
+      })
+    },
     //
     getPublicKey() {
       // 获取公钥