feat 优化
This commit is contained in:
Ironsp
@@ -5,10 +5,6 @@
|
|||||||
"ComputedRef": true,
|
"ComputedRef": true,
|
||||||
"DirectiveBinding": true,
|
"DirectiveBinding": true,
|
||||||
"EffectScope": true,
|
"EffectScope": true,
|
||||||
"ElLoading": true,
|
|
||||||
"ElMessage": true,
|
|
||||||
"ElMessageBox": true,
|
|
||||||
"ElNotification": true,
|
|
||||||
"ExtractDefaultPropTypes": true,
|
"ExtractDefaultPropTypes": true,
|
||||||
"ExtractPropTypes": true,
|
"ExtractPropTypes": true,
|
||||||
"ExtractPublicPropTypes": true,
|
"ExtractPublicPropTypes": true,
|
||||||
|
|||||||
@@ -1,158 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="p-2">
|
|
||||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
||||||
<div v-show="showSearch" class="search">
|
|
||||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
||||||
<el-form-item label="用户名称" prop="userName">
|
|
||||||
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="手机号码" prop="phonenumber">
|
|
||||||
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
<el-card shadow="never">
|
|
||||||
<template #header>
|
|
||||||
<el-row :gutter="10">
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="openSelectUser">添加用户</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button v-hasPermi="['system:role:remove']" type="danger" plain icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll">
|
|
||||||
批量取消授权
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
|
|
||||||
</el-col>
|
|
||||||
<right-toolbar v-model:show-search="showSearch" :search="true" @query-table="getList"></right-toolbar>
|
|
||||||
</el-row>
|
|
||||||
</template>
|
|
||||||
<el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
|
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
|
||||||
<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="email" :show-overflow-tooltip="true" />
|
|
||||||
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
|
|
||||||
<el-table-column label="状态" align="center" prop="status">
|
|
||||||
<template #default="scope">
|
|
||||||
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
||||||
<template #default="scope">
|
|
||||||
<span>{{ scope.row.createTime }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
||||||
<template #default="scope">
|
|
||||||
<el-tooltip content="取消授权" placement="top">
|
|
||||||
<el-button v-hasPermi="['system:role:remove']" link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)"> </el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
|
|
||||||
<pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
|
|
||||||
<select-user ref="selectRef" :role-id="queryParams.roleId" @ok="handleQuery" />
|
|
||||||
</el-card>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup name="AuthUser" lang="ts">
|
|
||||||
import { allocatedUserList, authUserCancel, authUserCancelAll } from '@/api/system/role';
|
|
||||||
import { UserQuery } from '@/api/system/user/types';
|
|
||||||
import { UserVO } from '@/api/system/user/types';
|
|
||||||
import SelectUser from './selectUser.vue';
|
|
||||||
import { RouteLocationNormalized } from 'vue-router';
|
|
||||||
|
|
||||||
const route = useRoute();
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
||||||
const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
|
|
||||||
|
|
||||||
const userList = ref<UserVO[]>([]);
|
|
||||||
const loading = ref(true);
|
|
||||||
const showSearch = ref(true);
|
|
||||||
const multiple = ref(true);
|
|
||||||
const total = ref(0);
|
|
||||||
const userIds = ref<Array<string | number>>([]);
|
|
||||||
|
|
||||||
const queryFormRef = ref<ElFormInstance>();
|
|
||||||
const selectRef = ref<InstanceType<typeof SelectUser>>();
|
|
||||||
|
|
||||||
const queryParams = reactive<UserQuery>({
|
|
||||||
pageNum: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
roleId: route.params.roleId as string,
|
|
||||||
userName: undefined,
|
|
||||||
phonenumber: undefined
|
|
||||||
});
|
|
||||||
|
|
||||||
/** 查询授权用户列表 */
|
|
||||||
const getList = async () => {
|
|
||||||
loading.value = true;
|
|
||||||
const res = await allocatedUserList(queryParams);
|
|
||||||
userList.value = res.rows;
|
|
||||||
total.value = res.total;
|
|
||||||
loading.value = false;
|
|
||||||
};
|
|
||||||
// 返回按钮
|
|
||||||
const handleClose = () => {
|
|
||||||
const obj: RouteLocationNormalized = {
|
|
||||||
path: '/system/role',
|
|
||||||
fullPath: '',
|
|
||||||
hash: '',
|
|
||||||
matched: [],
|
|
||||||
meta: undefined,
|
|
||||||
name: undefined,
|
|
||||||
params: undefined,
|
|
||||||
query: undefined,
|
|
||||||
redirectedFrom: undefined
|
|
||||||
};
|
|
||||||
proxy?.$tab.closeOpenPage(obj);
|
|
||||||
};
|
|
||||||
/** 搜索按钮操作 */
|
|
||||||
const handleQuery = () => {
|
|
||||||
queryParams.pageNum = 1;
|
|
||||||
getList();
|
|
||||||
};
|
|
||||||
/** 重置按钮操作 */
|
|
||||||
const resetQuery = () => {
|
|
||||||
queryFormRef.value?.resetFields();
|
|
||||||
handleQuery();
|
|
||||||
};
|
|
||||||
// 多选框选中数据
|
|
||||||
const handleSelectionChange = (selection: UserVO[]) => {
|
|
||||||
userIds.value = selection.map((item) => item.userId);
|
|
||||||
multiple.value = !selection.length;
|
|
||||||
};
|
|
||||||
/** 打开授权用户表弹窗 */
|
|
||||||
const openSelectUser = () => {
|
|
||||||
selectRef.value?.show();
|
|
||||||
};
|
|
||||||
/** 取消授权按钮操作 */
|
|
||||||
const cancelAuthUser = async (row: UserVO) => {
|
|
||||||
await proxy?.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？');
|
|
||||||
await authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
|
|
||||||
await getList();
|
|
||||||
proxy?.$modal.msgSuccess('取消授权成功');
|
|
||||||
};
|
|
||||||
/** 批量取消授权按钮操作 */
|
|
||||||
const cancelAuthUserAll = async () => {
|
|
||||||
const roleId = queryParams.roleId;
|
|
||||||
const uIds = userIds.value.join(',');
|
|
||||||
await proxy?.$modal.confirm('是否取消选中用户授权数据项?');
|
|
||||||
await authUserCancelAll({ roleId: roleId, userIds: uIds });
|
|
||||||
await getList();
|
|
||||||
proxy?.$modal.msgSuccess('取消授权成功');
|
|
||||||
};
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
getList();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
@@ -1,503 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="p-2">
|
|
||||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
||||||
<div v-show="showSearch" class="mb-[10px]">
|
|
||||||
<el-card shadow="hover">
|
|
||||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
||||||
<el-form-item label="角色名称" prop="roleName">
|
|
||||||
<el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="权限字符" prop="roleKey">
|
|
||||||
<el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="状态" prop="status">
|
|
||||||
<el-select v-model="queryParams.status" placeholder="角色状态" clearable>
|
|
||||||
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="创建时间" style="width: 308px">
|
|
||||||
<el-date-picker
|
|
||||||
v-model="dateRange"
|
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
|
||||||
type="daterange"
|
|
||||||
range-separator="-"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
|
|
||||||
></el-date-picker>
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
</el-card>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
|
|
||||||
<el-card shadow="hover">
|
|
||||||
<template #header>
|
|
||||||
<el-row :gutter="10">
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">修改</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button v-hasPermi="['system:role:remove']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
|
|
||||||
</el-col>
|
|
||||||
<right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
|
|
||||||
</el-row>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<el-table ref="roleTableRef" border v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
|
||||||
<el-table-column v-if="false" label="角色编号" prop="roleId" width="120" />
|
|
||||||
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
|
|
||||||
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="200" />
|
|
||||||
<el-table-column label="显示顺序" prop="roleSort" width="100" />
|
|
||||||
<el-table-column label="状态" align="center" width="100">
|
|
||||||
<template #default="scope">
|
|
||||||
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime">
|
|
||||||
<template #default="scope">
|
|
||||||
<span>{{ proxy.parseTime(scope.row.createTime) }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
|
|
||||||
<el-table-column fixed="right" label="操作" width="180">
|
|
||||||
<template #default="scope">
|
|
||||||
<el-tooltip v-if="scope.row.roleId !== 1" content="修改" placement="top">
|
|
||||||
<el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
<el-tooltip v-if="scope.row.roleId !== 1" content="删除" placement="top">
|
|
||||||
<el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
<el-tooltip v-if="scope.row.roleId !== 1" content="数据权限" placement="top">
|
|
||||||
<el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
<el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top">
|
|
||||||
<el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
|
|
||||||
<pagination
|
|
||||||
v-if="total > 0"
|
|
||||||
v-model:total="total"
|
|
||||||
v-model:page="queryParams.pageNum"
|
|
||||||
v-model:limit="queryParams.pageSize"
|
|
||||||
@pagination="getList"
|
|
||||||
/>
|
|
||||||
</el-card>
|
|
||||||
|
|
||||||
<el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
|
|
||||||
<el-form ref="roleFormRef" :model="form" :rules="rules" label-width="100px">
|
|
||||||
<el-form-item label="角色名称" prop="roleName">
|
|
||||||
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item prop="roleKey">
|
|
||||||
<template #label>
|
|
||||||
<span>
|
|
||||||
<el-tooltip content="控制器中定义的权限字符，如：@SaCheckRole('admin')" placement="top">
|
|
||||||
<el-icon><question-filled /></el-icon>
|
|
||||||
</el-tooltip>
|
|
||||||
权限字符
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="角色顺序" prop="roleSort">
|
|
||||||
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="状态">
|
|
||||||
<el-radio-group v-model="form.status">
|
|
||||||
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="菜单权限">
|
|
||||||
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
|
|
||||||
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
|
|
||||||
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
|
|
||||||
<el-tree
|
|
||||||
ref="menuRef"
|
|
||||||
class="tree-border"
|
|
||||||
:data="menuOptions"
|
|
||||||
show-checkbox
|
|
||||||
node-key="id"
|
|
||||||
:check-strictly="!form.menuCheckStrictly"
|
|
||||||
empty-text="加载中，请稍候"
|
|
||||||
:props="{ label: 'label', children: 'children' } as any"
|
|
||||||
></el-tree>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注">
|
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<div class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
|
|
||||||
<!-- 分配角色数据权限对话框 -->
|
|
||||||
<el-dialog v-model="openDataScope" :title="dialog.title" width="500px" append-to-body>
|
|
||||||
<el-form ref="dataScopeRef" :model="form" label-width="80px">
|
|
||||||
<el-form-item label="角色名称">
|
|
||||||
<el-input v-model="form.roleName" :disabled="true" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="权限字符">
|
|
||||||
<el-input v-model="form.roleKey" :disabled="true" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="权限范围">
|
|
||||||
<el-select v-model="form.dataScope" @change="dataScopeSelectChange">
|
|
||||||
<el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-show="form.dataScope === '2'" label="数据权限">
|
|
||||||
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
|
|
||||||
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
|
|
||||||
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
|
|
||||||
<el-tree
|
|
||||||
ref="deptRef"
|
|
||||||
class="tree-border"
|
|
||||||
:data="deptOptions"
|
|
||||||
show-checkbox
|
|
||||||
default-expand-all
|
|
||||||
node-key="id"
|
|
||||||
:check-strictly="!form.deptCheckStrictly"
|
|
||||||
empty-text="加载中，请稍候"
|
|
||||||
:props="{ label: 'label', children: 'children' } as any"
|
|
||||||
></el-tree>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<div class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="submitDataScope">确 定</el-button>
|
|
||||||
<el-button @click="cancelDataScope">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup name="Role" lang="ts">
|
|
||||||
import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from '@/api/system/role';
|
|
||||||
import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
|
|
||||||
import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
|
|
||||||
import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
|
|
||||||
|
|
||||||
const router = useRouter();
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
||||||
const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
|
|
||||||
|
|
||||||
const roleList = ref<RoleVO[]>();
|
|
||||||
const loading = ref(true);
|
|
||||||
const showSearch = ref(true);
|
|
||||||
const ids = ref<Array<string | number>>([]);
|
|
||||||
const single = ref(true);
|
|
||||||
const multiple = ref(true);
|
|
||||||
const total = ref(0);
|
|
||||||
const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
|
|
||||||
const menuOptions = ref<MenuTreeOption[]>([]);
|
|
||||||
const menuExpand = ref(false);
|
|
||||||
const menuNodeAll = ref(false);
|
|
||||||
const deptExpand = ref(true);
|
|
||||||
const deptNodeAll = ref(false);
|
|
||||||
const deptOptions = ref<DeptTreeOption[]>([]);
|
|
||||||
const openDataScope = ref(false);
|
|
||||||
|
|
||||||
/** 数据范围选项*/
|
|
||||||
const dataScopeOptions = ref([
|
|
||||||
{ value: '1', label: '全部数据权限' },
|
|
||||||
{ value: '2', label: '自定数据权限' },
|
|
||||||
{ value: '3', label: '本部门数据权限' },
|
|
||||||
{ value: '4', label: '本部门及以下数据权限' },
|
|
||||||
{ value: '5', label: '仅本人数据权限' },
|
|
||||||
{ value: '6', label: '部门及以下或本人数据权限' }
|
|
||||||
]);
|
|
||||||
|
|
||||||
const queryFormRef = ref<ElFormInstance>();
|
|
||||||
const roleFormRef = ref<ElFormInstance>();
|
|
||||||
const dataScopeRef = ref<ElFormInstance>();
|
|
||||||
const menuRef = ref<ElTreeInstance>();
|
|
||||||
const deptRef = ref<ElTreeInstance>();
|
|
||||||
|
|
||||||
const initForm: RoleForm = {
|
|
||||||
roleId: undefined,
|
|
||||||
roleSort: 1,
|
|
||||||
status: '0',
|
|
||||||
roleName: '',
|
|
||||||
roleKey: '',
|
|
||||||
menuCheckStrictly: true,
|
|
||||||
deptCheckStrictly: true,
|
|
||||||
remark: '',
|
|
||||||
dataScope: '1',
|
|
||||||
menuIds: [],
|
|
||||||
deptIds: []
|
|
||||||
};
|
|
||||||
|
|
||||||
const data = reactive<PageData<RoleForm, RoleQuery>>({
|
|
||||||
form: { ...initForm },
|
|
||||||
queryParams: {
|
|
||||||
pageNum: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
roleName: '',
|
|
||||||
roleKey: '',
|
|
||||||
status: ''
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
roleName: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
|
|
||||||
roleKey: [{ required: true, message: '权限字符不能为空', trigger: 'blur' }],
|
|
||||||
roleSort: [{ required: true, message: '角色顺序不能为空', trigger: 'blur' }]
|
|
||||||
}
|
|
||||||
});
|
|
||||||
const { form, queryParams, rules } = toRefs(data);
|
|
||||||
|
|
||||||
const dialog = reactive<DialogOption>({
|
|
||||||
visible: false,
|
|
||||||
title: ''
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询角色列表
|
|
||||||
*/
|
|
||||||
const getList = () => {
|
|
||||||
loading.value = true;
|
|
||||||
listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
|
|
||||||
roleList.value = res.rows;
|
|
||||||
total.value = res.total;
|
|
||||||
loading.value = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 搜索按钮操作
|
|
||||||
*/
|
|
||||||
const handleQuery = () => {
|
|
||||||
queryParams.value.pageNum = 1;
|
|
||||||
getList();
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 重置 */
|
|
||||||
const resetQuery = () => {
|
|
||||||
dateRange.value = ['', ''];
|
|
||||||
queryFormRef.value?.resetFields();
|
|
||||||
handleQuery();
|
|
||||||
};
|
|
||||||
/**删除按钮操作 */
|
|
||||||
const handleDelete = async (row?: RoleVO) => {
|
|
||||||
const roleids = row?.roleId || ids.value;
|
|
||||||
await proxy?.$modal.confirm('是否确认删除角色编号为' + roleids + '数据项目');
|
|
||||||
await delRole(roleids);
|
|
||||||
getList();
|
|
||||||
proxy?.$modal.msgSuccess('删除成功');
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 导出按钮操作 */
|
|
||||||
const handleExport = () => {
|
|
||||||
proxy?.download(
|
|
||||||
'system/role/export',
|
|
||||||
{
|
|
||||||
...queryParams.value
|
|
||||||
},
|
|
||||||
`role_${new Date().getTime()}.xlsx`
|
|
||||||
);
|
|
||||||
};
|
|
||||||
/** 多选框选中数据 */
|
|
||||||
const handleSelectionChange = (selection: RoleVO[]) => {
|
|
||||||
ids.value = selection.map((item: RoleVO) => item.roleId);
|
|
||||||
single.value = selection.length != 1;
|
|
||||||
multiple.value = !selection.length;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 角色状态修改 */
|
|
||||||
const handleStatusChange = async (row: RoleVO) => {
|
|
||||||
const text = row.status === '0' ? '启用' : '停用';
|
|
||||||
try {
|
|
||||||
await proxy?.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?');
|
|
||||||
await changeRoleStatus(row.roleId, row.status);
|
|
||||||
proxy?.$modal.msgSuccess(text + '成功');
|
|
||||||
} catch {
|
|
||||||
row.status = row.status === '0' ? '1' : '0';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 分配用户 */
|
|
||||||
const handleAuthUser = (row: RoleVO) => {
|
|
||||||
router.push('/system/role-auth/user/' + row.roleId);
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 查询菜单树结构 */
|
|
||||||
const getMenuTreeselect = async () => {
|
|
||||||
const res = await menuTreeselect();
|
|
||||||
menuOptions.value = res.data;
|
|
||||||
};
|
|
||||||
/** 所有部门节点数据 */
|
|
||||||
const getDeptAllCheckedKeys = (): any => {
|
|
||||||
// 目前被选中的部门节点
|
|
||||||
const checkedKeys = deptRef.value?.getCheckedKeys();
|
|
||||||
// 半选中的部门节点
|
|
||||||
const halfCheckedKeys = deptRef.value?.getHalfCheckedKeys();
|
|
||||||
if (halfCheckedKeys) {
|
|
||||||
checkedKeys?.unshift(...halfCheckedKeys);
|
|
||||||
}
|
|
||||||
return checkedKeys;
|
|
||||||
};
|
|
||||||
/** 重置新增的表单以及其他数据 */
|
|
||||||
const reset = () => {
|
|
||||||
menuRef.value?.setCheckedKeys([]);
|
|
||||||
menuExpand.value = false;
|
|
||||||
menuNodeAll.value = false;
|
|
||||||
deptExpand.value = true;
|
|
||||||
deptNodeAll.value = false;
|
|
||||||
form.value = { ...initForm };
|
|
||||||
roleFormRef.value?.resetFields();
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 添加角色 */
|
|
||||||
const handleAdd = () => {
|
|
||||||
reset();
|
|
||||||
getMenuTreeselect();
|
|
||||||
dialog.visible = true;
|
|
||||||
dialog.title = '添加角色';
|
|
||||||
};
|
|
||||||
/** 修改角色 */
|
|
||||||
const handleUpdate = async (row?: RoleVO) => {
|
|
||||||
reset();
|
|
||||||
const roleId = row?.roleId || ids.value[0];
|
|
||||||
const { data } = await getRole(roleId);
|
|
||||||
Object.assign(form.value, data);
|
|
||||||
form.value.roleSort = Number(form.value.roleSort);
|
|
||||||
const res = await getRoleMenuTreeselect(roleId);
|
|
||||||
dialog.title = '修改角色';
|
|
||||||
dialog.visible = true;
|
|
||||||
res.checkedKeys.forEach((v) => {
|
|
||||||
nextTick(() => {
|
|
||||||
menuRef.value?.setChecked(v, true, false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
/** 根据角色ID查询菜单树结构 */
|
|
||||||
const getRoleMenuTreeselect = (roleId: string | number) => {
|
|
||||||
return roleMenuTreeselect(roleId).then((res): RoleMenuTree => {
|
|
||||||
menuOptions.value = res.data.menus;
|
|
||||||
return res.data;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
/** 根据角色ID查询部门树结构 */
|
|
||||||
const getRoleDeptTreeSelect = async (roleId: string | number) => {
|
|
||||||
const res = await deptTreeSelect(roleId);
|
|
||||||
deptOptions.value = res.data.depts;
|
|
||||||
return res.data;
|
|
||||||
};
|
|
||||||
/** 树权限（展开/折叠）*/
|
|
||||||
const handleCheckedTreeExpand = (value: boolean, type: string) => {
|
|
||||||
if (type == 'menu') {
|
|
||||||
const treeList = menuOptions.value;
|
|
||||||
for (let i = 0; i < treeList.length; i++) {
|
|
||||||
if (menuRef.value) {
|
|
||||||
menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (type == 'dept') {
|
|
||||||
const treeList = deptOptions.value;
|
|
||||||
for (let i = 0; i < treeList.length; i++) {
|
|
||||||
if (deptRef.value) {
|
|
||||||
deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
/** 树权限（全选/全不选） */
|
|
||||||
const handleCheckedTreeNodeAll = (value: any, type: string) => {
|
|
||||||
if (type == 'menu') {
|
|
||||||
menuRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
|
|
||||||
} else if (type == 'dept') {
|
|
||||||
deptRef.value?.setCheckedNodes(value ? (deptOptions.value as any) : []);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
/** 树权限（父子联动） */
|
|
||||||
const handleCheckedTreeConnect = (value: any, type: string) => {
|
|
||||||
if (type == 'menu') {
|
|
||||||
form.value.menuCheckStrictly = value;
|
|
||||||
} else if (type == 'dept') {
|
|
||||||
form.value.deptCheckStrictly = value;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
/** 所有菜单节点数据 */
|
|
||||||
const getMenuAllCheckedKeys = (): any => {
|
|
||||||
// 目前被选中的菜单节点
|
|
||||||
const checkedKeys = menuRef.value?.getCheckedKeys();
|
|
||||||
// 半选中的菜单节点
|
|
||||||
const halfCheckedKeys = menuRef.value?.getHalfCheckedKeys();
|
|
||||||
if (halfCheckedKeys) {
|
|
||||||
checkedKeys?.unshift(...halfCheckedKeys);
|
|
||||||
}
|
|
||||||
return checkedKeys;
|
|
||||||
};
|
|
||||||
/** 提交按钮 */
|
|
||||||
const submitForm = () => {
|
|
||||||
roleFormRef.value?.validate(async (valid: boolean) => {
|
|
||||||
if (valid) {
|
|
||||||
form.value.menuIds = getMenuAllCheckedKeys();
|
|
||||||
form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
|
|
||||||
proxy?.$modal.msgSuccess('操作成功');
|
|
||||||
dialog.visible = false;
|
|
||||||
getList();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
/** 取消按钮 */
|
|
||||||
const cancel = () => {
|
|
||||||
reset();
|
|
||||||
dialog.visible = false;
|
|
||||||
};
|
|
||||||
/** 选择角色权限范围触发 */
|
|
||||||
const dataScopeSelectChange = (value: string) => {
|
|
||||||
if (value !== '2') {
|
|
||||||
deptRef.value?.setCheckedKeys([]);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
/** 分配数据权限操作 */
|
|
||||||
const handleDataScope = async (row: RoleVO) => {
|
|
||||||
const response = await getRole(row.roleId);
|
|
||||||
Object.assign(form.value, response.data);
|
|
||||||
const res = await getRoleDeptTreeSelect(row.roleId);
|
|
||||||
openDataScope.value = true;
|
|
||||||
dialog.title = '分配数据权限';
|
|
||||||
await nextTick(() => {
|
|
||||||
deptRef.value?.setCheckedKeys(res.checkedKeys);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
/** 提交按钮（数据权限） */
|
|
||||||
const submitDataScope = async () => {
|
|
||||||
if (form.value.roleId) {
|
|
||||||
form.value.deptIds = getDeptAllCheckedKeys();
|
|
||||||
await dataScope(form.value);
|
|
||||||
proxy?.$modal.msgSuccess('修改成功');
|
|
||||||
openDataScope.value = false;
|
|
||||||
getList();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
/** 取消按钮（数据权限）*/
|
|
||||||
const cancelDataScope = () => {
|
|
||||||
dataScopeRef.value?.resetFields();
|
|
||||||
form.value = { ...initForm };
|
|
||||||
openDataScope.value = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
getList();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
<template>
|
|
||||||
<el-row>
|
|
||||||
<el-dialog v-model="visible" title="选择用户" width="800px" top="5vh" append-to-body>
|
|
||||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
||||||
<el-form-item label="用户名称" prop="userName">
|
|
||||||
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="手机号码" prop="phonenumber">
|
|
||||||
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<el-row>
|
|
||||||
<el-table ref="tableRef" border :data="userList" height="260px" @row-click="clickRow" @selection-change="handleSelectionChange">
|
|
||||||
<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="nickName" :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="状态" align="center" prop="status">
|
|
||||||
<template #default="scope">
|
|
||||||
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
||||||
<template #default="scope">
|
|
||||||
<span>{{ proxy.parseTime(scope.row.createTime) }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<pagination v-if="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
|
|
||||||
</el-row>
|
|
||||||
<template #footer>
|
|
||||||
<div class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="handleSelectUser">确 定</el-button>
|
|
||||||
<el-button @click="visible = false">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</el-row>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup name="SelectUser" lang="ts">
|
|
||||||
import { authUserSelectAll, unallocatedUserList } from '@/api/system/role';
|
|
||||||
import { UserVO } from '@/api/system/user/types';
|
|
||||||
import { UserQuery } from '@/api/system/user/types';
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
roleId: {
|
|
||||||
type: [Number, String],
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
||||||
const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
|
|
||||||
|
|
||||||
const userList = ref<UserVO[]>([]);
|
|
||||||
const visible = ref(false);
|
|
||||||
const total = ref(0);
|
|
||||||
const userIds = ref<Array<string | number>>([]);
|
|
||||||
|
|
||||||
const queryParams = reactive<UserQuery>({
|
|
||||||
pageNum: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
roleId: undefined,
|
|
||||||
userName: undefined,
|
|
||||||
phonenumber: undefined
|
|
||||||
});
|
|
||||||
|
|
||||||
const tableRef = ref<ElTableInstance>();
|
|
||||||
const queryFormRef = ref<ElFormInstance>();
|
|
||||||
|
|
||||||
const show = () => {
|
|
||||||
queryParams.roleId = props.roleId;
|
|
||||||
getList();
|
|
||||||
visible.value = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选择行
|
|
||||||
*/
|
|
||||||
const clickRow = (row: any) => {
|
|
||||||
// ele的bug
|
|
||||||
tableRef.value?.toggleRowSelection(row, false);
|
|
||||||
};
|
|
||||||
/** 多选框选中数据 */
|
|
||||||
const handleSelectionChange = (selection: UserVO[]) => {
|
|
||||||
userIds.value = selection.map((item: UserVO) => item.userId);
|
|
||||||
};
|
|
||||||
|
|
||||||
/** 查询数据 */
|
|
||||||
const getList = async () => {
|
|
||||||
const res = await unallocatedUserList(queryParams);
|
|
||||||
userList.value = res.rows;
|
|
||||||
total.value = res.total;
|
|
||||||
};
|
|
||||||
/** 搜索按钮操作 */
|
|
||||||
const handleQuery = () => {
|
|
||||||
queryParams.pageNum = 1;
|
|
||||||
getList();
|
|
||||||
};
|
|
||||||
/** 重置按钮操作 */
|
|
||||||
const resetQuery = () => {
|
|
||||||
queryFormRef.value?.resetFields();
|
|
||||||
getList();
|
|
||||||
};
|
|
||||||
|
|
||||||
const emit = defineEmits(['ok']);
|
|
||||||
/**选择授权用户操作 */
|
|
||||||
const handleSelectUser = async () => {
|
|
||||||
const roleId = queryParams.roleId;
|
|
||||||
const ids = userIds.value.join(',');
|
|
||||||
if (ids == '') {
|
|
||||||
proxy?.$modal.msgError('请选择要分配的用户');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await authUserSelectAll({ roleId, userIds: ids });
|
|
||||||
proxy?.$modal.msgSuccess('分配成功');
|
|
||||||
emit('ok');
|
|
||||||
visible.value = false;
|
|
||||||
};
|
|
||||||
// 暴露
|
|
||||||
defineExpose({
|
|
||||||
show
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
Reference in New Issue
Block a user