人员信息搜索

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -430,4 +430,14 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+    /**
+     * 获取部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/deptTreeNew")
+    public AjaxResult deptTreeNew(SysDept dept)
+    {
+        return success(deptService.selectDeptTreeListNew(dept));
+    }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/TreeSelectNew.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ * 
+ * @author ruoyi
+ */
+public class TreeSelectNew implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelectNew> children;
+
+    public TreeSelectNew()
+    {
+
+    }
+
+    public TreeSelectNew(SysDept dept)
+    {
+        this.id = dept.getDeptId();
+        SysUser sysUser = new SysUser();
+        sysUser.setDeptId(dept.getDeptId());
+        SysUserMapper userMapper = SpringUtils.getBean(SysUserMapper.class);
+        List<SysUser> list = userMapper.selectUserList(sysUser);
+        if (dept.getDeptId() == 103) {
+            SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
+            list = userPostMapper.selectGmAssistant(new SysUser());
+        }
+        String count = "(" + (list == null ? 0 : list.size()) + ")";
+        this.label = dept.getDeptName() + count;
+        this.children = dept.getChildren().stream().map(TreeSelectNew::new).collect(Collectors.toList());
+    }
+
+    public TreeSelectNew(SysMenu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelectNew::new).collect(Collectors.toList());
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
+
+    public List<TreeSelectNew> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<TreeSelectNew> children)
+    {
+        this.children = children;
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
 import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.system.domain.TreeSelectNew;
 import com.ruoyi.common.core.domain.entity.SysDept;
 
 /**
@@ -25,6 +27,14 @@ public interface ISysDeptService
      * @param dept 部门信息
      * @return 部门树信息集合
      */
+    public List<TreeSelectNew> selectDeptTreeListNew(SysDept dept);
+
+    /**
+     * 查询部门树结构信息
+     *
+     * @param dept 部门信息
+     * @return 部门树信息集合
+     */
     public List<TreeSelect> selectDeptTreeList(SysDept dept);
 
     /**
@@ -41,6 +51,14 @@ public interface ISysDeptService
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
+    public List<TreeSelectNew> buildDeptTreeSelectNew(List<SysDept> depts);
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
     public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -4,11 +4,13 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.TreeSelect;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.system.domain.TreeSelectNew;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -55,6 +57,19 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 部门树信息集合
      */
     @Override
+    public List<TreeSelectNew> selectDeptTreeListNew(SysDept dept)
+    {
+        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        return buildDeptTreeSelectNew(depts);
+    }
+
+    /**
+     * 查询部门树结构信息
+     *
+     * @param dept 部门信息
+     * @return 部门树信息集合
+     */
+    @Override
     public List<TreeSelect> selectDeptTreeList(SysDept dept)
     {
         List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
@@ -95,6 +110,19 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 下拉树结构列表
      */
     @Override
+    public List<TreeSelectNew> buildDeptTreeSelectNew(List<SysDept> depts)
+    {
+        List<SysDept> deptTrees = buildDeptTree(depts);
+        return deptTrees.stream().map(TreeSelectNew::new).collect(Collectors.toList());
+    }
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
+    @Override
     public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
     {
         List<SysDept> deptTrees = buildDeptTree(depts);

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -105,8 +105,8 @@
         <where>
             <if test="applier != null "> and ca.applier = #{applier}</if>
             <if test="useDept != null "> and ca.use_dept = #{useDept}</if>
-            <if test="cars != null  and cars != ''"> and ca.cars like concat('%', #{cars}, '%')</if>
-            <if test="drivers != null  and drivers != ''"> and ca.drivers like concat('%', #{drivers}, '%')</if>
+            <if test="cars != null  and cars != ''"> and find_in_set(ca.cars, #{cars})</if>
+            <if test="drivers != null  and drivers != ''"> and find_in_set(ca.drivers, #{drivers})</if>
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -75,9 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="applier != null "> and da.applier = #{applier}</if>
             <if test="useDept != null "> and da.use_dept = #{useDept}</if>
-            <if test="devices != null  and devices != ''"> and da.devices like concat('%', #{devices}, '%')</if>
-            <if test="modifyDevices != null  and modifyDevices != ''"> and da.modify_devices like concat('%', #{modifyDevices}, '%')</if>
-            <if test="repairDevices != null  and repairDevices != ''"> and da.repair_devices like concat('%', #{repairDevices}, '%')</if>
+            <if test="devices != null  and devices != ''"> and find_in_set(da.devices, #{devices})</if>
+            <if test="modifyDevices != null  and modifyDevices != ''"> and find_in_set(da.modify_devices, #{modifyDevices})</if>
+            <if test="repairDevices != null  and repairDevices != ''"> and find_in_set(da.repair_devices, #{repairDevices})</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and da.apply_date = #{applyDate}</if>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -114,6 +114,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
+		<if test="degree != null and degree != ''">
+			AND u.degree = #{degree}
+		</if>
+		<if test="titles != null and titles != ''">
+			AND find_in_set(u.titles, #{titles})
+		</if>
+		<if test="certificates != null and certificates != ''">
+			AND find_in_set(u.certificates, #{certificates})
+		</if>
+		<if test="politicalAffiliation != null and politicalAffiliation != ''">
+			AND find_in_set(u.political_affiliation, #{political_affiliation})
+		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 		</if>

oa-ui/src/api/system/user.js

@@ -142,3 +142,11 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+// 查询部门下拉树结构
+export function deptTreeSelectNew() {
+  return request({
+    url: '/system/user/deptTreeNew',
+    method: 'get'
+  })
+}

oa-ui/src/views/oa/staff/index.vue

@@ -1,145 +1,166 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="5" :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"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
+        </div>
+      </el-col>
       <!--用户数据-->
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="姓名" prop="nickName">
-          <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable style="width: 240px"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phonenumber">
-          <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="部门">
-          <el-select v-model="queryParams.deptId" clearable @change="handleQuery">
-            <el-option v-for="item in deptList" :key="item.id" :label="item.label" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
+      <el-col :span="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="姓名" prop="nickName">
+            <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable style="width: 140px"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="职称" prop="titles">
+            <el-select v-model="queryParams.titles" clearable placeholder="请输入职称" style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_titles" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+          </el-form-item>
+          <el-form-item label="执业证书" prop="certificates">
+            <el-select v-model="queryParams.certificates" clearable placeholder="请输入执业证书" style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+          </el-form-item>
+          <el-form-item label="学历" prop="degree">
+            <el-select v-model="queryParams.degree" clearable placeholder="请输入学历" style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
 
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-            v-hasPermi="['system:user:add']">新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-            v-hasPermi="['system:user:edit']">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-            v-hasPermi="['system:user:remove']">删除</el-button>
-        </el-col>
-        <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['system:user:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['system:user:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['system:user:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
           <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
             v-hasPermi="['system:user:import']">导入</el-button>
         </el-col> -->
-        <el-col :span="1.5">
-          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-            v-hasPermi="['system:user:export']">导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-      </el-row>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['system:user:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
 
-      <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="50" align="center" />
-        <el-table-column label="序号" width="50" align="center" prop="userId">
-          <template slot-scope="scope">
-            {{ scope.row.userId - 1 }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
-        <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[0].visible"
-          :show-overflow-tooltip="true" />
-        <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible">
-          <template slot-scope="scope">
-            {{ getAgeByIdCard(scope.row.idCard) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[2].visible"
-          :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.sex == 0 ? '男' : '女' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible"
-          width="120" />
-        <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible"
-          :show-overflow-tooltip="true" />
-        <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[5].visible"
-          :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
-      selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
-          :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[7].visible"
-          :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ formatCrtificates(dict.type.sys_user_certificates, scope.row.certificates) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="入职年月" align="center" key="entryDate" prop="entryDate" v-if="columns[8].visible"
-          :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.entryDate, '{y}-{m}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[8].visible"
-          :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.contractSign, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="合同期满" align="center" key="contractExpire" prop="contractExpire"
-          v-if="columns[8].visible" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary" :show-overflow-tooltip="true">
+        <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" width="50" align="center" prop="userId">
+            <template slot-scope="scope">
+              {{ scope.row.userId - 1 }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
+          <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[0].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible">
+            <template slot-scope="scope">
+              {{ getAgeByIdCard(scope.row.idCard) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[2].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.sex == 0 ? '男' : '女' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible"
+            width="120" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[5].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
+                selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[7].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ formatCrtificates(dict.type.sys_user_certificates, scope.row.certificates) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="入职年月" align="center" key="entryDate" prop="entryDate" v-if="columns[8].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.entryDate, '{y}-{m}') }}</span>
+            </template>
+          </el-table-column> -->
+          <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[7].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.contractSign, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合同期满" align="center" key="contractExpire" prop="contractExpire"
+            v-if="columns[8].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.salary ? scope.row.salary.salary : "" }}
           </template>
         </el-table-column> -->
-        <el-table-column label="状态" align="center" key="status" v-if="columns[9].visible">
-          <template slot-scope="scope">
-            <el-tag type="success" v-if="scope.row.status == 0">在职</el-tag>
-            <el-tag type="danger" v-if="scope.row.status == 1">离职</el-tag>
-            <el-tag type="warning" v-if="scope.row.status == 2">退休</el-tag>
-            <!-- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+          <el-table-column label="状态" align="center" key="status" v-if="columns[9].visible">
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.status == 0">在职</el-tag>
+              <el-tag type="danger" v-if="scope.row.status == 1">离职</el-tag>
+              <el-tag type="warning" v-if="scope.row.status == 2">退休</el-tag>
+              <!-- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
               @change="handleStatusChange(scope.row)"></el-switch> -->
-          </template>
-        </el-table-column>
+            </template>
+          </el-table-column>
 
-        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-          <template slot-scope="scope" v-if="scope.row.userId !== 1">
-            <el-button size="mini" type="text" icon="el-icon-view" v-hasPermi="['system:user:query']"
-              @click="handleView(scope.row)">详情</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              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>
-          </template>
-        </el-table-column>
-      </el-table>
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button size="mini" type="text" icon="el-icon-view" v-hasPermi="['system:user:query']"
+                @click="handleView(scope.row)">详情</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                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>
+            </template>
+          </el-table-column>
+        </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
+      </el-col>
     </el-row>
-
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -218,8 +239,7 @@
                 value-format="yyyy-MM" />
             </el-form-item>
             <el-form-item label="政治面貌" prop="politicalAffiliation">
-              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌"
-                style="width:100%;">
+              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_political" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
@@ -316,7 +336,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelectNew } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -345,7 +365,6 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      deptList: [],
       // 是否显示弹出层
       open: false,
       // 部门名称
@@ -403,8 +422,8 @@ export default {
         { key: 4, label: `部门`, visible: true },
         { key: 5, label: `岗级`, visible: true },
         { key: 6, label: `职称`, visible: true },
-        { key: 7, label: `执业证书`, visible: true },
-        { key: 8, label: `入职年月`, visible: true },
+        { key: 7, label: `合同签订`, visible: true },
+        { key: 8, label: `合同期满`, visible: true },
         { key: 9, label: `状态`, visible: true },
       ],
       // 表单校验
@@ -465,9 +484,8 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelectNew().then(response => {
         this.deptOptions = response.data;
-        this.deptList = response.data[0].children
       });
     },
     // 筛选节点
@@ -634,7 +652,7 @@ export default {
               this.getList();
             });
           } else {
-            this.form.certificates = this.form.certificates.length == 0? '' : this.form.certificates;
+            this.form.certificates = this.form.certificates.length == 0 ? '' : this.form.certificates;
             this.form.politicalAffiliation = this.form.politicalAffiliation.length == 0 ? '' : this.form.politicalAffiliation;
             addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");

oa-ui/src/views/system/user/index.vue

@@ -298,7 +298,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelectNew } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -442,7 +442,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelectNew().then(response => {
         this.deptOptions = response.data;
       });
     },