Merge branch 'master' of http://192.168.0.56:3000/haozq/lj-zhgd-htweb

src/api/system/user.js

@@ -144,4 +144,12 @@ export function associationTeam(data) {
     method: 'post',
     data: data
   })
+}
+
+// 查询部门下拉树结构
+export function departTreeSelect() {
+  return request({
+    url: '/system/user/departTree',
+    method: 'get'
+  })
 }

src/views/system/user/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <!--项目部数据-->
+      <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="deptName" placeholder="请输入项目部名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+          <el-tree :data="departOptions" :props="defaultProps" :expand-on-click-node="false"
             :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
             @node-click="handleNodeClick" />
         </div>
@@ -67,16 +67,20 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="序号" align="center" width="80" type="index">
+            <template scope="scope">
+              <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
             :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
             :show-overflow-tooltip="true" />
-          <el-table-column label="项目部" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+          <el-table-column label="项目部" align="center" key="departName" prop="departName" v-if="columns[3].visible"
             :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
             width="120" />
-            <el-table-column label="角色名称" align="center" key="roleName" prop="roleName" v-if="columns[5].visible"
+          <el-table-column label="角色名称" align="center" key="roleName" prop="roleName" v-if="columns[5].visible"
             width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[6].visible">
             <template slot-scope="scope">
@@ -95,8 +99,8 @@
                 v-hasPermi="['system:user:edit']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']">删除</el-button>
-              <el-button size="mini" type="text" icon="el-icon-user" @click="handleAssociation(scope.row)" v-if="scope.row.roleCode === 'team'"
-                v-hasPermi="['system:user:associationTeam']">关联班组</el-button>
+              <el-button size="mini" type="text" icon="el-icon-user" @click="handleAssociation(scope.row)"
+                v-if="scope.row.roleCode === 'team'" v-hasPermi="['system:user:associationTeam']">关联班组</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
                 v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
@@ -127,7 +131,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目部" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择项目部" />
+              <treeselect v-model="form.deptId" :options="departOptions" :show-count="true" placeholder="请选择项目部" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -196,8 +200,9 @@
           <el-col :span="12">
             <el-form-item label="登录权限" prop="loginTypeArr">
               <el-checkbox-group v-model="loginTypeArr">
-                <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value"
-                  :label="dict.value">{{ dict.label }}</el-checkbox>
+                <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">{{
+                  dict.label
+                  }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -243,7 +248,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="关联班组">
-              <el-select v-model="form2.teamId" clearable placeholder="请选择班组" style="width: 100%;">
+              <el-select v-model="form2.teamId" clearable filterable placeholder="请选择班组" style="width: 100%;">
                 <el-option v-for="item in teamsArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
@@ -259,7 +264,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect, associationTeam } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect, associationTeam, departTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -295,6 +300,8 @@ export default {
       openAssociation: false,
       // 部门名称
       deptName: undefined,
+      // 项目部树选项
+      departOptions: undefined,
       // 默认密码
       initPassword: undefined,
       // 日期范围
@@ -387,7 +394,7 @@ export default {
     };
   },
   watch: {
-    // 根据名称筛选部门树
+    // 根据名称筛选项目部树
     deptName(val) {
       this.$refs.tree.filter(val);
     }
@@ -395,7 +402,8 @@ export default {
   created() {
     this.getList();
     this.getTeamList();
-    this.getDeptTree();
+    // this.getDeptTree();
+    this.getDepartTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
@@ -435,12 +443,19 @@ export default {
       }
       );
     },
-    /** 查询部门下拉树结构 */
+    /** 查询部门下拉树结构-废弃 */
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
       });
     },
+    /** 查询项目部下拉选*/
+    getDepartTree() {
+      departTreeSelect().then(response => {
+        console.log(response);
+        this.departOptions = response.data;
+      });
+    },
     // 筛选节点
     filterNode(value, data) {
       if (!value) return true;
@@ -496,7 +511,7 @@ export default {
         userId: null,
         teamId: null,
         nickName: null,
-        userName:null
+        userName: null
       };
       this.resetForm("form2");
     },