xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加用户、角色功能

Browse Source
This commit is contained in:
chenchun
2023-02-12 18:43:11 +08:00
parent bc42efe703
commit 158cab9f9b
22 changed files with 304 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.RuoYi.Vue3/src/api/system/dept.js
View File

@@ -55,7 +55,7 @@ export function delDept(deptId) {
// 根据角色ID查询菜单下拉树结构
export function roleDeptTreeselect(roleId) {
return request({
url: '/dept/getListByRoleId/' + roleId,
url: '/dept/role-id/' + roleId,
method: 'get'
})
}

2
Yi.RuoYi.Vue3/src/api/system/menu.js
View File

@@ -28,7 +28,7 @@ export function treeselect() {
// 根据角色ID查询菜单下拉树结构
export function roleMenuTreeselect(roleId) {
return request({
url: '/menu/getListByRoleId/' + roleId,
url: '/menu/role-id/' + roleId,
method: 'get'
})
}

24
Yi.RuoYi.Vue3/src/api/system/user.js
View File

@@ -21,7 +21,7 @@ export function getUser(userId) {
// 新增用户
export function addUser(data) {
return request({
url: '/user/add',
url: '/user',
method: 'post',
data: data
})
@@ -32,22 +32,7 @@ export function updateUser(id, data) {
return request({
url: `/user/${id}`,
method: 'put',
data: {
userName: data.user.userName,
nick: data.user.nick,
password: data.user.password,
phone: data.user.phone,
email: data.user.email,
sex: data.user.sex,
state: data.user.state,
remark: data.user.remark,
postIds: data.postIds,
roleIds: data.roleIds,
deptId: data.deptId
}
data: data
})
}
@@ -62,13 +47,12 @@ export function delUser(userId) {
// 用户密码重置
export function resetUserPwd(id, password) {
const data = {
id,
password
}
return request({
url: '/user/restPassword',
url: `/account/rest-password/${id}`,
method: 'put',
data: data
})
@@ -106,7 +90,7 @@ export function updateUserPwd(oldPassword, newPassword) {
newPassword
}
return request({
url: '/account/UpdatePassword',
url: '/account/password',
method: 'put',
data: data
})

55
Yi.RuoYi.Vue3/src/views/system/role/index.vue
View File

@@ -24,9 +24,9 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="isDeleted">
<el-form-item label="状态" prop="state">
<el-select
v-model="queryParams.isDeleted"
v-model="queryParams.state"
placeholder="角色状态"
clearable
style="width: 240px"
@@ -129,7 +129,7 @@
<el-table-column label="状态" align="center" width="100">
<template #default="scope">
<el-switch
v-model="scope.row.isDeleted"
v-model="scope.row.state"
:active-value="false"
:inactive-value="true"
@change="handleStatusChange(scope.row)"
@@ -214,12 +214,12 @@
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form
ref="roleRef"
:model="form.role"
:model="form"
:rules="rules"
label-width="100px"
>
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.role.roleName" placeholder="请输入角色名称" />
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
</el-form-item>
<el-form-item prop="roleCode">
<template #label>
@@ -235,17 +235,17 @@
权限字符
</span>
</template>
<el-input v-model="form.role.roleCode" placeholder="请输入权限字符" />
<el-input v-model="form.roleCode" placeholder="请输入权限字符" />
</el-form-item>
<el-form-item label="角色顺序" prop="orderNum">
<el-input-number
v-model="form.role.orderNum"
v-model="form.orderNum"
controls-position="right"
:min="0"
/>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.role.isDeleted">
<el-radio-group v-model="form.state">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
@@ -266,7 +266,7 @@
>全选/全不选</el-checkbox
>
<el-checkbox
v-model="form.role.menuCheckStrictly"
v-model="form.menuCheckStrictly"
@change="handleCheckedTreeConnect($event, 'menu')"
>父子联动
</el-checkbox>
@@ -276,14 +276,14 @@
show-checkbox
ref="menuRef"
node-key="id"
:check-strictly="!form.role.menuCheckStrictly"
:check-strictly="!form.menuCheckStrictly"
empty-text="加载中，请稍候"
:props="{ label: 'label', children: 'children' }"
></el-tree>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="form.role.remark"
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
@@ -306,14 +306,14 @@
>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.role.roleName" :disabled="true" />
<el-input v-model="form.roleName" :disabled="true" />
</el-form-item>
<el-form-item label="权限字符">
<el-input v-model="form.role.roleCode" :disabled="true" />
<el-input v-model="form.roleCode" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
<el-select
v-model="form.role.dataScope"
v-model="form.dataScope"
@change="dataScopeSelectChange"
>
<el-option
@@ -325,7 +325,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="数据权限" v-show="form.role.dataScope == 1">
<el-form-item label="数据权限" v-show="form.dataScope == 1">
<el-checkbox
v-model="deptExpand"
@change="handleCheckedTreeExpand($event, 'dept')"
@@ -420,7 +420,7 @@ const data = reactive({
pageSize: 10,
roleName: undefined,
roleCode: undefined,
isDeleted: undefined,
state: undefined,
},
rules: {
roleName: [
@@ -491,17 +491,17 @@ function handleSelectionChange(selection) {
}
/** 角色状态修改 */
function handleStatusChange(row) {
let text = row.isDeleted === false ? "启用" : "停用";
let text = row.state === false ? "启用" : "停用";
proxy.$modal
.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?')
.then(function () {
return changeRoleStatus(row.id, row.isDeleted);
return changeRoleStatus(row.id, row.state);
})
.then(() => {
proxy.$modal.msgSuccess(text + "成功");
})
.catch(function () {
row.isDeleted = row.isDeleted === "0" ? "1" : "0";
row.state = row.state === "0" ? "1" : "0";
});
}
/** 更多操作 */
@@ -555,17 +555,16 @@ function reset() {
deptExpand.value = true;
deptNodeAll.value = false;
form.value = {
role: {
id: undefined,
roleName: undefined,
roleCode: undefined,
orderNum: 0,
IsDeleted: false,
state: false,
menuCheckStrictly: false,
deptCheckStrictly: false,
remark: undefined,
dataScope: 0,
},
menuIds: [],
deptIds: [],
};
@@ -584,8 +583,8 @@ function handleUpdate(row) {
const roleId = row.id || ids.value;
getRoleMenuTreeselect(roleId);
getRole(roleId).then((response) => {
form.value.role = response.data;
form.value.role.orderNum = Number(form.value.role.orderNum);
form.value= response.data;
form.value.orderNum = Number(form.value.orderNum);
open.value = true;
title.value = "修改角色";
});
@@ -598,7 +597,7 @@ function getRoleMenuTreeselect(roleId) {
roleMenuTreeselect(roleId).then((response) => {
const menuIds = [];
response.data.forEach((m) => {
response.data.item.forEach((m) => {
menuIds.push(m.id);
});
@@ -680,7 +679,7 @@ function getMenuAllCheckedKeys() {
function submitForm() {
proxy.$refs["roleRef"].validate((valid) => {
if (valid) {
if (form.value.role.id != undefined) {
if (form.value.id != undefined) {
form.value.menuIds = getMenuAllCheckedKeys();
updateRole(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");
@@ -714,14 +713,14 @@ function handleDataScope(row) {
reset();
getDeptTree(row.id);
getRole(row.id).then((response) => {
form.value.role = response.data;
form.value = response.data;
openDataScope.value = true;
title.value = "分配数据权限";
});
}
/** 提交按钮（数据权限） */
function submitDataScope() {
if (form.value.role.id != undefined) {
if (form.value.id != undefined) {
form.value.deptIds = getDeptAllCheckedKeys();
dataScope(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");

57
Yi.RuoYi.Vue3/src/views/system/user/index.vue
View File

@@ -24,8 +24,8 @@
<el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="isDeleted">
<el-select v-model="queryParams.isDeleted" placeholder="用户状态" clearable style="width: 240px">
<el-form-item label="状态" prop="state">
<el-select v-model="queryParams.state" placeholder="用户状态" clearable style="width: 240px">
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
@@ -75,9 +75,9 @@
:show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
width="120" />
<el-table-column label="状态" align="isDeleted" key="isDeleted" v-if="columns[5].visible">
<el-table-column label="状态" align="state" key="state" v-if="columns[5].visible">
<template #default="scope">
<el-switch v-model="scope.row.isDeleted" :active-value=false :inactive-value=true
<el-switch v-model="scope.row.state" :active-value=false :inactive-value=true
@change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
@@ -114,11 +114,11 @@
<!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form :model="form.user" :rules="rules" ref="userRef" label-width="80px">
<el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nick">
<el-input v-model="form.user.nick" placeholder="请输入用户昵称" maxlength="30" />
<el-input v-model="form.nick" placeholder="请输入用户昵称" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -132,24 +132,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.user.phone" placeholder="请输入手机号码" maxlength="11" />
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.user.email" placeholder="请输入邮箱" maxlength="50" />
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="form.id == undefined" label="用户账号" prop="userName">
<el-input v-model="form.user.userName" placeholder="请输入用户账号" maxlength="30" />
<el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.id == undefined" label="用户密码" prop="password">
<el-input v-model="form.user.password" placeholder="请输入用户密码" type="password" maxlength="20"
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
show-password />
</el-form-item>
</el-col>
@@ -157,14 +157,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.user.sex" placeholder="请选择">
<el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="JSON.parse(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.user.isDeleted">
<el-radio-group v-model="form.state">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
@@ -175,7 +175,7 @@
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择">
<el-option v-for="item in postOptions" :key="item.id" :label="item.postName"
:value="item.id" :disabled="item.isDeleted == true"></el-option>
:value="item.id" :disabled="item.state == false"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -183,7 +183,7 @@
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
:disabled="item.isDeleted ==true"></el-option>
:disabled="item.state ==false"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -191,7 +191,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.user.remark" type="textarea" placeholder="请输入内容"></el-input>
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -288,13 +288,14 @@ const columns = ref([
]);
const data = reactive({
form: {},
form : {
},
queryParams: {
pageNum: 1,
pageSize: 10,
userName: undefined,
phone: undefined,
isDeleted: undefined,
state: true,
deptId: undefined
},
rules: {
@@ -374,14 +375,13 @@ function handleExport() {
};
/** 用户状态修改 */
function handleStatusChange(row) {
console.log(row)
let text = row.isDeleted === false ? "启用" : "停用";
let text = row.state === false ? "启用" : "停用";
proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
return changeUserStatus(row.id, row.isDeleted);
return changeUserStatus(row.id, row.state);
}).then(() => {
proxy.$modal.msgSuccess(text + "成功");
}).catch(function () {
row.isDeleted = row.isDeleted === true ? false : true;
row.state = row.state === true ? false : true;
});
};
/** 更多操作 */
@@ -450,16 +450,14 @@ function submitFileForm() {
/** 重置操作表单 */
function reset() {
form.value = {
user: {
userName: undefined,
nick: undefined,
password: undefined,
phone: undefined,
email: undefined,
sex: undefined,
isDeleted: false,
state: true,
remark: undefined,
},
postIds: [],
roleIds: [],
deptId: undefined
@@ -505,19 +503,20 @@ function handleUpdate(row) {
getUser(userId).then(response => {
form.value.user = response.data;
form.value = response.data;
form.value.postIds=[];
response.data.posts.forEach(post => {
form.value.postIds.push(post.id)
});
form.value.deptId= response.data.deptId;
form.value.roleIds=[];
response.data.roles.forEach(role => {
form.value.roleIds.push(role.id)
});
open.value = true;
title.value = "修改用户";
form.value.user.password = null;
form.value.password = null;
@@ -527,8 +526,8 @@ form.value.user.password = null;
function submitForm() {
proxy.$refs["userRef"].validate(valid => {
if (valid) {
if (form.value.user.id != undefined) {
updateUser(form.value.user.id,form.value).then(response => {
if (form.value.id != undefined) {
updateUser(form.value.id,form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();