|
|
@@ -1,14 +1,34 @@
|
|
|
<template>
|
|
|
<div class="page-container list-sontainer">
|
|
|
<div :gutter="10" class="list-btns-container">
|
|
|
- <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
|
|
|
- v-hasPermi="['system:role:add']">新增</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ icon="Plus"
|
|
|
+ @click="handleAdd"
|
|
|
+ v-hasPermi="['system:role:add']"
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
|
|
|
- <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
|
|
|
- v-hasPermi="['system:role:edit']">修改</el-button>
|
|
|
+ <el-button
|
|
|
+ type="success"
|
|
|
+ size="small"
|
|
|
+ icon="Edit"
|
|
|
+ :disabled="single"
|
|
|
+ @click="handleUpdate"
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
|
|
|
- <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
|
|
|
- v-hasPermi="['system:role:remove']">删除</el-button>
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ size="small"
|
|
|
+ icon="Delete"
|
|
|
+ :disabled="multiple"
|
|
|
+ @click="handleDelete"
|
|
|
+ v-hasPermi="['system:role:remove']"
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
|
|
|
<!-- <el-button type="warning" size="small" icon="Download" @click="handleExport"
|
|
|
v-hasPermi="['system:role:export']">导出</el-button> -->
|
|
|
@@ -16,11 +36,22 @@
|
|
|
<!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
|
|
|
</div>
|
|
|
|
|
|
- <el-form class="list-search-container" :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true"
|
|
|
- label-width="68px">
|
|
|
+ <el-form
|
|
|
+ class="list-search-container"
|
|
|
+ :model="queryParams"
|
|
|
+ ref="queryRef"
|
|
|
+ v-show="showSearch"
|
|
|
+ :inline="true"
|
|
|
+ label-width="68px"
|
|
|
+ >
|
|
|
<el-form-item label="角色名称：" prop="roleName" style="width: 220px">
|
|
|
- <el-input size="small" v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
|
|
|
- @keyup.enter="handleQuery" />
|
|
|
+ <el-input
|
|
|
+ size="small"
|
|
|
+ v-model="queryParams.roleName"
|
|
|
+ placeholder="请输入角色名称"
|
|
|
+ clearable
|
|
|
+ @keyup.enter="handleQuery"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="权限字符：" prop="roleKey" style="width: 220px">
|
|
|
<el-input size="small" v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable @keyup.enter="handleQuery" />
|
|
|
@@ -35,34 +66,54 @@
|
|
|
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
</el-form-item> -->
|
|
|
<el-form-item>
|
|
|
- <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="primary"
|
|
|
+ icon="Search"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ <el-button size="small" icon="Refresh" @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<!-- 表格数据 -->
|
|
|
- <el-table size="small" v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ size="small"
|
|
|
+ v-loading="loading"
|
|
|
+ border
|
|
|
+ :data="roleList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<!--<el-table-column label="角色编号" prop="roleId" width="120" />-->
|
|
|
- <el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" width="150" />
|
|
|
- <el-table-column label="权限字符" align="center" prop="roleKey" :show-overflow-tooltip="true" width="150" />
|
|
|
- <el-table-column label="排序" align="center" 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" width="200">
|
|
|
- <template #default="scope">
|
|
|
- <span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="角色名称"
|
|
|
+ align="center"
|
|
|
+ prop="roleName"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ width="150"
|
|
|
+ />
|
|
|
+
|
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ width="200"
|
|
|
+ >
|
|
|
<template #default="scope">
|
|
|
- <el-button link size="small" type="warning" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
|
|
|
- 修改</el-button>
|
|
|
+ <el-button
|
|
|
+ link
|
|
|
+ size="small"
|
|
|
+ type="warning"
|
|
|
+ @click="handleUpdate(scope.row)"
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
+ >
|
|
|
+ 修改</el-button
|
|
|
+ >
|
|
|
|
|
|
<!-- <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
|
|
|
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
|
|
|
@@ -80,11 +131,22 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
|
|
|
- @pagination="getList" />
|
|
|
+ <pagination
|
|
|
+ v-show="total > 0"
|
|
|
+ :total="total"
|
|
|
+ v-model:page="queryParams.pageNum"
|
|
|
+ v-model:limit="queryParams.pageSize"
|
|
|
+ @pagination="getList"
|
|
|
+ />
|
|
|
|
|
|
<!-- 添加或修改角色配置对话框 -->
|
|
|
- <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ v-model="open"
|
|
|
+ width="500px"
|
|
|
+ append-to-body
|
|
|
+ draggable
|
|
|
+ >
|
|
|
<el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
|
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
|
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
|
|
|
@@ -92,7 +154,10 @@
|
|
|
<el-form-item prop="roleKey">
|
|
|
<template #label>
|
|
|
<span>
|
|
|
- <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
|
|
|
+ <el-tooltip
|
|
|
+ content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
|
|
|
+ placement="top"
|
|
|
+ >
|
|
|
<el-icon><question-filled /></el-icon>
|
|
|
</el-tooltip>
|
|
|
权限字符
|
|
|
@@ -101,7 +166,11 @@
|
|
|
<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-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">
|
|
|
@@ -109,16 +178,38 @@
|
|
|
</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 class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
|
|
|
- :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
|
|
|
- :props="{ label: 'label', children: 'children' }"></el-tree>
|
|
|
+ <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
|
|
|
+ class="tree-border"
|
|
|
+ :data="menuOptions"
|
|
|
+ show-checkbox
|
|
|
+ ref="menuRef"
|
|
|
+ node-key="id"
|
|
|
+ :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.remark" type="textarea" placeholder="请输入内容"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="form.remark"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
|
@@ -130,7 +221,13 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 分配角色数据权限对话框 -->
|
|
|
- <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body draggable>
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ v-model="openDataScope"
|
|
|
+ width="500px"
|
|
|
+ append-to-body
|
|
|
+ draggable
|
|
|
+ >
|
|
|
<el-form :model="form" label-width="80px">
|
|
|
<el-form-item label="角色名称">
|
|
|
<el-input v-model="form.roleName" :disabled="true" />
|
|
|
@@ -140,18 +237,41 @@
|
|
|
</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-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 label="数据权限" v-show="form.dataScope == 2">
|
|
|
- <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 class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
|
|
|
- :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
|
|
|
- :props="{ label: 'label', children: 'children' }"></el-tree>
|
|
|
+ <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
|
|
|
+ class="tree-border"
|
|
|
+ :data="deptOptions"
|
|
|
+ show-checkbox
|
|
|
+ default-expand-all
|
|
|
+ ref="deptRef"
|
|
|
+ node-key="id"
|
|
|
+ :check-strictly="!form.deptCheckStrictly"
|
|
|
+ empty-text="加载中，请稍候"
|
|
|
+ :props="{ label: 'label', children: 'children' }"
|
|
|
+ ></el-tree>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
|
@@ -175,10 +295,8 @@ import {
|
|
|
updateRole,
|
|
|
deptTreeSelect,
|
|
|
} from "@/api/system/inItRole";
|
|
|
-import {
|
|
|
- roleMenuTreeselect,
|
|
|
- treeselect as menuTreeselect,
|
|
|
-} from "@/api/system/menu";
|
|
|
+import { treeselect as menuTreeselect } from "@/api/system/menu";
|
|
|
+import { roleMenuTreeselect } from "@/api/system/menuInIt";
|
|
|
|
|
|
const router = useRouter();
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
@@ -224,9 +342,6 @@ const data = reactive({
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 20,
|
|
|
- roleName: undefined,
|
|
|
- roleKey: undefined,
|
|
|
- status: undefined,
|
|
|
},
|
|
|
rules: {
|
|
|
roleName: [
|
|
|
@@ -249,6 +364,7 @@ function getList() {
|
|
|
roleList.value = response.rows;
|
|
|
total.value = response.total;
|
|
|
loading.value = false;
|
|
|
+ console.log(response);
|
|
|
}
|
|
|
);
|
|
|
}
|
|
|
@@ -275,7 +391,7 @@ function handleDelete(row) {
|
|
|
getList();
|
|
|
proxy.$modal.msgSuccess("删除成功");
|
|
|
})
|
|
|
- .catch(() => { });
|
|
|
+ .catch(() => {});
|
|
|
}
|
|
|
/** 导出按钮操作 */
|
|
|
function handleExport() {
|
|
|
@@ -374,24 +490,24 @@ function handleAdd() {
|
|
|
/** 修改角色 */
|
|
|
function handleUpdate(row) {
|
|
|
reset();
|
|
|
- const roleId = row.roleId || ids.value;
|
|
|
+ const roleId = row.id || ids.value;
|
|
|
const roleMenu = getRoleMenuTreeselect(roleId);
|
|
|
- getRole(roleId).then((response) => {
|
|
|
- form.value = response.data;
|
|
|
- form.value.roleSort = Number(form.value.roleSort);
|
|
|
- open.value = true;
|
|
|
- nextTick(() => {
|
|
|
- roleMenu.then((res) => {
|
|
|
- let checkedKeys = res.checkedKeys;
|
|
|
- checkedKeys.forEach((v) => {
|
|
|
- nextTick(() => {
|
|
|
- menuRef.value.setChecked(v, true, false);
|
|
|
- });
|
|
|
- });
|
|
|
- });
|
|
|
- });
|
|
|
- title.value = "修改角色";
|
|
|
- });
|
|
|
+ // getRole(roleId).then((response) => {
|
|
|
+ // form.value = response.data;
|
|
|
+ // form.value.roleSort = Number(form.value.roleSort);
|
|
|
+ // open.value = true;
|
|
|
+ // nextTick(() => {
|
|
|
+ // roleMenu.then((res) => {
|
|
|
+ // let checkedKeys = res.checkedKeys;
|
|
|
+ // checkedKeys.forEach((v) => {
|
|
|
+ // nextTick(() => {
|
|
|
+ // menuRef.value.setChecked(v, true, false);
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // title.value = "修改角色";
|
|
|
+ // });
|
|
|
}
|
|
|
/** 根据角色ID查询菜单树结构 */
|
|
|
function getRoleMenuTreeselect(roleId) {
|
ezhizao_zx