用户密码支持自定义配置规则
This commit is contained in:
RuoYi
@@ -87,6 +87,7 @@ public class SysLoginController
|
|||||||
ajax.put("user", user);
|
ajax.put("user", user);
|
||||||
ajax.put("roles", roles);
|
ajax.put("roles", roles);
|
||||||
ajax.put("permissions", permissions);
|
ajax.put("permissions", permissions);
|
||||||
|
ajax.put("pwdChrtype", getSysAccountChrtype());
|
||||||
ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
|
ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
|
||||||
ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
|
ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
|
||||||
return ajax;
|
return ajax;
|
||||||
@@ -104,7 +105,13 @@ public class SysLoginController
|
|||||||
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
|
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
|
||||||
return AjaxResult.success(menuService.buildMenus(menus));
|
return AjaxResult.success(menuService.buildMenus(menus));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取用户密码自定义配置规则
|
||||||
|
public String getSysAccountChrtype()
|
||||||
|
{
|
||||||
|
return Convert.toStr(configService.selectConfigByKey("sys.account.chrtype"), "0");
|
||||||
|
}
|
||||||
|
|
||||||
// 检查初始密码是否提醒修改
|
// 检查初始密码是否提醒修改
|
||||||
public boolean initPasswordIsModify(Date pwdUpdateDate)
|
public boolean initPasswordIsModify(Date pwdUpdateDate)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
import router from '@/router'
|
import router from '@/router'
|
||||||
|
import cache from '@/plugins/cache'
|
||||||
import { MessageBox, } from 'element-ui'
|
import { MessageBox, } from 'element-ui'
|
||||||
import { login, logout, getInfo } from '@/api/login'
|
import { login, logout, getInfo } from '@/api/login'
|
||||||
import { getToken, setToken, removeToken } from '@/utils/auth'
|
import { getToken, setToken, removeToken } from '@/utils/auth'
|
||||||
@@ -79,6 +80,7 @@ const user = {
|
|||||||
commit('SET_NAME', user.userName)
|
commit('SET_NAME', user.userName)
|
||||||
commit('SET_NICK_NAME', user.nickName)
|
commit('SET_NICK_NAME', user.nickName)
|
||||||
commit('SET_AVATAR', avatar)
|
commit('SET_AVATAR', avatar)
|
||||||
|
cache.session.set('pwrChrtype', res.pwdChrtype)
|
||||||
/* 初始密码提示 */
|
/* 初始密码提示 */
|
||||||
if(res.isDefaultModifyPwd) {
|
if(res.isDefaultModifyPwd) {
|
||||||
MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
|
MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
/**
|
||||||
|
* 密码强度规则
|
||||||
|
* 根据参数 chrtype 动态生成校验规则
|
||||||
|
*
|
||||||
|
* chrtype 说明：
|
||||||
|
* 0 - 任意字符（默认）
|
||||||
|
* 1 - 纯数字（0-9）
|
||||||
|
* 2 - 纯字母（a-z / A-Z）
|
||||||
|
* 3 - 字母 + 数字（必须同时包含）
|
||||||
|
* 4 - 字母 + 数字 + 特殊字符（必须同时包含，特殊字符：~!@#$%^&*()-=_+）
|
||||||
|
*/
|
||||||
|
import cache from '@/plugins/cache'
|
||||||
|
|
||||||
|
// 各类型对应的正则、错误提示
|
||||||
|
const PWD_RULES = {
|
||||||
|
'0': { pattern: /^[^<>"'|\\]+$/, message: '密码不能包含非法字符：< > " \' \\ |' },
|
||||||
|
'1': { pattern: /^[0-9]+$/, message: '密码只能为数字（0-9）' },
|
||||||
|
'2': { pattern: /^[a-zA-Z]+$/, message: '密码只能为英文字母（a-z、A-Z）' },
|
||||||
|
'3': { pattern: /^(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]+$/, message: '密码必须同时包含字母和数字' },
|
||||||
|
'4': { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[~!@#$%^&*()\-=_+])[A-Za-z\d~!@#$%^&*()\-=_+]+$/, message: '密码必须同时包含字母、数字和特殊字符（~!@#$%^&*()-=_+）' }
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 密码限制类型
|
||||||
|
pwdChrType: cache.session.get('pwrChrtype') || '0'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
// 默认密码校验
|
||||||
|
pwdValidator() {
|
||||||
|
const rule = PWD_RULES[this.pwdChrType] || PWD_RULES['0']
|
||||||
|
return [
|
||||||
|
{ required: true, message: '密码不能为空', trigger: 'blur' },
|
||||||
|
{ min: 6, max: 20, message: '密码长度必须介于 6 和 20 之间', trigger: 'blur' },
|
||||||
|
{ pattern: rule.pattern, message: rule.message, trigger: 'blur' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// 校验prompt的inputValidator函数
|
||||||
|
pwdPromptValidator() {
|
||||||
|
const rule = PWD_RULES['0']
|
||||||
|
return (value) => {
|
||||||
|
if (!value || value.length < 6 || value.length > 20) {
|
||||||
|
return '密码长度必须介于 6 和 20 之间'
|
||||||
|
}
|
||||||
|
if (!rule.pattern.test(value)) {
|
||||||
|
return rule.message
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 个人中心密码校验
|
||||||
|
infoPwdValidator() {
|
||||||
|
const rule = PWD_RULES[this.pwdChrType] || PWD_RULES['0']
|
||||||
|
return [
|
||||||
|
{ required: true, message: '新密码不能为空', trigger: 'blur' },
|
||||||
|
{ min: 6, max: 20, message: '新密码长度必须介于 6 和 20 之间', trigger: 'blur' },
|
||||||
|
{ pattern: rule.pattern, message: rule.message, trigger: 'blur' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// 注册页面密码校验
|
||||||
|
registerPwdValidator() {
|
||||||
|
const rule = PWD_RULES['0']
|
||||||
|
return [
|
||||||
|
{ required: true, message: '请输入您的密码', trigger: 'blur' },
|
||||||
|
{ min: 6, max: 20, message: '用户密码长度必须介于 6 和 20 之间', trigger: 'blur' },
|
||||||
|
{ pattern: rule.pattern, message: rule.message, trigger: 'blur' }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="password" :rules="registerPwdValidator">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="registerForm.password"
|
v-model="registerForm.password"
|
||||||
type="password"
|
type="password"
|
||||||
@@ -68,18 +68,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getCodeImg, register } from "@/api/login"
|
import { getCodeImg, register } from "@/api/login"
|
||||||
|
import passwordRule from "@/utils/passwordRule"
|
||||||
import defaultSettings from '@/settings'
|
import defaultSettings from '@/settings'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Register",
|
mixins: [passwordRule],
|
||||||
data() {
|
data() {
|
||||||
const equalToPassword = (rule, value, callback) => {
|
|
||||||
if (this.registerForm.password !== value) {
|
|
||||||
callback(new Error("两次输入的密码不一致"))
|
|
||||||
} else {
|
|
||||||
callback()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return {
|
return {
|
||||||
title: process.env.VUE_APP_TITLE,
|
title: process.env.VUE_APP_TITLE,
|
||||||
footerContent: defaultSettings.footerContent,
|
footerContent: defaultSettings.footerContent,
|
||||||
@@ -91,24 +85,31 @@ export default {
|
|||||||
code: "",
|
code: "",
|
||||||
uuid: ""
|
uuid: ""
|
||||||
},
|
},
|
||||||
registerRules: {
|
loading: false,
|
||||||
|
captchaEnabled: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
registerRules() {
|
||||||
|
return {
|
||||||
username: [
|
username: [
|
||||||
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
||||||
{ min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
|
{ min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
password: [
|
|
||||||
{ required: true, trigger: "blur", message: "请输入您的密码" },
|
|
||||||
{ min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
|
|
||||||
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
|
|
||||||
],
|
|
||||||
confirmPassword: [
|
confirmPassword: [
|
||||||
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
|
{ required: true, message: "请再次输入您的密码", trigger: "blur" },
|
||||||
{ required: true, validator: equalToPassword, trigger: "blur" }
|
{
|
||||||
|
validator: (rule, value, callback) => {
|
||||||
|
if (this.registerForm.password !== value) {
|
||||||
|
callback(new Error("两次输入的密码不一致"))
|
||||||
|
} else {
|
||||||
|
callback()
|
||||||
|
}
|
||||||
|
}, trigger: "blur"
|
||||||
|
}
|
||||||
],
|
],
|
||||||
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
||||||
},
|
}
|
||||||
loading: false,
|
|
||||||
captchaEnabled: true
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|||||||
@@ -1,476 +1,467 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container tree-sidebar-manage-wrap">
|
<div class="app-container tree-sidebar-manage-wrap">
|
||||||
<tree-panel title="组织机构" :tree-data="deptOptions" search-placeholder="请输入部门名称" storage-key="dept-sidebar-width" :defaultExpandAll="true" @node-click="handleNodeClick" @refresh="getDeptTree" ref="deptTreeRef" />
|
<tree-panel title="组织机构" :tree-data="deptOptions" search-placeholder="请输入部门名称" storage-key="dept-sidebar-width" :defaultExpandAll="true" @node-click="handleNodeClick" @refresh="getDeptTree" ref="deptTreeRef" />
|
||||||
<div class="tree-sidebar-content">
|
<div class="tree-sidebar-content">
|
||||||
<div class="content-inner">
|
<div class="content-inner">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="用户名称" prop="userName">
|
<el-form-item label="用户名称" prop="userName">
|
||||||
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="手机号码" prop="phonenumber">
|
<el-form-item label="手机号码" prop="phonenumber">
|
||||||
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态" prop="status">
|
<el-form-item label="状态" prop="status">
|
||||||
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
|
<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-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="创建时间">
|
<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>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<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>
|
||||||
<el-col :span="1.5">
|
<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>
|
||||||
<el-col :span="1.5">
|
<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>
|
||||||
<el-col :span="1.5">
|
<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>
|
||||||
<el-col :span="1.5">
|
<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>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="50" align="center" />
|
<el-table-column type="selection" width="50" align="center" />
|
||||||
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
|
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
|
||||||
<el-table-column label="用户名称" align="center" key="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true">
|
<el-table-column label="用户名称" align="center" key="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a class="link-type" style="cursor:pointer" @click="handleViewData(scope.row)">{{ scope.row.userName }}</a>
|
<a class="link-type" style="cursor:pointer" @click="handleViewData(scope.row)">{{ scope.row.userName }}</a>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
|
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
|
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
|
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
|
||||||
<el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
|
<el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
|
||||||
<template slot-scope="scope">
|
<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>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.createTime.visible" width="160">
|
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.createTime.visible" width="160">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
|
<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" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</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>
|
<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-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-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<el-dropdown-menu slot="dropdown">
|
||||||
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
|
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
|
||||||
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</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" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 添加或修改用户配置对话框 -->
|
<!-- 添加或修改用户配置对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<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-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="归属部门" prop="deptId">
|
<el-form-item label="归属部门" prop="deptId">
|
||||||
<treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
|
<treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="手机号码" prop="phonenumber">
|
<el-form-item label="手机号码" prop="phonenumber">
|
||||||
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="邮箱" prop="email">
|
<el-form-item label="邮箱" prop="email">
|
||||||
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
|
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
|
||||||
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password" :rules="pwdValidator">
|
||||||
<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-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="用户性别">
|
<el-form-item label="用户性别">
|
||||||
<el-select v-model="form.sex" placeholder="请选择性别">
|
<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-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="状态">
|
<el-form-item label="状态">
|
||||||
<el-radio-group v-model="form.status">
|
<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-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="岗位">
|
<el-form-item label="岗位">
|
||||||
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
|
<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-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="角色">
|
<el-form-item label="角色">
|
||||||
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
|
<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-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="备注">
|
<el-form-item label="备注">
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 用户详情抽屉 -->
|
<!-- 用户详情抽屉 -->
|
||||||
<user-view-drawer ref="userViewRef" />
|
<user-view-drawer ref="userViewRef" />
|
||||||
<!-- 用户导入对话框 -->
|
<!-- 用户导入对话框 -->
|
||||||
<excel-import-dialog ref="importUserRef" title="用户导入" action="/system/user/importData" template-action="/system/user/importTemplate" template-file-name="user_template" update-support-label="是否更新已经存在的用户数据" @success="getList" />
|
<excel-import-dialog ref="importUserRef" title="用户导入" action="/system/user/importData" template-action="/system/user/importTemplate" template-file-name="user_template" update-support-label="是否更新已经存在的用户数据" @success="getList" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<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 Treeselect from "@riophae/vue-treeselect"
|
import Treeselect from "@riophae/vue-treeselect"
|
||||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css"
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css"
|
||||||
import TreePanel from "@/components/TreePanel"
|
import TreePanel from "@/components/TreePanel"
|
||||||
import ExcelImportDialog from "@/components/ExcelImportDialog"
|
import ExcelImportDialog from "@/components/ExcelImportDialog"
|
||||||
import UserViewDrawer from "./view"
|
import UserViewDrawer from "./view"
|
||||||
|
import passwordRule from "@/utils/passwordRule"
|
||||||
export default {
|
|
||||||
name: "User",
|
export default {
|
||||||
dicts: ['sys_normal_disable', 'sys_user_sex'],
|
name: "User",
|
||||||
components: { Treeselect, TreePanel, ExcelImportDialog, UserViewDrawer },
|
mixins: [passwordRule],
|
||||||
data() {
|
dicts: ['sys_normal_disable', 'sys_user_sex'],
|
||||||
return {
|
components: { Treeselect, TreePanel, ExcelImportDialog, UserViewDrawer },
|
||||||
// 遮罩层
|
data() {
|
||||||
loading: true,
|
return {
|
||||||
// 选中数组
|
// 遮罩层
|
||||||
ids: [],
|
loading: true,
|
||||||
// 非单个禁用
|
// 选中数组
|
||||||
single: true,
|
ids: [],
|
||||||
// 非多个禁用
|
// 非单个禁用
|
||||||
multiple: true,
|
single: true,
|
||||||
// 显示搜索条件
|
// 非多个禁用
|
||||||
showSearch: true,
|
multiple: true,
|
||||||
// 总条数
|
// 显示搜索条件
|
||||||
total: 0,
|
showSearch: true,
|
||||||
// 用户表格数据
|
// 总条数
|
||||||
userList: null,
|
total: 0,
|
||||||
// 弹出层标题
|
// 用户表格数据
|
||||||
title: "",
|
userList: null,
|
||||||
// 所有部门树选项
|
// 弹出层标题
|
||||||
deptOptions: undefined,
|
title: "",
|
||||||
// 过滤掉已禁用部门树选项
|
// 所有部门树选项
|
||||||
enabledDeptOptions: undefined,
|
deptOptions: undefined,
|
||||||
// 是否显示弹出层
|
// 过滤掉已禁用部门树选项
|
||||||
open: false,
|
enabledDeptOptions: undefined,
|
||||||
// 默认密码
|
// 是否显示弹出层
|
||||||
initPassword: undefined,
|
open: false,
|
||||||
// 日期范围
|
// 默认密码
|
||||||
dateRange: [],
|
initPassword: undefined,
|
||||||
// 岗位选项
|
// 日期范围
|
||||||
postOptions: [],
|
dateRange: [],
|
||||||
// 角色选项
|
// 岗位选项
|
||||||
roleOptions: [],
|
postOptions: [],
|
||||||
// 表单参数
|
// 角色选项
|
||||||
form: {},
|
roleOptions: [],
|
||||||
// 查询参数
|
// 表单参数
|
||||||
queryParams: {
|
form: {},
|
||||||
pageNum: 1,
|
// 查询参数
|
||||||
pageSize: 10,
|
queryParams: {
|
||||||
userName: undefined,
|
pageNum: 1,
|
||||||
phonenumber: undefined,
|
pageSize: 10,
|
||||||
status: undefined,
|
userName: undefined,
|
||||||
deptId: undefined
|
phonenumber: undefined,
|
||||||
},
|
status: undefined,
|
||||||
// 列信息
|
deptId: undefined
|
||||||
columns: {
|
},
|
||||||
userId: { label: '用户编号', visible: true },
|
// 列信息
|
||||||
userName: { label: '用户名称', visible: true },
|
columns: {
|
||||||
nickName: { label: '用户昵称', visible: true },
|
userId: { label: '用户编号', visible: true },
|
||||||
deptName: { label: '部门', visible: true },
|
userName: { label: '用户名称', visible: true },
|
||||||
phonenumber: { label: '手机号码', visible: true },
|
nickName: { label: '用户昵称', visible: true },
|
||||||
status: { label: '状态', visible: true },
|
deptName: { label: '部门', visible: true },
|
||||||
createTime: { label: '创建时间', visible: true }
|
phonenumber: { label: '手机号码', visible: true },
|
||||||
},
|
status: { label: '状态', visible: true },
|
||||||
// 表单校验
|
createTime: { label: '创建时间', visible: true }
|
||||||
rules: {
|
},
|
||||||
userName: [
|
// 表单校验
|
||||||
{ required: true, message: "用户名称不能为空", trigger: "blur" },
|
rules: {
|
||||||
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
userName: [
|
||||||
],
|
{ required: true, message: "用户名称不能为空", trigger: "blur" },
|
||||||
nickName: [
|
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
||||||
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
|
],
|
||||||
],
|
nickName: [
|
||||||
password: [
|
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
|
||||||
{ required: true, message: "用户密码不能为空", trigger: "blur" },
|
],
|
||||||
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
|
email: [
|
||||||
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
|
{
|
||||||
],
|
type: "email",
|
||||||
email: [
|
message: "请输入正确的邮箱地址",
|
||||||
{
|
trigger: ["blur", "change"]
|
||||||
type: "email",
|
}
|
||||||
message: "请输入正确的邮箱地址",
|
],
|
||||||
trigger: ["blur", "change"]
|
phonenumber: [
|
||||||
}
|
{
|
||||||
],
|
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
||||||
phonenumber: [
|
message: "请输入正确的手机号码",
|
||||||
{
|
trigger: "blur"
|
||||||
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
}
|
||||||
message: "请输入正确的手机号码",
|
]
|
||||||
trigger: "blur"
|
}
|
||||||
}
|
}
|
||||||
]
|
},
|
||||||
}
|
created() {
|
||||||
}
|
this.getList()
|
||||||
},
|
this.getDeptTree()
|
||||||
created() {
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
||||||
this.getList()
|
this.initPassword = response.msg
|
||||||
this.getDeptTree()
|
})
|
||||||
this.getConfigKey("sys.user.initPassword").then(response => {
|
},
|
||||||
this.initPassword = response.msg
|
methods: {
|
||||||
})
|
/** 查询用户列表 */
|
||||||
},
|
getList() {
|
||||||
methods: {
|
this.loading = true
|
||||||
/** 查询用户列表 */
|
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
||||||
getList() {
|
this.userList = response.rows
|
||||||
this.loading = true
|
this.total = response.total
|
||||||
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
this.loading = false
|
||||||
this.userList = response.rows
|
})
|
||||||
this.total = response.total
|
},
|
||||||
this.loading = false
|
/** 查询部门下拉树结构 */
|
||||||
})
|
getDeptTree() {
|
||||||
},
|
deptTreeSelect().then(response => {
|
||||||
/** 查询部门下拉树结构 */
|
this.deptOptions = response.data
|
||||||
getDeptTree() {
|
this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
|
||||||
deptTreeSelect().then(response => {
|
})
|
||||||
this.deptOptions = response.data
|
},
|
||||||
this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
|
// 过滤禁用的部门
|
||||||
})
|
filterDisabledDept(deptList) {
|
||||||
},
|
return deptList.filter(dept => {
|
||||||
// 过滤禁用的部门
|
if (dept.disabled) {
|
||||||
filterDisabledDept(deptList) {
|
return false
|
||||||
return deptList.filter(dept => {
|
}
|
||||||
if (dept.disabled) {
|
if (dept.children && dept.children.length) {
|
||||||
return false
|
dept.children = this.filterDisabledDept(dept.children)
|
||||||
}
|
}
|
||||||
if (dept.children && dept.children.length) {
|
return true
|
||||||
dept.children = this.filterDisabledDept(dept.children)
|
})
|
||||||
}
|
},
|
||||||
return true
|
// 节点单击事件
|
||||||
})
|
handleNodeClick(data) {
|
||||||
},
|
this.queryParams.deptId = data.id
|
||||||
// 节点单击事件
|
this.handleQuery()
|
||||||
handleNodeClick(data) {
|
},
|
||||||
this.queryParams.deptId = data.id
|
// 用户状态修改
|
||||||
this.handleQuery()
|
handleStatusChange(row) {
|
||||||
},
|
let text = row.status === "0" ? "启用" : "停用"
|
||||||
// 用户状态修改
|
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
|
||||||
handleStatusChange(row) {
|
return changeUserStatus(row.userId, row.status)
|
||||||
let text = row.status === "0" ? "启用" : "停用"
|
}).then(() => {
|
||||||
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
|
this.$modal.msgSuccess(text + "成功")
|
||||||
return changeUserStatus(row.userId, row.status)
|
}).catch(function() {
|
||||||
}).then(() => {
|
row.status = row.status === "0" ? "1" : "0"
|
||||||
this.$modal.msgSuccess(text + "成功")
|
})
|
||||||
}).catch(function() {
|
},
|
||||||
row.status = row.status === "0" ? "1" : "0"
|
// 取消按钮
|
||||||
})
|
cancel() {
|
||||||
},
|
this.open = false
|
||||||
// 取消按钮
|
this.reset()
|
||||||
cancel() {
|
},
|
||||||
this.open = false
|
// 表单重置
|
||||||
this.reset()
|
reset() {
|
||||||
},
|
this.form = {
|
||||||
// 表单重置
|
userId: undefined,
|
||||||
reset() {
|
deptId: undefined,
|
||||||
this.form = {
|
userName: undefined,
|
||||||
userId: undefined,
|
nickName: undefined,
|
||||||
deptId: undefined,
|
password: undefined,
|
||||||
userName: undefined,
|
phonenumber: undefined,
|
||||||
nickName: undefined,
|
email: undefined,
|
||||||
password: undefined,
|
sex: undefined,
|
||||||
phonenumber: undefined,
|
status: "0",
|
||||||
email: undefined,
|
remark: undefined,
|
||||||
sex: undefined,
|
postIds: [],
|
||||||
status: "0",
|
roleIds: []
|
||||||
remark: undefined,
|
}
|
||||||
postIds: [],
|
this.resetForm("form")
|
||||||
roleIds: []
|
},
|
||||||
}
|
/** 搜索按钮操作 */
|
||||||
this.resetForm("form")
|
handleQuery() {
|
||||||
},
|
this.queryParams.pageNum = 1
|
||||||
/** 搜索按钮操作 */
|
this.getList()
|
||||||
handleQuery() {
|
},
|
||||||
this.queryParams.pageNum = 1
|
/** 重置按钮操作 */
|
||||||
this.getList()
|
resetQuery() {
|
||||||
},
|
this.dateRange = []
|
||||||
/** 重置按钮操作 */
|
this.resetForm("queryForm")
|
||||||
resetQuery() {
|
this.queryParams.deptId = undefined
|
||||||
this.dateRange = []
|
this.$refs.deptTreeRef.setCurrentKey(null)
|
||||||
this.resetForm("queryForm")
|
this.handleQuery()
|
||||||
this.queryParams.deptId = undefined
|
},
|
||||||
this.$refs.deptTreeRef.setCurrentKey(null)
|
// 多选框选中数据
|
||||||
this.handleQuery()
|
handleSelectionChange(selection) {
|
||||||
},
|
this.ids = selection.map(item => item.userId)
|
||||||
// 多选框选中数据
|
this.single = selection.length != 1
|
||||||
handleSelectionChange(selection) {
|
this.multiple = !selection.length
|
||||||
this.ids = selection.map(item => item.userId)
|
},
|
||||||
this.single = selection.length != 1
|
// 更多操作触发
|
||||||
this.multiple = !selection.length
|
handleCommand(command, row) {
|
||||||
},
|
switch (command) {
|
||||||
// 更多操作触发
|
case "handleResetPwd":
|
||||||
handleCommand(command, row) {
|
this.handleResetPwd(row)
|
||||||
switch (command) {
|
break
|
||||||
case "handleResetPwd":
|
case "handleAuthRole":
|
||||||
this.handleResetPwd(row)
|
this.handleAuthRole(row)
|
||||||
break
|
break
|
||||||
case "handleAuthRole":
|
default:
|
||||||
this.handleAuthRole(row)
|
break
|
||||||
break
|
}
|
||||||
default:
|
},
|
||||||
break
|
/** 新增按钮操作 */
|
||||||
}
|
handleAdd() {
|
||||||
},
|
this.reset()
|
||||||
/** 新增按钮操作 */
|
getUser().then(response => {
|
||||||
handleAdd() {
|
this.postOptions = response.posts
|
||||||
this.reset()
|
this.roleOptions = response.roles
|
||||||
getUser().then(response => {
|
this.open = true
|
||||||
this.postOptions = response.posts
|
this.title = "添加用户"
|
||||||
this.roleOptions = response.roles
|
this.form.password = this.initPassword
|
||||||
this.open = true
|
})
|
||||||
this.title = "添加用户"
|
},
|
||||||
this.form.password = this.initPassword
|
/** 修改按钮操作 */
|
||||||
})
|
handleUpdate(row) {
|
||||||
},
|
this.reset()
|
||||||
/** 修改按钮操作 */
|
const userId = row.userId || this.ids
|
||||||
handleUpdate(row) {
|
getUser(userId).then(response => {
|
||||||
this.reset()
|
this.form = response.data
|
||||||
const userId = row.userId || this.ids
|
this.postOptions = response.posts
|
||||||
getUser(userId).then(response => {
|
this.roleOptions = response.roles
|
||||||
this.form = response.data
|
this.$set(this.form, "postIds", response.postIds)
|
||||||
this.postOptions = response.posts
|
this.$set(this.form, "roleIds", response.roleIds)
|
||||||
this.roleOptions = response.roles
|
this.open = true
|
||||||
this.$set(this.form, "postIds", response.postIds)
|
this.title = "修改用户"
|
||||||
this.$set(this.form, "roleIds", response.roleIds)
|
this.form.password = ""
|
||||||
this.open = true
|
})
|
||||||
this.title = "修改用户"
|
},
|
||||||
this.form.password = ""
|
/** 重置密码按钮操作 */
|
||||||
})
|
handleResetPwd(row) {
|
||||||
},
|
this.$prompt(`请输入「${row.userName}」的新密码`, "重置密码", {
|
||||||
/** 重置密码按钮操作 */
|
confirmButtonText: "确定",
|
||||||
handleResetPwd(row) {
|
cancelButtonText: "取消",
|
||||||
this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
|
closeOnClickModal: false,
|
||||||
confirmButtonText: "确定",
|
inputValidator: this.pwdPromptValidator
|
||||||
cancelButtonText: "取消",
|
}).then(({ value }) => {
|
||||||
closeOnClickModal: false,
|
resetUserPwd(row.userId, value).then(() => {
|
||||||
inputPattern: /^.{5,20}$/,
|
this.$modal.msgSuccess("修改成功，新密码是：" + value)
|
||||||
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
|
})
|
||||||
inputValidator: (value) => {
|
}).catch(() => {})
|
||||||
if (/<|>|"|'|\||\\/.test(value)) {
|
},
|
||||||
return "不能包含非法字符：< > \" ' \\\ |"
|
/** 分配角色操作 */
|
||||||
}
|
handleAuthRole(row) {
|
||||||
},
|
const userId = row.userId
|
||||||
}).then(({ value }) => {
|
this.$router.push("/system/user-auth/role/" + userId)
|
||||||
resetUserPwd(row.userId, value).then(() => {
|
},
|
||||||
this.$modal.msgSuccess("修改成功，新密码是：" + value)
|
/** 提交按钮 */
|
||||||
})
|
submitForm() {
|
||||||
}).catch(() => {})
|
this.$refs["form"].validate(valid => {
|
||||||
},
|
if (valid) {
|
||||||
/** 分配角色操作 */
|
if (this.form.userId != undefined) {
|
||||||
handleAuthRole(row) {
|
updateUser(this.form).then(() => {
|
||||||
const userId = row.userId
|
this.$modal.msgSuccess("修改成功")
|
||||||
this.$router.push("/system/user-auth/role/" + userId)
|
this.open = false
|
||||||
},
|
this.getList()
|
||||||
/** 提交按钮 */
|
})
|
||||||
submitForm() {
|
} else {
|
||||||
this.$refs["form"].validate(valid => {
|
addUser(this.form).then(() => {
|
||||||
if (valid) {
|
this.$modal.msgSuccess("新增成功")
|
||||||
if (this.form.userId != undefined) {
|
this.open = false
|
||||||
updateUser(this.form).then(() => {
|
this.getList()
|
||||||
this.$modal.msgSuccess("修改成功")
|
})
|
||||||
this.open = false
|
}
|
||||||
this.getList()
|
}
|
||||||
})
|
})
|
||||||
} else {
|
},
|
||||||
addUser(this.form).then(() => {
|
/** 删除按钮操作 */
|
||||||
this.$modal.msgSuccess("新增成功")
|
handleDelete(row) {
|
||||||
this.open = false
|
const userIds = row.userId || this.ids
|
||||||
this.getList()
|
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
|
||||||
})
|
return delUser(userIds)
|
||||||
}
|
}).then(() => {
|
||||||
}
|
this.getList()
|
||||||
})
|
this.$modal.msgSuccess("删除成功")
|
||||||
},
|
}).catch(() => {})
|
||||||
/** 删除按钮操作 */
|
},
|
||||||
handleDelete(row) {
|
/** 导出按钮操作 */
|
||||||
const userIds = row.userId || this.ids
|
handleExport() {
|
||||||
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
|
this.download('system/user/export', {
|
||||||
return delUser(userIds)
|
...this.queryParams
|
||||||
}).then(() => {
|
}, `user_${new Date().getTime()}.xlsx`)
|
||||||
this.getList()
|
},
|
||||||
this.$modal.msgSuccess("删除成功")
|
/** 详情按钮操作 */
|
||||||
}).catch(() => {})
|
handleViewData(row) {
|
||||||
},
|
this.$refs.userViewRef.open(row.userId)
|
||||||
/** 导出按钮操作 */
|
},
|
||||||
handleExport() {
|
/** 导入按钮操作 */
|
||||||
this.download('system/user/export', {
|
handleImport() {
|
||||||
...this.queryParams
|
this.$refs.importUserRef.open()
|
||||||
}, `user_${new Date().getTime()}.xlsx`)
|
}
|
||||||
},
|
}
|
||||||
/** 详情按钮操作 */
|
}
|
||||||
handleViewData(row) {
|
</script>
|
||||||
this.$refs.userViewRef.open(row.userId)
|
|
||||||
},
|
|
||||||
/** 导入按钮操作 */
|
|
||||||
handleImport() {
|
|
||||||
this.$refs.importUserRef.open()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|||||||
@@ -1,69 +1,70 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-form ref="form" :model="user" :rules="rules" label-width="80px">
|
<el-form ref="form" :model="user" :rules="formRules" label-width="80px">
|
||||||
<el-form-item label="旧密码" prop="oldPassword">
|
<el-form-item label="旧密码" prop="oldPassword">
|
||||||
<el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
|
<el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="新密码" prop="newPassword">
|
<el-form-item label="新密码" prop="newPassword" :rules="infoPwdValidator">
|
||||||
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
|
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="确认密码" prop="confirmPassword">
|
<el-form-item label="确认密码" prop="confirmPassword">
|
||||||
<el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
|
<el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" size="mini" @click="submit">保存</el-button>
|
<el-button type="primary" size="mini" @click="submit">保存</el-button>
|
||||||
<el-button type="danger" size="mini" @click="close">关闭</el-button>
|
<el-button type="danger" size="mini" @click="close">关闭</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { updateUserPwd } from "@/api/system/user"
|
import { updateUserPwd } from "@/api/system/user"
|
||||||
|
import passwordRule from "@/utils/passwordRule"
|
||||||
export default {
|
|
||||||
data() {
|
export default {
|
||||||
const equalToPassword = (rule, value, callback) => {
|
mixins: [passwordRule],
|
||||||
if (this.user.newPassword !== value) {
|
data() {
|
||||||
callback(new Error("两次输入的密码不一致"))
|
return {
|
||||||
} else {
|
user: {
|
||||||
callback()
|
oldPassword: undefined,
|
||||||
}
|
newPassword: undefined,
|
||||||
}
|
confirmPassword: undefined
|
||||||
return {
|
}
|
||||||
user: {
|
}
|
||||||
oldPassword: undefined,
|
},
|
||||||
newPassword: undefined,
|
computed: {
|
||||||
confirmPassword: undefined
|
formRules() {
|
||||||
},
|
return {
|
||||||
// 表单校验
|
oldPassword: [
|
||||||
rules: {
|
{ required: true, message: "旧密码不能为空", trigger: "blur" }
|
||||||
oldPassword: [
|
],
|
||||||
{ required: true, message: "旧密码不能为空", trigger: "blur" }
|
confirmPassword: [
|
||||||
],
|
{ required: true, message: "确认密码不能为空", trigger: "blur" },
|
||||||
newPassword: [
|
{
|
||||||
{ required: true, message: "新密码不能为空", trigger: "blur" },
|
validator: (rule, value, callback) => {
|
||||||
{ min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
|
if (this.user.newPassword !== value) {
|
||||||
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
|
callback(new Error("两次输入的密码不一致"))
|
||||||
],
|
} else {
|
||||||
confirmPassword: [
|
callback()
|
||||||
{ required: true, message: "确认密码不能为空", trigger: "blur" },
|
}
|
||||||
{ required: true, validator: equalToPassword, trigger: "blur" }
|
}, trigger: "blur"
|
||||||
]
|
}
|
||||||
}
|
]
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
methods: {
|
},
|
||||||
submit() {
|
methods: {
|
||||||
this.$refs["form"].validate(valid => {
|
submit() {
|
||||||
if (valid) {
|
this.$refs["form"].validate(valid => {
|
||||||
updateUserPwd(this.user.oldPassword, this.user.newPassword).then(() => {
|
if (valid) {
|
||||||
this.$modal.msgSuccess("修改成功")
|
updateUserPwd(this.user.oldPassword, this.user.newPassword).then(() => {
|
||||||
})
|
this.$modal.msgSuccess("修改成功")
|
||||||
}
|
})
|
||||||
})
|
}
|
||||||
},
|
})
|
||||||
close() {
|
},
|
||||||
this.$tab.closePage()
|
close() {
|
||||||
}
|
this.$tab.closePage()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
}
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -553,6 +553,7 @@ insert into sys_config values(5, '账号自助-是否开启用户注册功能',
|
|||||||
insert into sys_config values(6, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
|
insert into sys_config values(6, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
|
||||||
insert into sys_config values(7, '用户管理-初始密码修改策略', 'sys.account.initPasswordModify', '1', 'Y', 'admin', sysdate(), '', null, '0：初始密码修改策略关闭，没有任何提示，1：提醒用户，如果未修改初始密码，则在登录时就会提醒修改密码对话框');
|
insert into sys_config values(7, '用户管理-初始密码修改策略', 'sys.account.initPasswordModify', '1', 'Y', 'admin', sysdate(), '', null, '0：初始密码修改策略关闭，没有任何提示，1：提醒用户，如果未修改初始密码，则在登录时就会提醒修改密码对话框');
|
||||||
insert into sys_config values(8, '用户管理-账号密码更新周期', 'sys.account.passwordValidateDays', '0', 'Y', 'admin', sysdate(), '', null, '密码更新周期（填写数字，数据初始化值为0不限制，若修改必须为大于0小于365的正整数），如果超过这个周期登录系统时，则在登录时就会提醒修改密码对话框');
|
insert into sys_config values(8, '用户管理-账号密码更新周期', 'sys.account.passwordValidateDays', '0', 'Y', 'admin', sysdate(), '', null, '密码更新周期（填写数字，数据初始化值为0不限制，若修改必须为大于0小于365的正整数），如果超过这个周期登录系统时，则在登录时就会提醒修改密码对话框');
|
||||||
|
insert into sys_config values(9, '用户管理-密码字符范围', 'sys.account.chrtype', '0', 'Y', 'admin', sysdate(), '', null, '默认任意字符范围，0任意（密码可以输入任意字符），1数字（密码只能为0-9数字），2英文字母（密码只能为a-z和A-Z字母），3字母和数字（密码必须包含字母，数字）,4字母数字和特殊字符（目前支持的特殊字符包括：~!@#$%^&*()-=_+）');
|
||||||
|
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
Reference in New Issue
Block a user