|
|
@@ -3,7 +3,7 @@
|
|
3
|
3
|
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
4
|
4
|
<div v-show="showSearch" class="mb-[10px]">
|
|
5
|
5
|
<el-card shadow="hover">
|
|
6
|
|
- <el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
|
6
|
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto" class="-mb-25px -mt-5px">
|
|
7
|
7
|
<el-form-item label="角色名称" prop="roleName">
|
|
8
|
8
|
<el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable @keyup.enter="handleQuery" />
|
|
9
|
9
|
</el-form-item>
|
|
|
@@ -58,9 +58,9 @@
|
|
58
|
58
|
<el-table ref="roleTableRef" v-loading="loading" max-height="calc(100vh - 23.75rem)" :data="roleList" @selection-change="handleSelectionChange">
|
|
59
|
59
|
<el-table-column type="selection" width="55" align="center" />
|
|
60
|
60
|
<el-table-column v-if="false" label="角色编号" prop="roleId" width="120" />
|
|
61
|
|
- <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
|
|
62
|
|
- <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="200" />
|
|
63
|
|
- <el-table-column label="显示顺序" prop="roleSort" width="100" />
|
|
|
61
|
+ <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="300" />
|
|
|
62
|
+ <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="300" />
|
|
|
63
|
+ <el-table-column label="显示顺序" prop="roleSort" width="150" />
|
|
64
|
64
|
<el-table-column label="状态" align="center" width="100">
|
|
65
|
65
|
<template #default="scope">
|
|
66
|
66
|
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
|
|
|
@@ -72,7 +72,7 @@
|
|
72
|
72
|
</template>
|
|
73
|
73
|
</el-table-column>
|
|
74
|
74
|
|
|
75
|
|
- <el-table-column fixed="right" label="操作" width="180">
|
|
|
75
|
+ <el-table-column fixed="right" label="操作" width="300">
|
|
76
|
76
|
<template #default="scope">
|
|
77
|
77
|
<el-tooltip v-if="scope.row.roleId !== 1" content="修改" placement="top">
|
|
78
|
78
|
<el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
|
|
|
@@ -196,6 +196,7 @@ import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updat
|
|
196
|
196
|
import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
|
|
197
|
197
|
import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
|
|
198
|
198
|
import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
|
|
|
199
|
+import { QuestionFilled } from '@element-plus/icons-vue';
|
|
199
|
200
|
|
|
200
|
201
|
const router = useRouter();
|
|
201
|
202
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
luoyb