用户添加角色查询

src/views/sys/user-list.vue

@@ -21,12 +21,12 @@
         <el-input type="text" size="mini" v-model="queryModel.realName"></el-input>
       </el-form-item>
       <el-form-item label="所属单位" prop="companyId">
-        <el-select
+        <!-- <el-select
           v-model="queryModel.companyId"
           size="mini"
           filterable
           placeholder="请选择"
-          style="width:300px"
+          style="width:200px"
         >
           <el-option
             v-for="company in companyResult"
@@ -34,6 +34,29 @@
             :label="company.name"
             :value="company.id"
           ></el-option>
+        </el-select> -->
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="角色" prop="roleId">
+        <el-select
+          v-model="queryModel.roleId"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width:200px"
+        >
+          <el-option
+            v-for="role in roleResult"
+            :key="role.id"
+            :label="role.description"
+            :value="role.id"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -156,7 +179,9 @@
 import Constant from "@/constant";
 import UserDetail from "./user-detail";
 import userApi from "@/api/sys/user";
+import roleApi from "@/api/sys/role";
 import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -169,7 +194,8 @@ export default {
       queryModel: {
         userName: "",
         realName: "",
-        companyId:""
+        companyId:"",
+        roleId:""
       },
       loading: false,
       tableData: [],
@@ -186,7 +212,14 @@ export default {
       showModal: false,
       companyResult:[],
       dialogFormVisible:false,
-      newPassword:""
+      newPassword:"",
+      roleResult:[],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
     };
   },
   methods: {
@@ -203,7 +236,12 @@ export default {
 
       formData.append("userName", self.queryModel.userName);
       formData.append("realName", self.queryModel.realName);
-      formData.append("companyId", self.queryModel.companyId);
+
+      if (self.queryModel.companyId != null) {
+        formData.append("companyId", self.queryModel.companyId);
+      }
+
+      formData.append("roleId", self.queryModel.roleId);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -363,9 +401,17 @@ export default {
         self.companyResult = jsonData.data;
       }
     });
+
+    roleApi.selectAll().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.roleResult = jsonData.data;
+      }
+    });
   },
   components: {
-    "user-detail": UserDetail
+    "user-detail": UserDetail,
+    "el-select-tree": SelectTree,
   }
 };
 </script>