|
|
@@ -1,6 +1,12 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
|
|
+ <el-form
|
|
|
+ :model="queryParams"
|
|
|
+ ref="queryForm"
|
|
|
+ size="small"
|
|
|
+ :inline="true"
|
|
|
+ v-show="showSearch"
|
|
|
+ >
|
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
|
<el-input
|
|
|
v-model="queryParams.roleName"
|
|
|
@@ -34,36 +40,52 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-<!-- <el-form-item label="创建时间">-->
|
|
|
-<!-- <el-date-picker-->
|
|
|
-<!-- v-model="dateRange"-->
|
|
|
-<!-- style="width: 240px"-->
|
|
|
-<!-- value-format="yyyy-MM-dd"-->
|
|
|
-<!-- type="daterange"-->
|
|
|
-<!-- range-separator="-"-->
|
|
|
-<!-- start-placeholder="开始日期"-->
|
|
|
-<!-- end-placeholder="结束日期"-->
|
|
|
-<!-- ></el-date-picker>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
+ <!-- <el-form-item label="创建时间">-->
|
|
|
+ <!-- <el-date-picker-->
|
|
|
+ <!-- v-model="dateRange"-->
|
|
|
+ <!-- style="width: 240px"-->
|
|
|
+ <!-- value-format="yyyy-MM-dd"-->
|
|
|
+ <!-- type="daterange"-->
|
|
|
+ <!-- range-separator="-"-->
|
|
|
+ <!-- start-placeholder="开始日期"-->
|
|
|
+ <!-- end-placeholder="结束日期"-->
|
|
|
+ <!-- ></el-date-picker>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
<el-form-item>
|
|
|
- <el-button v-no-more-click type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button v-no-more-click icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
+ icon="el-icon-refresh"
|
|
|
+ size="mini"
|
|
|
+ @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button v-no-more-click
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
type="primary"
|
|
|
plain
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['system:role:add']"
|
|
|
- >新增</el-button>
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button v-no-more-click
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
type="success"
|
|
|
plain
|
|
|
icon="el-icon-edit"
|
|
|
@@ -71,10 +93,12 @@
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['system:role:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button v-no-more-click
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
type="danger"
|
|
|
plain
|
|
|
icon="el-icon-delete"
|
|
|
@@ -82,26 +106,46 @@
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
v-hasPermi="['system:role:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button v-no-more-click
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
type="warning"
|
|
|
plain
|
|
|
icon="el-icon-download"
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['system:role:export']"
|
|
|
- >导出</el-button>
|
|
|
+ >导出</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ ></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="roleList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="110" align="center" />
|
|
|
<el-table-column label="角色编号" prop="roleId" width="160" />
|
|
|
- <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="260" />
|
|
|
- <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="260" />
|
|
|
+ <el-table-column
|
|
|
+ label="角色名称"
|
|
|
+ prop="roleName"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ width="260"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="权限字符"
|
|
|
+ prop="roleKey"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ width="260"
|
|
|
+ />
|
|
|
<el-table-column label="显示顺序" prop="roleSort" width="160" />
|
|
|
<el-table-column label="状态" align="center" width="160">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -113,36 +157,56 @@
|
|
|
></el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <span>{{ parseTime(scope.row.createTime) }}</span>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <span>{{ parseTime(scope.row.createTime) }}</span>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ >
|
|
|
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
|
|
|
- <el-button v-no-more-click
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['system:role:edit']"
|
|
|
- >修改</el-button>
|
|
|
- <el-button v-no-more-click
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-no-more-click
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['system:role:remove']"
|
|
|
- >删除</el-button>
|
|
|
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
+ <el-dropdown
|
|
|
+ size="mini"
|
|
|
+ @command="(command) => handleCommand(command, scope.row)"
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
+ >
|
|
|
<span class="el-dropdown-link">
|
|
|
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
|
|
|
</span>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
|
|
|
- v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
|
|
|
- <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
|
|
|
- v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
|
|
|
+ <el-dropdown-item
|
|
|
+ command="handleDataScope"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
+ >数据权限</el-dropdown-item
|
|
|
+ >
|
|
|
+ <el-dropdown-item
|
|
|
+ command="handleAuthUser"
|
|
|
+ icon="el-icon-user"
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
+ >分配用户</el-dropdown-item
|
|
|
+ >
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
</template>
|
|
|
@@ -150,7 +214,7 @@
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
+ v-show="total > 0"
|
|
|
:total="total"
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@@ -165,15 +229,22 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="roleKey">
|
|
|
<span slot="label">
|
|
|
- <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
|
|
|
+ <el-tooltip
|
|
|
+ content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
|
|
|
+ placement="top"
|
|
|
+ >
|
|
|
<i class="el-icon-question"></i>
|
|
|
</el-tooltip>
|
|
|
权限字符
|
|
|
</span>
|
|
|
<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 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">
|
|
|
@@ -181,13 +252,26 @@
|
|
|
v-for="dict in dict.type.sys_normal_disable"
|
|
|
:key="dict.value"
|
|
|
:label="dict.value"
|
|
|
- >{{dict.label}}</el-radio>
|
|
|
+ >{{ 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-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"
|
|
|
@@ -200,17 +284,28 @@
|
|
|
></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>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button v-no-more-click type="primary" @click="submitForm">确 定</el-button>
|
|
|
+ <el-button v-no-more-click type="primary" @click="submitForm"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
<el-button v-no-more-click @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 分配角色数据权限对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ :visible.sync="openDataScope"
|
|
|
+ width="500px"
|
|
|
+ append-to-body
|
|
|
+ >
|
|
|
<el-form :model="form" label-width="80px">
|
|
|
<el-form-item label="角色名称">
|
|
|
<el-input v-model="form.roleName" :disabled="true" />
|
|
|
@@ -218,18 +313,21 @@
|
|
|
<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 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 label="岗位权限">
|
|
|
- <el-select v-model="form.marsDataScope" @change="dataScopeSelectChange">
|
|
|
+ <el-select
|
|
|
+ v-model="form.marsDataScope"
|
|
|
+ @change="dataScopeSelectChange"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="item in dict.type.role_scope"
|
|
|
:key="item.value"
|
|
|
@@ -238,26 +336,38 @@
|
|
|
></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="dept"-->
|
|
|
-<!-- node-key="id"-->
|
|
|
-<!-- :check-strictly="!form.deptCheckStrictly"-->
|
|
|
-<!-- empty-text="加载中，请稍候"-->
|
|
|
-<!-- :props="defaultProps"-->
|
|
|
-<!-- ></el-tree>-->
|
|
|
-<!-- </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="dept"-->
|
|
|
+ <!-- node-key="id"-->
|
|
|
+ <!-- :check-strictly="!form.deptCheckStrictly"-->
|
|
|
+ <!-- empty-text="加载中，请稍候"-->
|
|
|
+ <!-- :props="defaultProps"-->
|
|
|
+ <!-- ></el-tree>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
<el-form-item label="数据权限" v-show="form.marsDataScope == 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-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="workstationOptions"
|
|
|
@@ -272,7 +382,9 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button v-no-more-click type="primary" @click="submitDataScope">确 定</el-button>
|
|
|
+ <el-button v-no-more-click type="primary" @click="submitDataScope"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
<el-button v-no-more-click @click="cancelDataScope">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -280,14 +392,28 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
|
|
|
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
|
|
|
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
|
|
|
-import { listMarsDept } from '@/api/system/marsdept'
|
|
|
+import {
|
|
|
+ listRole,
|
|
|
+ getRole,
|
|
|
+ delRole,
|
|
|
+ addRole,
|
|
|
+ updateRole,
|
|
|
+ dataScope,
|
|
|
+ changeRoleStatus,
|
|
|
+} from "@/api/system/role";
|
|
|
+import {
|
|
|
+ treeselect as menuTreeselect,
|
|
|
+ roleMenuTreeselect,
|
|
|
+} from "@/api/system/menu";
|
|
|
+import {
|
|
|
+ treeselect as deptTreeselect,
|
|
|
+ roleDeptTreeselect,
|
|
|
+} from "@/api/system/dept";
|
|
|
+import { listMarsDept } from "@/api/system/marsdept";
|
|
|
|
|
|
export default {
|
|
|
name: "Role",
|
|
|
- dicts: ['sys_normal_disable','role_scope'],
|
|
|
+ dicts: ["sys_normal_disable", "role_scope"],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
|
@@ -320,57 +446,57 @@ export default {
|
|
|
dataScopeOptions: [
|
|
|
{
|
|
|
value: "1",
|
|
|
- label: "全部数据权限"
|
|
|
+ label: "全部数据权限",
|
|
|
},
|
|
|
{
|
|
|
value: "2",
|
|
|
- label: "自定数据权限"
|
|
|
+ label: "自定数据权限",
|
|
|
},
|
|
|
{
|
|
|
value: "3",
|
|
|
- label: "本部门数据权限"
|
|
|
+ label: "本部门数据权限",
|
|
|
},
|
|
|
{
|
|
|
value: "4",
|
|
|
- label: "本部门及以下数据权限"
|
|
|
+ label: "本部门及以下数据权限",
|
|
|
},
|
|
|
{
|
|
|
value: "5",
|
|
|
- label: "仅本人数据权限"
|
|
|
- }
|
|
|
+ label: "仅本人数据权限",
|
|
|
+ },
|
|
|
],
|
|
|
// 菜单列表
|
|
|
menuOptions: [],
|
|
|
// 部门列表
|
|
|
deptOptions: [],
|
|
|
// 岗位权限下拉
|
|
|
- workstationOptions:[],
|
|
|
+ workstationOptions: [],
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
roleName: undefined,
|
|
|
roleKey: undefined,
|
|
|
- status: undefined
|
|
|
+ status: undefined,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
defaultProps: {
|
|
|
children: "children",
|
|
|
- label: "label"
|
|
|
+ label: "label",
|
|
|
},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
roleName: [
|
|
|
- { required: true, message: "角色名称不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "角色名称不能为空", trigger: "blur" },
|
|
|
],
|
|
|
roleKey: [
|
|
|
- { required: true, message: "权限字符不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "权限字符不能为空", trigger: "blur" },
|
|
|
],
|
|
|
roleSort: [
|
|
|
- { required: true, message: "角色顺序不能为空", trigger: "blur" }
|
|
|
- ]
|
|
|
- }
|
|
|
+ { required: true, message: "角色顺序不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -380,62 +506,62 @@ export default {
|
|
|
/** 查询角色列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
+ listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
|
|
|
+ (response) => {
|
|
|
this.roleList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
}
|
|
|
);
|
|
|
- const data={
|
|
|
- pages:1,
|
|
|
- size:-1
|
|
|
- }
|
|
|
- listMarsDept(data).then(response => {
|
|
|
+ const data = {
|
|
|
+ pages: 1,
|
|
|
+ size: -1,
|
|
|
+ };
|
|
|
+ listMarsDept(data).then((response) => {
|
|
|
debugger;
|
|
|
- this.workstationOptions = this.transformToTree(response.data.records)
|
|
|
- console.log(this.workstationOptions ,'岗位权限数据');
|
|
|
- })
|
|
|
+ this.workstationOptions = this.transformToTree(response.data.records);
|
|
|
+ console.log(this.workstationOptions, "岗位权限数据");
|
|
|
+ });
|
|
|
},
|
|
|
/** 转换mars岗位树数据为树形结构 */
|
|
|
transformToTree(records) {
|
|
|
- const recordMap = {} // 创建一个 Map 以存储所有记录
|
|
|
- const tree = [] // 最终返回的树形结构
|
|
|
+ const recordMap = {}; // 创建一个 Map 以存储所有记录
|
|
|
+ const tree = []; // 最终返回的树形结构
|
|
|
|
|
|
// 初始化所有记录到 Map
|
|
|
- records.forEach(record => {
|
|
|
+ records.forEach((record) => {
|
|
|
recordMap[record.workstationId] = {
|
|
|
id: record.workstationId,
|
|
|
label: record.workstationName,
|
|
|
- children: []
|
|
|
- }
|
|
|
- })
|
|
|
+ children: [],
|
|
|
+ };
|
|
|
+ });
|
|
|
|
|
|
// 遍历记录并构建树
|
|
|
- records.forEach(record => {
|
|
|
- const parentId = record.parentId
|
|
|
+ records.forEach((record) => {
|
|
|
+ const parentId = record.parentId;
|
|
|
|
|
|
- if (parentId === '0') {
|
|
|
+ if (parentId === "0") {
|
|
|
// 如果是顶层节点，直接添加到树中
|
|
|
- tree.push(recordMap[record.workstationId])
|
|
|
+ tree.push(recordMap[record.workstationId]);
|
|
|
} else if (recordMap[parentId]) {
|
|
|
// 如果有父节点，则将当前节点加入父节点的 children 中
|
|
|
- recordMap[parentId].children.push(recordMap[record.workstationId])
|
|
|
+ recordMap[parentId].children.push(recordMap[record.workstationId]);
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
|
|
|
- return tree
|
|
|
+ return tree;
|
|
|
},
|
|
|
/** 查询菜单树结构 */
|
|
|
getMenuTreeselect() {
|
|
|
- menuTreeselect().then(response => {
|
|
|
+ menuTreeselect().then((response) => {
|
|
|
this.menuOptions = response.data;
|
|
|
});
|
|
|
},
|
|
|
/** 查询部门树结构 */
|
|
|
getDeptTreeselect() {
|
|
|
- deptTreeselect().then(response => {
|
|
|
+ deptTreeselect().then((response) => {
|
|
|
this.deptOptions = response.data;
|
|
|
-
|
|
|
});
|
|
|
},
|
|
|
// 所有菜单节点数据
|
|
|
@@ -458,14 +584,14 @@ export default {
|
|
|
},
|
|
|
/** 根据角色ID查询菜单树结构 */
|
|
|
getRoleMenuTreeselect(roleId) {
|
|
|
- return roleMenuTreeselect(roleId).then(response => {
|
|
|
+ return roleMenuTreeselect(roleId).then((response) => {
|
|
|
this.menuOptions = response.menus;
|
|
|
return response;
|
|
|
});
|
|
|
},
|
|
|
/** 根据角色ID查询部门树结构 */
|
|
|
getRoleDeptTreeselect(roleId) {
|
|
|
- return roleDeptTreeselect(roleId).then(response => {
|
|
|
+ return roleDeptTreeselect(roleId).then((response) => {
|
|
|
this.deptOptions = response.depts;
|
|
|
return response;
|
|
|
});
|
|
|
@@ -473,13 +599,17 @@ export default {
|
|
|
// 角色状态修改
|
|
|
handleStatusChange(row) {
|
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
|
- this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
|
|
|
- return changeRoleStatus(row.roleId, row.status);
|
|
|
- }).then(() => {
|
|
|
- this.$modal.msgSuccess(text + "成功");
|
|
|
- }).catch(function() {
|
|
|
- row.status = row.status === "0" ? "1" : "0";
|
|
|
- });
|
|
|
+ this.$modal
|
|
|
+ .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？')
|
|
|
+ .then(function () {
|
|
|
+ return changeRoleStatus(row.roleId, row.status);
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.$modal.msgSuccess(text + "成功");
|
|
|
+ })
|
|
|
+ .catch(function () {
|
|
|
+ row.status = row.status === "0" ? "1" : "0";
|
|
|
+ });
|
|
|
},
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
@@ -496,23 +626,23 @@ export default {
|
|
|
if (this.$refs.menu != undefined) {
|
|
|
this.$refs.menu.setCheckedKeys([]);
|
|
|
}
|
|
|
- this.menuExpand = false,
|
|
|
- this.menuNodeAll = false,
|
|
|
- this.deptExpand = true,
|
|
|
- this.deptNodeAll = false,
|
|
|
- this.form = {
|
|
|
- roleId: undefined,
|
|
|
- roleName: undefined,
|
|
|
- roleKey: undefined,
|
|
|
- roleSort: 0,
|
|
|
- status: "0",
|
|
|
- menuIds: [],
|
|
|
- deptIds: [],
|
|
|
- workstationIds:[],
|
|
|
- menuCheckStrictly: true,
|
|
|
- deptCheckStrictly: true,
|
|
|
- remark: undefined
|
|
|
- };
|
|
|
+ (this.menuExpand = false),
|
|
|
+ (this.menuNodeAll = false),
|
|
|
+ (this.deptExpand = true),
|
|
|
+ (this.deptNodeAll = false),
|
|
|
+ (this.form = {
|
|
|
+ roleId: undefined,
|
|
|
+ roleName: undefined,
|
|
|
+ roleKey: undefined,
|
|
|
+ roleSort: 0,
|
|
|
+ status: "0",
|
|
|
+ menuIds: [],
|
|
|
+ deptIds: [],
|
|
|
+ workstationIds: [],
|
|
|
+ menuCheckStrictly: true,
|
|
|
+ deptCheckStrictly: true,
|
|
|
+ remark: undefined,
|
|
|
+ });
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -528,9 +658,9 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.roleId)
|
|
|
- this.single = selection.length!=1
|
|
|
- this.multiple = !selection.length
|
|
|
+ this.ids = selection.map((item) => item.roleId);
|
|
|
+ this.single = selection.length != 1;
|
|
|
+ this.multiple = !selection.length;
|
|
|
},
|
|
|
// 更多操作触发
|
|
|
handleCommand(command, row) {
|
|
|
@@ -547,14 +677,14 @@ export default {
|
|
|
},
|
|
|
// 树权限（展开/折叠）
|
|
|
handleCheckedTreeExpand(value, type) {
|
|
|
- if (type == 'menu') {
|
|
|
+ if (type == "menu") {
|
|
|
let treeList = this.menuOptions;
|
|
|
for (let i = 0; i < treeList.length; i++) {
|
|
|
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
|
|
|
}
|
|
|
- } else if (type == 'dept') {
|
|
|
+ } else if (type == "dept") {
|
|
|
// let treeList = this.deptOptions;//原本部门权限设置
|
|
|
- let treeList=this.workstationOptions;
|
|
|
+ let treeList = this.workstationOptions;
|
|
|
for (let i = 0; i < treeList.length; i++) {
|
|
|
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
|
|
|
}
|
|
|
@@ -562,20 +692,19 @@ export default {
|
|
|
},
|
|
|
// 树权限（全选/全不选）
|
|
|
handleCheckedTreeNodeAll(value, type) {
|
|
|
- if (type == 'menu') {
|
|
|
- this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
|
|
|
- } else if (type == 'dept') {
|
|
|
+ if (type == "menu") {
|
|
|
+ this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
|
|
|
+ } else if (type == "dept") {
|
|
|
// this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
|
|
|
- this.$refs.dept.setCheckedNodes(value ? this.workstationOptions: []);
|
|
|
-
|
|
|
+ this.$refs.dept.setCheckedNodes(value ? this.workstationOptions : []);
|
|
|
}
|
|
|
},
|
|
|
// 树权限（父子联动）
|
|
|
handleCheckedTreeConnect(value, type) {
|
|
|
- if (type == 'menu') {
|
|
|
- this.form.menuCheckStrictly = value ? true: false;
|
|
|
- } else if (type == 'dept') {
|
|
|
- this.form.deptCheckStrictly = value ? true: false;
|
|
|
+ if (type == "menu") {
|
|
|
+ this.form.menuCheckStrictly = value ? true : false;
|
|
|
+ } else if (type == "dept") {
|
|
|
+ this.form.deptCheckStrictly = value ? true : false;
|
|
|
}
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
@@ -583,24 +712,24 @@ export default {
|
|
|
this.reset();
|
|
|
this.getMenuTreeselect();
|
|
|
this.open = true;
|
|
|
- this.title = "添加角色";
|
|
|
+ this.title = "新增角色";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const roleId = row.roleId || this.ids
|
|
|
+ const roleId = row.roleId || this.ids;
|
|
|
const roleMenu = this.getRoleMenuTreeselect(roleId);
|
|
|
- getRole(roleId).then(response => {
|
|
|
+ getRole(roleId).then((response) => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
this.$nextTick(() => {
|
|
|
- roleMenu.then(res => {
|
|
|
- let checkedKeys = res.checkedKeys
|
|
|
+ roleMenu.then((res) => {
|
|
|
+ let checkedKeys = res.checkedKeys;
|
|
|
checkedKeys.forEach((v) => {
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.$refs.menu.setChecked(v, true ,false);
|
|
|
- })
|
|
|
- })
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.menu.setChecked(v, true, false);
|
|
|
+ });
|
|
|
+ });
|
|
|
});
|
|
|
});
|
|
|
this.title = "修改角色";
|
|
|
@@ -608,7 +737,7 @@ export default {
|
|
|
},
|
|
|
/** 选择角色权限范围触发 */
|
|
|
dataScopeSelectChange(value) {
|
|
|
- if(value !== '2') {
|
|
|
+ if (value !== "2") {
|
|
|
this.$refs.dept.setCheckedKeys([]);
|
|
|
}
|
|
|
},
|
|
|
@@ -617,15 +746,15 @@ export default {
|
|
|
this.reset();
|
|
|
// const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);//原来部门的选中回显权限
|
|
|
|
|
|
- getRole(row.roleId).then(response => {
|
|
|
+ getRole(row.roleId).then((response) => {
|
|
|
this.form = response.data;
|
|
|
this.openDataScope = true;
|
|
|
this.$nextTick(() => {
|
|
|
- response.data.workstationIds.forEach((v) => {
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.$refs.dept.setChecked(v, true,false);
|
|
|
- })
|
|
|
- })
|
|
|
+ response.data.workstationIds.forEach((v) => {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.dept.setChecked(v, true, false);
|
|
|
+ });
|
|
|
+ });
|
|
|
// 原本部门的数据权限回显
|
|
|
// roleDeptTreeselect.then(res => {
|
|
|
// this.$refs.dept.setCheckedKeys(res.checkedKeys);
|
|
|
@@ -636,24 +765,24 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 分配用户操作 */
|
|
|
- handleAuthUser: function(row) {
|
|
|
+ handleAuthUser: function (row) {
|
|
|
const roleId = row.roleId;
|
|
|
this.$router.push("/system/role-auth/user/" + roleId);
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
- submitForm: function() {
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
+ submitForm: function () {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.form.roleId != undefined) {
|
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
|
- updateRole(this.form).then(response => {
|
|
|
+ updateRole(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
});
|
|
|
} else {
|
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
|
- addRole(this.form).then(response => {
|
|
|
+ addRole(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -663,11 +792,11 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮（数据权限） */
|
|
|
- submitDataScope: function() {
|
|
|
+ submitDataScope: function () {
|
|
|
if (this.form.roleId != undefined) {
|
|
|
// this.form.deptIds = this.getDeptAllCheckedKeys();
|
|
|
this.form.workstationIds = this.getDeptAllCheckedKeys();
|
|
|
- dataScope(this.form).then(response => {
|
|
|
+ dataScope(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.openDataScope = false;
|
|
|
this.getList();
|
|
|
@@ -675,21 +804,30 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
/** 删除按钮操作 */
|
|
|
+ // .confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？')
|
|
|
handleDelete(row) {
|
|
|
const roleIds = row.roleId || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
|
|
|
- return delRole(roleIds);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ this.$modal
|
|
|
+ .confirm("是否确认删除所选数据项？")
|
|
|
+ .then(function () {
|
|
|
+ return delRole(roleIds);
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- this.download('system/role/export', {
|
|
|
- ...this.queryParams
|
|
|
- }, `role_${new Date().getTime()}.xlsx`)
|
|
|
- }
|
|
|
- }
|
|
|
+ this.download(
|
|
|
+ "system/role/export",
|
|
|
+ {
|
|
|
+ ...this.queryParams,
|
|
|
+ },
|
|
|
+ `role_${new Date().getTime()}.xlsx`
|
|
|
+ );
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
