|
|
@@ -3,8 +3,8 @@
|
|
|
<el-row :gutter="20">
|
|
|
<!--部门数据-->
|
|
|
<el-col :span="4" :xs="24">
|
|
|
- <div class="head-container">
|
|
|
- <el-input
|
|
|
+ <div class="head-container">
|
|
|
+ <el-input
|
|
|
v-model="deptName"
|
|
|
placeholder="请输入部门名称"
|
|
|
clearable
|
|
|
@@ -13,7 +13,7 @@
|
|
|
style="margin-bottom: 20px"
|
|
|
/>
|
|
|
</div>
|
|
|
- <div class="head-container">
|
|
|
+ <div class="head-container">
|
|
|
<el-tree
|
|
|
:data="deptOptions"
|
|
|
:props="defaultProps"
|
|
|
@@ -27,22 +27,28 @@
|
|
|
/>
|
|
|
</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">
|
|
|
- <div style="float: left">
|
|
|
- <el-form-item prop="userName">
|
|
|
-
|
|
|
- <!-- <i class="el-icon-search"></i> -->
|
|
|
- <el-input prefix-icon="el-icon-search" v-model="queryParams.userName" placeholder="搜索您的客户..." clearable style="width: 240px"
|
|
|
- @keyup.enter.native="handleQuery" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item prop="phonenumber">
|
|
|
- <el-input v-model="queryParams.phonenumber" placeholder="筛选" clearable style="width: 240px"
|
|
|
- @keyup.enter.native="handleQuery" />
|
|
|
- </el-form-item>
|
|
|
- <!-- <el-form-item label="状态" prop="status">
|
|
|
+ <el-form-item label="用户名称" prop="userName">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.userName"
|
|
|
+ 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="状态" prop="status">
|
|
|
<el-select
|
|
|
v-model="queryParams.status"
|
|
|
placeholder="用户状态"
|
|
|
@@ -56,8 +62,8 @@
|
|
|
:value="dict.value"
|
|
|
/>
|
|
|
</el-select>
|
|
|
- </el-form-item> -->
|
|
|
- <!-- <el-form-item >
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="创建时间">
|
|
|
<el-date-picker
|
|
|
v-model="dateRange"
|
|
|
style="width: 240px"
|
|
|
@@ -67,79 +73,98 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
></el-date-picker>
|
|
|
- </el-form-item> -->
|
|
|
- <!-- <el-form-item> -->
|
|
|
- <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
+ </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-date-picker v-model="value1" type="date" placeholder="选择日期">
|
|
|
- </el-date-picker>
|
|
|
- </div>
|
|
|
-
|
|
|
- <div style="float: right">
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button plain size="mini" @click="handleAdd" v-hasPermi="['system:user:add']"
|
|
|
- style="border-radius: 15px; margin-right: 0%">新增</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>
|
|
|
- </div>
|
|
|
-
|
|
|
- <!-- <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-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe>
|
|
|
+ <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-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="150" />
|
|
|
- <el-table-column label="邮箱地址" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" width="200" />
|
|
|
- <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="150" >
|
|
|
- <!-- <el-table-column label="创建时间" align="center" key="status" v-if="columns[5].visible"> -->
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
+ <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">
|
|
|
+ <template slot-scope="scope">
|
|
|
<el-switch
|
|
|
v-model="scope.row.status"
|
|
|
active-value="0"
|
|
|
inactive-value="1"
|
|
|
@change="handleStatusChange(scope.row)"
|
|
|
></el-switch>
|
|
|
- </template> -->
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="260">
|
|
|
+ <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <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">
|
|
|
+ >
|
|
|
+ <template slot-scope="scope" v-if="scope.row.userId !== 1">
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -163,12 +188,17 @@
|
|
|
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
- </template> -->
|
|
|
- <!-- </el-table-column> -->
|
|
|
+ </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>
|
|
|
|
|
|
@@ -177,7 +207,7 @@
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="用户名" prop="nickName">
|
|
|
+ <el-form-item label="用户昵称" prop="nickName">
|
|
|
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -207,7 +237,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>
|
|
|
@@ -215,16 +245,23 @@
|
|
|
<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>
|
|
|
@@ -233,16 +270,26 @@
|
|
|
<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>
|
|
|
@@ -250,7 +297,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="备注">
|
|
|
- <el-input v-model="formNaNpxark" type="textarea" placeholder="请输入内容"></el-input>
|
|
|
+ <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -263,19 +310,26 @@
|
|
|
|
|
|
<!-- 用户导入对话框 -->
|
|
|
<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">
|
|
|
<div class="el-upload__tip" slot="tip">
|
|
|
- <el-checkbox v-model="upload.updateSupport" />
|
|
|
- 是否更新已经存在的用户数据
|
|
|
+ <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">
|
|
|
@@ -287,57 +341,17 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {
|
|
|
- listUser,
|
|
|
- getUser,
|
|
|
- delUser,
|
|
|
- addUser,
|
|
|
- updateUser,
|
|
|
- resetUserPwd,
|
|
|
- changeUserStatus,
|
|
|
- deptTreeSelect,
|
|
|
-} from "@/api/system/user";
|
|
|
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } 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'],
|
|
|
components: { Treeselect },
|
|
|
data() {
|
|
|
return {
|
|
|
- pickerOptions: {
|
|
|
- disabledDate(time) {
|
|
|
- return time.getTime() > Date.now();
|
|
|
- },
|
|
|
- shortcuts: [
|
|
|
- {
|
|
|
- text: "今天",
|
|
|
- onClick(picker) {
|
|
|
- picker.$emit("pick", new Date());
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- text: "昨天",
|
|
|
- onClick(picker) {
|
|
|
- const date = new Date();
|
|
|
- date.setTime(date.getTime() - 3600 * 1000 * 24);
|
|
|
- picker.$emit("pick", date);
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- text: "一周前",
|
|
|
- onClick(picker) {
|
|
|
- const date = new Date();
|
|
|
- date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
|
|
|
- picker.$emit("pick", date);
|
|
|
- },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- value1: "",
|
|
|
- value2: "",
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
// 选中数组
|
|
|
@@ -372,7 +386,7 @@ export default {
|
|
|
form: {},
|
|
|
defaultProps: {
|
|
|
children: "children",
|
|
|
- label: "label",
|
|
|
+ label: "label"
|
|
|
},
|
|
|
// 用户导入参数
|
|
|
upload: {
|
|
|
@@ -387,7 +401,7 @@ export default {
|
|
|
// 设置上传的请求头部
|
|
|
headers: { Authorization: "Bearer " + getToken() },
|
|
|
// 上传的地址
|
|
|
- url: process.env.VUE_APP_BASE_API + "/system/user/importData",
|
|
|
+ url: process.env.VUE_APP_BASE_API + "/system/user/importData"
|
|
|
},
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
@@ -396,7 +410,7 @@ export default {
|
|
|
userName: undefined,
|
|
|
phonenumber: undefined,
|
|
|
status: undefined,
|
|
|
- deptId: undefined,
|
|
|
+ deptId: undefined
|
|
|
},
|
|
|
// 列信息
|
|
|
columns: [
|
|
|
@@ -406,77 +420,56 @@ export default {
|
|
|
{ key: 3, label: `部门`, visible: true },
|
|
|
{ key: 4, label: `手机号码`, visible: true },
|
|
|
{ key: 5, label: `状态`, visible: true },
|
|
|
- { key: 6, label: `创建时间`, visible: true },
|
|
|
+ { key: 6, label: `创建时间`, visible: true }
|
|
|
],
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
userName: [
|
|
|
{ required: true, message: "用户名称不能为空", trigger: "blur" },
|
|
|
- {
|
|
|
- min: 2,
|
|
|
- max: 20,
|
|
|
- message: "用户名称长度必须介于 2 和 20 之间",
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
+ { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
|
|
],
|
|
|
nickName: [
|
|
|
- { required: true, message: "用户昵称不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "用户昵称不能为空", trigger: "blur" }
|
|
|
],
|
|
|
password: [
|
|
|
{ required: true, message: "用户密码不能为空", trigger: "blur" },
|
|
|
- {
|
|
|
- min: 5,
|
|
|
- max: 20,
|
|
|
- message: "用户密码长度必须介于 5 和 20 之间",
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
+ { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
|
|
|
],
|
|
|
email: [
|
|
|
{
|
|
|
type: "email",
|
|
|
message: "请输入正确的邮箱地址",
|
|
|
- trigger: ["blur", "change"],
|
|
|
- },
|
|
|
+ trigger: ["blur", "change"]
|
|
|
+ }
|
|
|
],
|
|
|
phonenumber: [
|
|
|
{
|
|
|
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
|
|
message: "请输入正确的手机号码",
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
// 根据名称筛选部门树
|
|
|
deptName(val) {
|
|
|
this.$refs.tree.filter(val);
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
this.getDeptTree();
|
|
|
- this.getConfigKey("sys.user.initPassword").then((response) => {
|
|
|
+ this.getConfigKey("sys.user.initPassword").then(response => {
|
|
|
this.initPassword = response.msg;
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
|
-
|
|
|
- // tableRowClassName(row, rowIndex) {
|
|
|
- // if (rowIndex === 1) {
|
|
|
- // return 'waring-row';
|
|
|
- // } else if (rowIndex === 2) {
|
|
|
- // return 'success-row';
|
|
|
- // }
|
|
|
- // return '';
|
|
|
- // },
|
|
|
-
|
|
|
/** 查询用户列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
|
|
|
- (response) => {
|
|
|
+ listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
this.userList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -485,7 +478,7 @@ export default {
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getDeptTree() {
|
|
|
- deptTreeSelect().then((response) => {
|
|
|
+ deptTreeSelect().then(response => {
|
|
|
this.deptOptions = response.data;
|
|
|
});
|
|
|
},
|
|
|
@@ -502,17 +495,13 @@ export default {
|
|
|
// 用户状态修改
|
|
|
handleStatusChange(row) {
|
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
|
- this.$modal
|
|
|
- .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
|
|
|
- .then(function () {
|
|
|
- return changeUserStatus(row.userId, row.status);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.$modal.msgSuccess(text + "成功");
|
|
|
- })
|
|
|
- .catch(function () {
|
|
|
- row.status = row.status === "0" ? "1" : "0";
|
|
|
- });
|
|
|
+ this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
|
|
|
+ return changeUserStatus(row.userId, row.status);
|
|
|
+ }).then(() => {
|
|
|
+ this.$modal.msgSuccess(text + "成功");
|
|
|
+ }).catch(function() {
|
|
|
+ row.status = row.status === "0" ? "1" : "0";
|
|
|
+ });
|
|
|
},
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
@@ -533,7 +522,7 @@ export default {
|
|
|
status: "0",
|
|
|
remark: undefined,
|
|
|
postIds: [],
|
|
|
- roleIds: [],
|
|
|
+ roleIds: []
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -552,7 +541,7 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map((item) => item.userId);
|
|
|
+ this.ids = selection.map(item => item.userId);
|
|
|
this.single = selection.length != 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
@@ -572,7 +561,7 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
- getUser().then((response) => {
|
|
|
+ getUser().then(response => {
|
|
|
this.postOptions = response.posts;
|
|
|
this.roleOptions = response.roles;
|
|
|
this.open = true;
|
|
|
@@ -584,7 +573,7 @@ export default {
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
const userId = row.userId || this.ids;
|
|
|
- getUser(userId).then((response) => {
|
|
|
+ getUser(userId).then(response => {
|
|
|
this.form = response.data;
|
|
|
this.postOptions = response.posts;
|
|
|
this.roleOptions = response.roles;
|
|
|
@@ -602,32 +591,30 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
closeOnClickModal: false,
|
|
|
inputPattern: /^.{5,20}$/,
|
|
|
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
|
|
|
- })
|
|
|
- .then(({ value }) => {
|
|
|
- resetUserPwd(row.userId, value).then((response) => {
|
|
|
+ inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
|
|
|
+ }).then(({ value }) => {
|
|
|
+ resetUserPwd(row.userId, value).then(response => {
|
|
|
this.$modal.msgSuccess("修改成功，新密码是：" + value);
|
|
|
});
|
|
|
- })
|
|
|
- .catch(() => { });
|
|
|
+ }).catch(() => {});
|
|
|
},
|
|
|
/** 分配角色操作 */
|
|
|
- handleAuthRole: function (row) {
|
|
|
+ handleAuthRole: function(row) {
|
|
|
const userId = row.userId;
|
|
|
this.$router.push("/system/user-auth/role/" + userId);
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
- submitForm: function () {
|
|
|
- this.$refs["form"].validate((valid) => {
|
|
|
+ submitForm: function() {
|
|
|
+ this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.userId != undefined) {
|
|
|
- updateUser(this.form).then((response) => {
|
|
|
+ updateUser(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
});
|
|
|
} else {
|
|
|
- addUser(this.form).then((response) => {
|
|
|
+ addUser(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -639,26 +626,18 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const userIds = row.userId || this.ids;
|
|
|
- this.$modal
|
|
|
- .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
|
|
|
- .then(function () {
|
|
|
- return delUser(userIds);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
- })
|
|
|
- .catch(() => { });
|
|
|
+ this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
|
|
|
+ return delUser(userIds);
|
|
|
+ }).then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
+ }).catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- this.download(
|
|
|
- "system/user/export",
|
|
|
- {
|
|
|
- ...this.queryParams,
|
|
|
- },
|
|
|
- `user_${new Date().getTime()}.xlsx`
|
|
|
- );
|
|
|
+ this.download('system/user/export', {
|
|
|
+ ...this.queryParams
|
|
|
+ }, `user_${new Date().getTime()}.xlsx`)
|
|
|
},
|
|
|
/** 导入按钮操作 */
|
|
|
handleImport() {
|
|
|
@@ -667,11 +646,8 @@ export default {
|
|
|
},
|
|
|
/** 下载模板操作 */
|
|
|
importTemplate() {
|
|
|
- this.download(
|
|
|
- "system/user/importTemplate",
|
|
|
- {},
|
|
|
- `user_template_${new Date().getTime()}.xlsx`
|
|
|
- );
|
|
|
+ this.download('system/user/importTemplate', {
|
|
|
+ }, `user_template_${new Date().getTime()}.xlsx`)
|
|
|
},
|
|
|
// 文件上传中处理
|
|
|
handleFileUploadProgress(event, file, fileList) {
|
|
|
@@ -682,28 +658,13 @@ export default {
|
|
|
this.upload.open = false;
|
|
|
this.upload.isUploading = false;
|
|
|
this.$refs.upload.clearFiles();
|
|
|
- this.$alert(
|
|
|
- "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
|
|
|
- response.msg +
|
|
|
- "</div>",
|
|
|
- "导入结果",
|
|
|
- { dangerouslyUseHTMLString: true }
|
|
|
- );
|
|
|
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
|
|
|
this.getList();
|
|
|
},
|
|
|
// 提交上传文件
|
|
|
submitFileForm() {
|
|
|
this.$refs.upload.submit();
|
|
|
- },
|
|
|
- },
|
|
|
-};
|
|
|
-</script>
|
|
|
-<style lang="scss" scoped>
|
|
|
- /* .el-table .waring-row {
|
|
|
- background: #e01313 !important;
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- .el-table .success-row {
|
|
|
- background:#8da814 !important;
|
|
|
- } */
|
|
|
-</style>
|
|
|
+};
|
|
|
+</script>
|
xuezizhuo