update by fq
This commit is contained in:
@ -1,21 +1,43 @@
|
|||||||
export const sys_normal_disable = [{
|
export const sys_normal_disable = [
|
||||||
label: "禁用",
|
|
||||||
value: "0",
|
|
||||||
elTagType: "warning"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: "正常",
|
label: "正常",
|
||||||
value: "1",
|
value: "1",
|
||||||
elTagType: "success"
|
elTagType: "success"
|
||||||
}]
|
},
|
||||||
|
{
|
||||||
|
label: "禁用",
|
||||||
|
value: "0",
|
||||||
|
elTagType: "warning"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
export const menu_show_hide = [{
|
export const sys_user_gender = [
|
||||||
|
{
|
||||||
|
label: "男",
|
||||||
|
value: "0",
|
||||||
|
elTagType: "success"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "女",
|
||||||
|
value: "1",
|
||||||
|
elTagType: "warning"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "未知",
|
||||||
|
value: "2",
|
||||||
|
elTagType: "warning"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
export const menu_show_hide = [
|
||||||
|
{
|
||||||
label: "隐藏",
|
label: "隐藏",
|
||||||
value: "0",
|
value: "0",
|
||||||
elTagType: "warning"
|
elTagType: "warning"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "显示",
|
label: "显示",
|
||||||
value: "1",
|
value: "1",
|
||||||
elTagType: "success"
|
elTagType: "success"
|
||||||
}]
|
}
|
||||||
|
]
|
@ -55,15 +55,17 @@ export function resetForm(refName) {
|
|||||||
|
|
||||||
// 添加日期范围
|
// 添加日期范围
|
||||||
export function addDateRange(params, dateRange, propName) {
|
export function addDateRange(params, dateRange, propName) {
|
||||||
let search = params;
|
let search = JSON.parse(JSON.stringify(params));
|
||||||
search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
|
|
||||||
dateRange = Array.isArray(dateRange) ? dateRange : [];
|
dateRange = Array.isArray(dateRange) ? dateRange : [];
|
||||||
|
if(dateRange.length < 2){
|
||||||
|
return search;
|
||||||
|
}
|
||||||
if (typeof (propName) === 'undefined') {
|
if (typeof (propName) === 'undefined') {
|
||||||
search.params['beginTime'] = dateRange[0];
|
search['beginTime'] = dateRange[0] + ' 00:00:00';
|
||||||
search.params['endTime'] = dateRange[1];
|
search['endTime'] = dateRange[1] + ' 23:59:59';
|
||||||
} else {
|
} else {
|
||||||
search.params['begin' + propName] = dateRange[0];
|
search['begin' + propName] = dateRange[0] + ' 00:00:00';
|
||||||
search.params['end' + propName] = dateRange[1];
|
search['end' + propName] = dateRange[1] + ' 23:59:59';
|
||||||
}
|
}
|
||||||
return search;
|
return search;
|
||||||
}
|
}
|
||||||
|
@ -155,7 +155,6 @@ import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} f
|
|||||||
import {sys_normal_disable} from "@/constant/dict";
|
import {sys_normal_disable} from "@/constant/dict";
|
||||||
|
|
||||||
const {proxy} = getCurrentInstance();
|
const {proxy} = getCurrentInstance();
|
||||||
// const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
|
|
||||||
|
|
||||||
const deptList = ref([]);
|
const deptList = ref([]);
|
||||||
const open = ref(false);
|
const open = ref(false);
|
||||||
|
@ -10,16 +10,16 @@
|
|||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="状态" prop="status">-->
|
<el-form-item label="展示状态" prop="isVisible">
|
||||||
<!-- <el-select v-model="queryParams.status" clearable placeholder="菜单状态" style="width: 200px">-->
|
<el-select v-model="queryParams.isVisible" clearable placeholder="展示状态" style="width: 200px">
|
||||||
<!-- <el-option-->
|
<el-option
|
||||||
<!-- v-for="dict in sys_normal_disable"-->
|
v-for="dict in sys_normal_disable"
|
||||||
<!-- :key="dict.value"-->
|
:key="dict.value"
|
||||||
<!-- :label="dict.label"-->
|
:label="dict.label"
|
||||||
<!-- :value="dict.value"-->
|
:value="dict.value"
|
||||||
<!-- />-->
|
/>
|
||||||
<!-- </el-select>-->
|
</el-select>
|
||||||
<!-- </el-form-item>-->
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button icon="Search" type="primary" @click="handleQuery">搜索</el-button>
|
<el-button icon="Search" type="primary" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||||
@ -309,7 +309,7 @@ import SvgIcon from "@/components/SvgIcon";
|
|||||||
import IconSelect from "@/components/IconSelect";
|
import IconSelect from "@/components/IconSelect";
|
||||||
import {ClickOutside as vClickOutside} from 'element-plus'
|
import {ClickOutside as vClickOutside} from 'element-plus'
|
||||||
import {menu_show_hide} from "@/constant/dict";
|
import {menu_show_hide} from "@/constant/dict";
|
||||||
|
import {sys_normal_disable} from "@/constant/dict";
|
||||||
const {proxy} = getCurrentInstance();
|
const {proxy} = getCurrentInstance();
|
||||||
|
|
||||||
const menuList = ref([]);
|
const menuList = ref([]);
|
||||||
|
@ -146,9 +146,9 @@
|
|||||||
|
|
||||||
<script setup name="Post">
|
<script setup name="Post">
|
||||||
import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post";
|
import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post";
|
||||||
|
import {sys_normal_disable} from "@/constant/dict";
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance();
|
const { proxy } = getCurrentInstance();
|
||||||
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
|
|
||||||
|
|
||||||
const postList = ref([]);
|
const postList = ref([]);
|
||||||
const open = ref(false);
|
const open = ref(false);
|
||||||
|
@ -389,8 +389,8 @@ function handleSelectionChange(selection) {
|
|||||||
|
|
||||||
/** 角色状态修改 */
|
/** 角色状态修改 */
|
||||||
function handleStatusChange(row) {
|
function handleStatusChange(row) {
|
||||||
let text = row.status === "0" ? "启用" : "停用";
|
let text = row.status === "1" ? "启用" : "停用";
|
||||||
proxy.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function () {
|
proxy.$modal.confirm('确认要' + text + '"' + row.roleName + '"角色吗?').then(function () {
|
||||||
return changeRoleStatus(row.roleId, row.status);
|
return changeRoleStatus(row.roleId, row.status);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
proxy.$modal.msgSuccess(text + "成功");
|
proxy.$modal.msgSuccess(text + "成功");
|
||||||
|
@ -4,20 +4,21 @@
|
|||||||
<el-form :model="form" label-width="80px">
|
<el-form :model="form" label-width="80px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8" :offset="2">
|
<el-col :span="8" :offset="2">
|
||||||
<el-form-item label="用户昵称" prop="nickName">
|
<el-form-item label="用户昵称" prop="nickname">
|
||||||
<el-input v-model="form.nickName" disabled />
|
<el-input v-model="form.nickname" disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8" :offset="2">
|
<el-col :span="8" :offset="2">
|
||||||
<el-form-item label="登录账号" prop="userName">
|
<el-form-item label="登录账号" prop="username">
|
||||||
<el-input v-model="form.userName" disabled />
|
<el-input v-model="form.username" disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<h4 class="form-header h4">角色信息</h4>
|
<h4 class="form-header h4">角色信息</h4>
|
||||||
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
|
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef"
|
||||||
|
@selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
|
||||||
<el-table-column label="序号" width="55" type="index" align="center">
|
<el-table-column label="序号" width="55" type="index" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
|
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
|
||||||
@ -57,6 +58,7 @@ const pageNum = ref(1);
|
|||||||
const pageSize = ref(10);
|
const pageSize = ref(10);
|
||||||
const roleIds = ref([]);
|
const roleIds = ref([]);
|
||||||
const roles = ref([]);
|
const roles = ref([]);
|
||||||
|
|
||||||
const form = ref({
|
const form = ref({
|
||||||
nickName: undefined,
|
nickName: undefined,
|
||||||
userName: undefined,
|
userName: undefined,
|
||||||
@ -97,13 +99,13 @@ function submitForm() {
|
|||||||
getAuthRole(userId).then(response => {
|
getAuthRole(userId).then(response => {
|
||||||
form.value = response.user;
|
form.value = response.user;
|
||||||
roles.value = response.roles;
|
roles.value = response.roles;
|
||||||
|
const hasRoleIds = response.hasRoleIds
|
||||||
total.value = roles.value.length;
|
total.value = roles.value.length;
|
||||||
nextTick(() => {
|
nextTick(() => {
|
||||||
roles.value.forEach(row => {
|
hasRoleIds.forEach((roleId) => {
|
||||||
if (row.flag) {
|
const role = roles.value.find(row => row.roleId === roleId)
|
||||||
proxy.$refs["roleRef"].toggleRowSelection(row);
|
role && proxy.$refs["roleRef"].toggleRowSelection(role);
|
||||||
}
|
})
|
||||||
});
|
|
||||||
});
|
});
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
});
|
});
|
||||||
|
@ -29,18 +29,18 @@
|
|||||||
<!--用户数据-->
|
<!--用户数据-->
|
||||||
<el-col :span="20" :xs="24">
|
<el-col :span="20" :xs="24">
|
||||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="用户名称" prop="userName">
|
<el-form-item label="姓名" prop="nickname">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.userName"
|
v-model="queryParams.nickname"
|
||||||
placeholder="请输入用户名称"
|
placeholder="请输入姓名"
|
||||||
clearable
|
clearable
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="手机号码" prop="phonenumber">
|
<el-form-item label="手机号码" prop="phone">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.phonenumber"
|
v-model="queryParams.phone"
|
||||||
placeholder="请输入手机号码"
|
placeholder="请输入手机号码"
|
||||||
clearable
|
clearable
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
@ -132,16 +132,16 @@
|
|||||||
<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[0].visible" />
|
<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="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="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="deptName" prop="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="phone" prop="phone" 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="status" v-if="columns[5].visible">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-switch
|
<el-switch
|
||||||
v-model="scope.row.status"
|
v-model="scope.row.status"
|
||||||
active-value="0"
|
active-value="1"
|
||||||
inactive-value="1"
|
inactive-value="0"
|
||||||
@change="handleStatusChange(scope.row)"
|
@change="handleStatusChange(scope.row)"
|
||||||
></el-switch>
|
></el-switch>
|
||||||
</template>
|
</template>
|
||||||
@ -183,27 +183,27 @@
|
|||||||
<el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
|
<el-form :model="form" :rules="rules" ref="userRef" 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="性别">
|
||||||
<el-tree-select
|
<el-select v-model="form.gender" placeholder="请选择">
|
||||||
v-model="form.deptId"
|
<el-option
|
||||||
:data="deptOptions"
|
v-for="dict in sys_user_gender"
|
||||||
:props="{ value: 'id', label: 'label', children: 'children' }"
|
:key="dict.value"
|
||||||
value-key="id"
|
:label="dict.label"
|
||||||
placeholder="请选择归属部门"
|
:value="dict.value"
|
||||||
check-strictly
|
></el-option>
|
||||||
/>
|
</el-select>
|
||||||
</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="phone">
|
||||||
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
@ -214,25 +214,39 @@
|
|||||||
</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 label="部门" prop="deptId">
|
||||||
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
<el-tree-select
|
||||||
|
v-model="form.deptId"
|
||||||
|
:data="deptOptions"
|
||||||
|
:props="{ value: 'id', label: 'label', children: 'children' }"
|
||||||
|
value-key="id"
|
||||||
|
placeholder="请选择部门"
|
||||||
|
check-strictly
|
||||||
|
/>
|
||||||
</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 label="岗位">
|
||||||
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
|
<el-select v-model="form.postIds" multiple placeholder="请选择">
|
||||||
|
<el-option
|
||||||
|
v-for="item in postOptions"
|
||||||
|
:key="item.postId"
|
||||||
|
:label="item.postName"
|
||||||
|
:value="item.postId"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
</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.roleIds" multiple placeholder="请选择">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in sys_user_sex"
|
v-for="item in roleOptions"
|
||||||
:key="dict.value"
|
:key="item.roleId"
|
||||||
:label="dict.label"
|
:label="item.roleName"
|
||||||
:value="dict.value"
|
:value="item.roleId"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -251,29 +265,13 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="岗位">
|
<el-form-item v-if="form.userId == undefined" label="登录账号" prop="username">
|
||||||
<el-select v-model="form.postIds" multiple placeholder="请选择">
|
<el-input v-model="form.username" placeholder="请输入登录账号" maxlength="30" autocomplete="off"/>
|
||||||
<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-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="角色">
|
<el-form-item v-if="form.userId == undefined" label="登录密码" prop="password">
|
||||||
<el-select v-model="form.roleIds" multiple placeholder="请选择">
|
<el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="20" show-password autocomplete="off" />
|
||||||
<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-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -332,10 +330,9 @@
|
|||||||
<script setup name="User">
|
<script setup name="User">
|
||||||
import { getToken } from "@/utils/auth";
|
import { getToken } from "@/utils/auth";
|
||||||
import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
|
import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
|
||||||
|
import {sys_normal_disable,sys_user_gender} from "@/constant/dict";
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { proxy } = getCurrentInstance();
|
const { proxy } = getCurrentInstance();
|
||||||
const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
|
|
||||||
|
|
||||||
const userList = ref([]);
|
const userList = ref([]);
|
||||||
const open = ref(false);
|
const open = ref(false);
|
||||||
@ -370,8 +367,8 @@ const upload = reactive({
|
|||||||
// 列显隐信息
|
// 列显隐信息
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{ key: 0, label: `用户编号`, visible: true },
|
{ key: 0, label: `用户编号`, visible: true },
|
||||||
{ key: 1, label: `用户名称`, visible: true },
|
{ key: 1, label: `登录账号`, visible: true },
|
||||||
{ key: 2, label: `用户昵称`, visible: true },
|
{ key: 2, label: `姓名`, visible: true },
|
||||||
{ key: 3, label: `部门`, visible: true },
|
{ key: 3, label: `部门`, visible: true },
|
||||||
{ key: 4, label: `手机号码`, visible: true },
|
{ key: 4, label: `手机号码`, visible: true },
|
||||||
{ key: 5, label: `状态`, visible: true },
|
{ key: 5, label: `状态`, visible: true },
|
||||||
@ -383,17 +380,18 @@ const data = reactive({
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
isDelete: '0',
|
||||||
userName: undefined,
|
userName: undefined,
|
||||||
phonenumber: undefined,
|
phone: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
deptId: undefined
|
deptId: undefined
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
|
userName: [{ required: true, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "登录账号长度必须介于 2 和 20 之间", trigger: "blur" }],
|
||||||
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
|
nickName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
|
||||||
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
|
password: [{ required: true, message: "登录密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "登录密码长度必须介于 5 和 20 之间", trigger: "blur" }],
|
||||||
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
||||||
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
|
phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -439,6 +437,7 @@ function resetQuery() {
|
|||||||
proxy.resetForm("queryRef");
|
proxy.resetForm("queryRef");
|
||||||
queryParams.value.deptId = undefined;
|
queryParams.value.deptId = undefined;
|
||||||
proxy.$refs.deptTreeRef.setCurrentKey(null);
|
proxy.$refs.deptTreeRef.setCurrentKey(null);
|
||||||
|
console.log(queryParams.value);
|
||||||
handleQuery();
|
handleQuery();
|
||||||
};
|
};
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
@ -459,8 +458,8 @@ function handleExport() {
|
|||||||
};
|
};
|
||||||
/** 用户状态修改 */
|
/** 用户状态修改 */
|
||||||
function handleStatusChange(row) {
|
function handleStatusChange(row) {
|
||||||
let text = row.status === "0" ? "启用" : "停用";
|
let text = row.status === "1" ? "启用" : "停用";
|
||||||
proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
|
proxy.$modal.confirm('确认要' + text + '"' + row.nickname + '"用户吗?').then(function () {
|
||||||
return changeUserStatus(row.userId, row.status);
|
return changeUserStatus(row.userId, row.status);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
proxy.$modal.msgSuccess(text + "成功");
|
proxy.$modal.msgSuccess(text + "成功");
|
||||||
@ -488,12 +487,12 @@ function handleAuthRole(row) {
|
|||||||
};
|
};
|
||||||
/** 重置密码按钮操作 */
|
/** 重置密码按钮操作 */
|
||||||
function handleResetPwd(row) {
|
function handleResetPwd(row) {
|
||||||
proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
|
proxy.$prompt('请输入"' + row.nickname + '"的新密码', "提示", {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
cancelButtonText: "取消",
|
cancelButtonText: "取消",
|
||||||
closeOnClickModal: false,
|
closeOnClickModal: false,
|
||||||
inputPattern: /^.{5,20}$/,
|
inputPattern: /^.{5,20}$/,
|
||||||
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
|
inputErrorMessage: "登录密码长度必须介于 5 和 20 之间",
|
||||||
}).then(({ value }) => {
|
}).then(({ value }) => {
|
||||||
resetUserPwd(row.userId, value).then(response => {
|
resetUserPwd(row.userId, value).then(response => {
|
||||||
proxy.$modal.msgSuccess("修改成功,新密码是:" + value);
|
proxy.$modal.msgSuccess("修改成功,新密码是:" + value);
|
||||||
@ -540,10 +539,11 @@ function reset() {
|
|||||||
userName: undefined,
|
userName: undefined,
|
||||||
nickName: undefined,
|
nickName: undefined,
|
||||||
password: undefined,
|
password: undefined,
|
||||||
phonenumber: undefined,
|
phone: undefined,
|
||||||
email: undefined,
|
email: undefined,
|
||||||
sex: undefined,
|
gender: undefined,
|
||||||
status: "0",
|
status: "1",
|
||||||
|
isDelete: "0",
|
||||||
remark: undefined,
|
remark: undefined,
|
||||||
postIds: [],
|
postIds: [],
|
||||||
roleIds: []
|
roleIds: []
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
|
<el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
|
||||||
<el-form-item label="用户昵称" prop="nickName">
|
<el-form-item label="用户昵称" prop="nickname">
|
||||||
<el-input v-model="user.nickName" maxlength="30" />
|
<el-input v-model="user.nickname" maxlength="30" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="手机号码" prop="phonenumber">
|
<el-form-item label="手机号码" prop="phonenumber">
|
||||||
<el-input v-model="user.phonenumber" maxlength="11" />
|
<el-input v-model="user.phonenumber" maxlength="11" />
|
||||||
@ -10,7 +10,7 @@
|
|||||||
<el-input v-model="user.email" maxlength="50" />
|
<el-input v-model="user.email" maxlength="50" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="性别">
|
<el-form-item label="性别">
|
||||||
<el-radio-group v-model="user.sex">
|
<el-radio-group v-model="user.gender">
|
||||||
<el-radio label="0">男</el-radio>
|
<el-radio label="0">男</el-radio>
|
||||||
<el-radio label="1">女</el-radio>
|
<el-radio label="1">女</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
@ -34,7 +34,7 @@ const props = defineProps({
|
|||||||
const { proxy } = getCurrentInstance();
|
const { proxy } = getCurrentInstance();
|
||||||
|
|
||||||
const rules = ref({
|
const rules = ref({
|
||||||
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
|
nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
|
||||||
email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
|
||||||
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
|
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user