cxc/qiaoba-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update by fq

Browse Source
This commit is contained in:
ailanyin
2023-05-11 15:33:57 +08:00
parent eb4f49454f
commit 9aa68cc2a2
4 changed files with 38 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/system/role.js
View File

@ -83,28 +83,19 @@ export function unallocatedUserList(query) {
}) })
} }
// 取消用户授权角色 // 批量取消用户授权角色
export function authUserCancel(data) { export function authUserCancel(data) {
return request({ return request({
url: '/system/role/authUser/cancel', url: '/system/role/authUser/cancel',
method: 'put', method: 'put',
data: data
})
}
// 批量取消用户授权角色
export function authUserCancelAll(data) {
return request({
url: '/system/role/authUser/cancelAll',
method: 'put',
params: data params: data
}) })
} }
// 授权用户选择 // 授权用户选择
export function authUserSelectAll(data) { export function insertAuthUser(data) {
return request({ return request({
url: '/system/role/authUser/selectAll', url: '/system/role/authUser/insert',
method: 'put', method: 'put',
params: data params: data
}) })

47
src/views/system/role/authUser.vue
View File

@ -2,18 +2,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="username">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.username"
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"
@ -42,9 +42,9 @@
plain plain
icon="CircleClose" icon="CircleClose"
:disabled="multiple" :disabled="multiple"
@click="cancelAuthUserAll" @click="cancelAuthUser"
v-hasPermi="['system:role:remove']" v-hasPermi="['system:role:remove']"
>批量取消授权</el-button> >取消授权</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -59,10 +59,11 @@
<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="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="登录账号" prop="username" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" /> <el-table-column label="姓名" prop="nickname" :show-overflow-tooltip="true" />
<el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" /> <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" /> <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" /> <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@ -73,11 +74,6 @@
<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" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']">取消授权</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -93,11 +89,11 @@
<script setup name="AuthUser"> <script setup name="AuthUser">
import selectUser from "./selectUser"; import selectUser from "./selectUser";
import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role"; import { allocatedUserList, authUserCancel } from "@/api/system/role";
import {sys_normal_disable} from "@/constant/dict";
const route = useRoute(); const route = useRoute();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
const userList = ref([]); const userList = ref([]);
const loading = ref(true); const loading = ref(true);
@ -109,9 +105,10 @@ const userIds = ref([]);
const queryParams = reactive({ const queryParams = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
isDelete: "0",
roleId: route.params.roleId, roleId: route.params.roleId,
userName: undefined, username: undefined,
phonenumber: undefined, phone: undefined,
}); });
/** 查询授权用户列表 */ /** 查询授权用户列表 */
@ -147,21 +144,13 @@ function handleSelectionChange(selection) {
function openSelectUser() { function openSelectUser() {
proxy.$refs["selectRef"].show(); proxy.$refs["selectRef"].show();
} }
/** 取消授权按钮操作 */
function cancelAuthUser(row) {
proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
}).then(() => {
getList();
proxy.$modal.msgSuccess("取消授权成功");
}).catch(() => {});
}
/** 批量取消授权按钮操作 */ /** 批量取消授权按钮操作 */
function cancelAuthUserAll(row) { function cancelAuthUser(row) {
const roleId = queryParams.roleId; const roleId = queryParams.roleId;
const uIds = userIds.value.join(","); const uIds = userIds.value.join(",");
proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () { proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {
return authUserCancelAll({ roleId: roleId, userIds: uIds }); return authUserCancel({ roleId: roleId, userIds: uIds });
}).then(() => { }).then(() => {
getList(); getList();
proxy.$modal.msgSuccess("取消授权成功"); proxy.$modal.msgSuccess("取消授权成功");

2
src/views/system/role/index.vue
View File

@ -274,10 +274,10 @@ import {
updateRole updateRole
} from "@/api/system/role"; } from "@/api/system/role";
import {roleMenuTreeselect, treeSelect as menuTreeSelect} from "@/api/system/menu"; import {roleMenuTreeselect, treeSelect as menuTreeSelect} from "@/api/system/menu";
import {sys_normal_disable} from "@/constant/dict";
const router = useRouter(); const router = useRouter();
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
const deptCheckStrictly = ref(true)/*部门父子联动*/ const deptCheckStrictly = ref(true)/*部门父子联动*/
const menuCheckStrictly = ref(true) /*菜单父子联动*/ const menuCheckStrictly = ref(true) /*菜单父子联动*/
const roleList = ref([]); const roleList = ref([]);

31
src/views/system/role/selectUser.vue
View File

@ -1,19 +1,19 @@
<template> <template>
<!-- 授权用户 --> <!-- 授权用户 -->
<el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body> <el-dialog @open="resetQuery" title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryRef" :inline="true"> <el-form :model="queryParams" ref="queryRef" :inline="true">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="登录账号" prop="username">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.username"
placeholder="请输入用户名称" placeholder="请输入登录账号"
clearable clearable
style="width: 200px" style="width: 200px"
@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: 200px" style="width: 200px"
@ -28,10 +28,10 @@
<el-row> <el-row>
<el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px"> <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="登录账号" prop="username" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" /> <el-table-column label="姓名" prop="nickname" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" /> <el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" /> <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" /> <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@ -61,7 +61,8 @@
</template> </template>
<script setup name="SelectUser"> <script setup name="SelectUser">
import { authUserSelectAll, unallocatedUserList } from "@/api/system/role"; import { insertAuthUser, unallocatedUserList } from "@/api/system/role";
import {sys_normal_disable} from "@/constant/dict";
const props = defineProps({ const props = defineProps({
roleId: { roleId: {
@ -70,7 +71,6 @@ const props = defineProps({
}); });
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
const userList = ref([]); const userList = ref([]);
const visible = ref(false); const visible = ref(false);
@ -80,9 +80,10 @@ const userIds = ref([]);
const queryParams = reactive({ const queryParams = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
isDelete: '0',
roleId: undefined, roleId: undefined,
userName: undefined, username: undefined,
phonenumber: undefined phone: undefined
}); });
// 显示弹框 // 显示弹框
@ -125,7 +126,7 @@ function handleSelectUser() {
proxy.$modal.msgError("请选择要分配的用户"); proxy.$modal.msgError("请选择要分配的用户");
return; return;
} }
authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => { insertAuthUser({ roleId: roleId, userIds: uIds }).then(res => {
proxy.$modal.msgSuccess(res.msg); proxy.$modal.msgSuccess(res.msg);
if (res.code === 200) { if (res.code === 200) {
visible.value = false; visible.value = false;