|
@@ -4,42 +4,43 @@
|
|
|
<!--部门数据-->
|
|
|
<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"
|
|
|
- />
|
|
|
+ <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"
|
|
|
- />
|
|
|
+ <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-col :span="20" :xs="24">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="用户名称" prop="userName">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.userName"
|
|
|
- placeholder="请输入用户名称"
|
|
|
- clearable
|
|
|
- style="width: 240px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <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="jobNumber">
|
|
|
+ <el-input v-model="queryParams.jobNumber" placeholder="请输入工号" clearable style="width: 240px"
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="职位" prop="postId">
|
|
|
+ <el-select v-model="queryParams.postId" placeholder="请选择职位" clearable style="width: 240px">
|
|
|
+ <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="手机号码" prop="phonenumber">
|
|
|
+ <el-form-item label="兼职全职" prop="fullJob">
|
|
|
+ <el-select v-model="queryParams.fullJob" placeholder="兼职/全职" clearable style="width: 240px">
|
|
|
+ <el-option v-for="dict in dict.type.sys_user_fulljob" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="公司" prop="companyId">
|
|
|
+ <el-select v-model="queryParams.companyId" placeholder="请选择公司" clearable style="width: 240px">
|
|
|
+ <el-option v-for="item in company" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <!-- <el-form-item label="手机号码" prop="phonenumber">
|
|
|
<el-input
|
|
|
v-model="queryParams.phonenumber"
|
|
|
placeholder="请输入手机号码"
|
|
@@ -47,32 +48,26 @@
|
|
|
style="width: 240px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.status"
|
|
|
- placeholder="用户状态"
|
|
|
- clearable
|
|
|
- style="width: 240px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_normal_disable"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
|
|
|
+ <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="创建时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="dateRange"
|
|
|
- style="width: 240px"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- type="daterange"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- ></el-date-picker>
|
|
|
+ <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
|
|
+ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="数量排序" prop="projectQuantitySort">
|
|
|
+ <el-select v-model="queryParams.projectQuantitySort" placeholder="项目数排序" clearable style="width: 240px">
|
|
|
+ <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="时长排序" prop="durationSort">
|
|
|
+ <el-select v-model="queryParams.durationSort" placeholder="时长排序" clearable style="width: 240px">
|
|
|
+ <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
@@ -82,56 +77,24 @@
|
|
|
|
|
|
<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-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-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-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-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-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>
|
|
@@ -139,47 +102,50 @@
|
|
|
<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" 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" :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="status" v-if="columns[5].visible">
|
|
|
+ <el-table-column label="工号" align="center" key="jobNumber" prop="jobNumber" v-if="columns[1].visible" />
|
|
|
+ <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[2].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[3].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="职位" align="center" key="postName" prop="postName" v-if="columns[4].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="全职/兼职" align="center" key="fullJob" prop="fullJob" v-if="columns[5].visible">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ ["兼职", "全职"][scope.row.fullJob] }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[6].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="参与项目数" align="center" key="projectQuantity" prop="projectQuantity"
|
|
|
+ v-if="columns[7].visible" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="上级负责人" align="center" key="superiorName" prop="superiorName" v-if="columns[8].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="累计工时" align="center" key="duration" prop="duration" v-if="columns[9].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="状态" align="center" key="status" v-if="columns[10].visible">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-switch
|
|
|
- v-model="scope.row.status"
|
|
|
- active-value="0"
|
|
|
- inactive-value="1"
|
|
|
- @change="handleStatusChange(scope.row)"
|
|
|
- ></el-switch>
|
|
|
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
|
|
+ @change="handleStatusChange(scope.row)"></el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
|
|
|
+ <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[11].visible" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- width="160"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- >
|
|
|
+ <el-table-column label="最后登录时间" align="center" prop="loginDate" v-if="columns[12].visible" width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.loginDate) }}</span>
|
|
|
+ </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-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>
|
|
|
- <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-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>
|
|
|
+ <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>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
|
|
@@ -192,13 +158,8 @@
|
|
|
</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>
|
|
|
|
|
@@ -219,6 +180,19 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
+ <el-form-item label="工号" prop="jobNumber">
|
|
|
+ <el-input v-model="form.jobNumber" placeholder="请填写工号" maxlength="11" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="上级" prop="superiorId">
|
|
|
+ <el-autocomplete v-model="form.superiorName" value-key="nickName" :fetch-suggestions="getDatas"
|
|
|
+ :filter-multiple="true" clearable placeholder="请输入关键字" @select="selectUser" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item label="手机号码" prop="phonenumber">
|
|
|
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
|
|
</el-form-item>
|
|
@@ -237,7 +211,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
|
|
- <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
|
|
|
+ <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -245,23 +219,16 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="用户性别">
|
|
|
<el-select v-model="form.sex" placeholder="请选择性别">
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_user_sex"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="状态">
|
|
|
<el-radio-group v-model="form.status">
|
|
|
- <el-radio
|
|
|
- v-for="dict in dict.type.sys_normal_disable"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.value"
|
|
|
- >{{dict.label}}</el-radio>
|
|
|
+ <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
|
|
|
+ }}</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -270,30 +237,32 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="岗位">
|
|
|
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
|
|
|
- <el-option
|
|
|
- v-for="item in postOptions"
|
|
|
- :key="item.postId"
|
|
|
- :label="item.postName"
|
|
|
- :value="item.postId"
|
|
|
- :disabled="item.status == 1"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
|
|
|
+ :disabled="item.status == 1"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="角色">
|
|
|
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
|
|
|
- <el-option
|
|
|
- v-for="item in roleOptions"
|
|
|
- :key="item.roleId"
|
|
|
- :label="item.roleName"
|
|
|
- :value="item.roleId"
|
|
|
- :disabled="item.status == 1"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
|
|
|
+ :disabled="item.status == 1"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="兼职/全职">
|
|
|
+ <el-select v-model="form.fullJob" placeholder="请选择">
|
|
|
+ <el-option v-for="dict in dict.type.sys_user_fulljob" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="备注">
|
|
@@ -310,18 +279,9 @@
|
|
|
|
|
|
<!-- 用户导入对话框 -->
|
|
|
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
- <el-upload
|
|
|
- ref="upload"
|
|
|
- :limit="1"
|
|
|
- accept=".xlsx, .xls"
|
|
|
- :headers="upload.headers"
|
|
|
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
|
|
|
- :disabled="upload.isUploading"
|
|
|
- :on-progress="handleFileUploadProgress"
|
|
|
- :on-success="handleFileSuccess"
|
|
|
- :auto-upload="false"
|
|
|
- drag
|
|
|
- >
|
|
|
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
|
|
|
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
|
|
|
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
|
|
|
<i class="el-icon-upload"></i>
|
|
|
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
|
|
<div class="el-upload__tip text-center" slot="tip">
|
|
@@ -329,7 +289,8 @@
|
|
|
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
|
|
|
</div>
|
|
|
<span>仅允许导入xls、xlsx格式文件。</span>
|
|
|
- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
|
|
|
+ <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
|
|
|
+ @click="importTemplate">下载模板</el-link>
|
|
|
</div>
|
|
|
</el-upload>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -341,17 +302,19 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
|
|
|
+import { listUser, getUser, getCompany, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect, selectName } from "@/api/system/user";
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
export default {
|
|
|
name: "User",
|
|
|
- dicts: ['sys_normal_disable', 'sys_user_sex'],
|
|
|
+ dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_fulljob'],
|
|
|
components: { Treeselect },
|
|
|
data() {
|
|
|
return {
|
|
|
+ selectedValue: "",
|
|
|
+ options: [],
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
// 选中数组
|
|
@@ -380,10 +343,17 @@ export default {
|
|
|
dateRange: [],
|
|
|
// 岗位选项
|
|
|
postOptions: [],
|
|
|
+ // 公司选项
|
|
|
+ company: [],
|
|
|
// 角色选项
|
|
|
roleOptions: [],
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
+ // 排序
|
|
|
+ sortList: [
|
|
|
+ { label: "低到高", value: 0 },
|
|
|
+ { label: "高到低", value: 1 },
|
|
|
+ ],
|
|
|
defaultProps: {
|
|
|
children: "children",
|
|
|
label: "label"
|
|
@@ -414,13 +384,19 @@ export default {
|
|
|
},
|
|
|
// 列信息
|
|
|
columns: [
|
|
|
- { key: 0, label: `用户编号`, visible: true },
|
|
|
- { key: 1, label: `用户名称`, visible: true },
|
|
|
- { key: 2, label: `用户昵称`, visible: true },
|
|
|
- { key: 3, label: `部门`, visible: true },
|
|
|
- { key: 4, label: `手机号码`, visible: true },
|
|
|
- { key: 5, label: `状态`, visible: true },
|
|
|
- { key: 6, label: `创建时间`, visible: true }
|
|
|
+ { key: 0, label: `用户编号`, visible: false },
|
|
|
+ { key: 1, label: `工号`, visible: true },
|
|
|
+ { key: 2, label: `账号`, visible: true },
|
|
|
+ { key: 3, label: `用户名称`, visible: true },
|
|
|
+ { 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: 9, label: `累计工时`, visible: true },
|
|
|
+ { key: 10, label: `状态`, visible: true },
|
|
|
+ { key: 11, label: `创建时间`, visible: true },
|
|
|
+ { key: 12, label: `最后登录时间`, visible: true }
|
|
|
],
|
|
|
// 表单校验
|
|
|
rules: {
|
|
@@ -456,26 +432,51 @@ export default {
|
|
|
// 根据名称筛选部门树
|
|
|
deptName(val) {
|
|
|
this.$refs.tree.filter(val);
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
+ this.getUser();
|
|
|
+ this.getCompany();
|
|
|
this.getDeptTree();
|
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
|
this.initPassword = response.msg;
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 根据查询关键词,获取匹配的下拉列表数据
|
|
|
+ getDatas(query, cb) {
|
|
|
+ selectName(query, 2).then(response => {
|
|
|
+ cb(response.data)
|
|
|
+ });
|
|
|
+ },
|
|
|
+ selectUser(item) {
|
|
|
+ this.form.superiorId = item.userId
|
|
|
+ this.form.superiorName = item.nickName
|
|
|
+ },
|
|
|
/** 查询用户列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
- this.userList = response.rows;
|
|
|
- this.total = response.total;
|
|
|
- this.loading = false;
|
|
|
- }
|
|
|
+ this.userList = response.rows;
|
|
|
+ this.total = response.total;
|
|
|
+ this.loading = false;
|
|
|
+ }
|
|
|
);
|
|
|
},
|
|
|
+ /** 获取公司信息 */
|
|
|
+ getCompany() {
|
|
|
+ getCompany().then(response => {
|
|
|
+ this.company = response.data
|
|
|
+ });
|
|
|
+ },
|
|
|
+ /** 获取岗位信息 */
|
|
|
+ getUser() {
|
|
|
+ getUser().then(response => {
|
|
|
+ this.postOptions = response.posts;
|
|
|
+ this.roleOptions = response.roles;
|
|
|
+ });
|
|
|
+ },
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getDeptTree() {
|
|
|
deptTreeSelect().then(response => {
|
|
@@ -495,11 +496,11 @@ export default {
|
|
|
// 用户状态修改
|
|
|
handleStatusChange(row) {
|
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
|
- this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function() {
|
|
|
+ this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
|
|
|
return changeUserStatus(row.userId, row.status);
|
|
|
}).then(() => {
|
|
|
this.$modal.msgSuccess(text + "成功");
|
|
|
- }).catch(function() {
|
|
|
+ }).catch(function () {
|
|
|
row.status = row.status === "0" ? "1" : "0";
|
|
|
});
|
|
|
},
|
|
@@ -511,6 +512,10 @@ export default {
|
|
|
// 表单重置
|
|
|
reset() {
|
|
|
this.form = {
|
|
|
+ superiorId: undefined,
|
|
|
+ superiorName: undefined,
|
|
|
+ fullJob: undefined,
|
|
|
+ jobNumber: undefined,
|
|
|
userId: undefined,
|
|
|
deptId: undefined,
|
|
|
userName: undefined,
|
|
@@ -593,18 +598,18 @@ export default {
|
|
|
inputPattern: /^.{5,20}$/,
|
|
|
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
|
|
|
}).then(({ value }) => {
|
|
|
- resetUserPwd(row.userId, value).then(response => {
|
|
|
- this.$modal.msgSuccess("修改成功,新密码是:" + value);
|
|
|
- });
|
|
|
- }).catch(() => {});
|
|
|
+ resetUserPwd(row.userId, value).then(response => {
|
|
|
+ this.$modal.msgSuccess("修改成功,新密码是:" + value);
|
|
|
+ });
|
|
|
+ }).catch(() => { });
|
|
|
},
|
|
|
/** 分配角色操作 */
|
|
|
- handleAuthRole: function(row) {
|
|
|
+ handleAuthRole: function (row) {
|
|
|
const userId = row.userId;
|
|
|
this.$router.push("/system/user-auth/role/" + userId);
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
- submitForm: function() {
|
|
|
+ submitForm: function () {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.userId != undefined) {
|
|
@@ -626,12 +631,12 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const userIds = row.userId || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function() {
|
|
|
+ this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function () {
|
|
|
return delUser(userIds);
|
|
|
}).then(() => {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ }).catch(() => { });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
@@ -667,4 +672,4 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
-</script>
|
|
|
+</script>
|