|
@@ -1,91 +1,222 @@
|
|
<template>
|
|
<template>
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
- <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
|
|
|
|
|
|
+ <el-form
|
|
|
|
+ :model="queryParams"
|
|
|
|
+ ref="queryForm"
|
|
|
|
+ v-show="showSearch"
|
|
|
|
+ :inline="true"
|
|
|
|
+ >
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
- <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable size="small" style="width: 240px"
|
|
|
|
- @keyup.enter.native="handleQuery" />
|
|
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="queryParams.roleName"
|
|
|
|
+ placeholder="请输入角色名称"
|
|
|
|
+ clearable
|
|
|
|
+ size="small"
|
|
|
|
+ style="width: 240px"
|
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="权限字符" prop="roleKey">
|
|
<el-form-item label="权限字符" prop="roleKey">
|
|
- <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable size="small" style="width: 240px"
|
|
|
|
- @keyup.enter.native="handleQuery" />
|
|
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="queryParams.roleKey"
|
|
|
|
+ placeholder="请输入权限字符"
|
|
|
|
+ clearable
|
|
|
|
+ size="small"
|
|
|
|
+ style="width: 240px"
|
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="状态" prop="status">
|
|
<el-form-item label="状态" prop="status">
|
|
- <el-select v-model="queryParams.status" placeholder="角色状态" clearable size="small" style="width: 240px">
|
|
|
|
- <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
|
|
|
|
- :value="dict.value" />
|
|
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.status"
|
|
|
|
+ placeholder="角色状态"
|
|
|
|
+ clearable
|
|
|
|
+ size="small"
|
|
|
|
+ style="width: 240px"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in dict.type.sys_normal_disable"
|
|
|
|
+ :key="dict.value"
|
|
|
|
+ :label="dict.label"
|
|
|
|
+ :value="dict.value"
|
|
|
|
+ />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="创建时间">
|
|
<el-form-item label="创建时间">
|
|
- <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
|
|
|
- range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="dateRange"
|
|
|
|
+ size="small"
|
|
|
|
+ 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-form-item>
|
|
<el-form-item>
|
|
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ type="primary"
|
|
|
|
+ icon="el-icon-search"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleQuery"
|
|
|
|
+ >搜索</el-button
|
|
|
|
+ >
|
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
|
+ >重置</el-button
|
|
|
|
+ >
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
<el-row :gutter="10" class="mb8">
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
|
- v-hasPermi="['system:role:add']">新增</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ type="primary"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-plus"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleAdd"
|
|
|
|
+ v-hasPermi="['system:role:add']"
|
|
|
|
+ >新增</el-button
|
|
|
|
+ >
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
|
- v-hasPermi="['system:role:edit']">修改</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ type="success"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-edit"
|
|
|
|
+ size="mini"
|
|
|
|
+ :disabled="single"
|
|
|
|
+ @click="handleUpdate"
|
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
|
+ >修改</el-button
|
|
|
|
+ >
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
|
|
|
- v-hasPermi="['system:role:remove']">删除</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ type="danger"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-delete"
|
|
|
|
+ size="mini"
|
|
|
|
+ :disabled="multiple"
|
|
|
|
+ @click="handleDelete"
|
|
|
|
+ v-hasPermi="['system:role:remove']"
|
|
|
|
+ >删除</el-button
|
|
|
|
+ >
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
|
- v-hasPermi="['system:role:export']">导出</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ type="warning"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-download"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleExport"
|
|
|
|
+ v-hasPermi="['system:role:export']"
|
|
|
|
+ >导出</el-button
|
|
|
|
+ >
|
|
</el-col>
|
|
</el-col>
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
|
|
|
+ <right-toolbar
|
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
|
+ @queryTable="getList"
|
|
|
|
+ ></right-toolbar>
|
|
</el-row>
|
|
</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="55" align="center" />
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
<el-table-column label="角色编号" prop="roleId" width="120" />
|
|
<el-table-column 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="150" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="角色名称"
|
|
|
|
+ prop="roleName"
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
+ width="150"
|
|
|
|
+ />
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="权限字符"
|
|
|
|
+ prop="roleKey"
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
+ width="150"
|
|
|
|
+ />
|
|
<el-table-column label="显示顺序" prop="roleSort" width="100" />
|
|
<el-table-column label="显示顺序" prop="roleSort" width="100" />
|
|
<el-table-column label="状态" align="center" width="100">
|
|
<el-table-column label="状态" align="center" width="100">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
|
|
|
- @change="handleStatusChange(scope.row)"></el-switch>
|
|
|
|
|
|
+ <el-switch
|
|
|
|
+ v-model="scope.row.status"
|
|
|
|
+ active-value="0"
|
|
|
|
+ inactive-value="1"
|
|
|
|
+ @change="handleStatusChange(scope.row)"
|
|
|
|
+ ></el-switch>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="创建时间"
|
|
|
|
+ align="center"
|
|
|
|
+ prop="createTime"
|
|
|
|
+ width="180"
|
|
|
|
+ >
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<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">
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="操作"
|
|
|
|
+ align="center"
|
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
|
+ >
|
|
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
|
|
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
|
|
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
|
|
|
- v-hasPermi="['system:role:edit']">修改</el-button>
|
|
|
|
- <el-button 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
|
|
|
|
+ size="mini"
|
|
|
|
+ type="text"
|
|
|
|
+ icon="el-icon-edit"
|
|
|
|
+ @click="handleUpdate(scope.row)"
|
|
|
|
+ v-hasPermi="['system:role:edit']"
|
|
|
|
+ >修改</el-button
|
|
|
|
+ >
|
|
|
|
+ <el-button
|
|
|
|
+ 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']"
|
|
|
|
+ >
|
|
<span class="el-dropdown-link">
|
|
<span class="el-dropdown-link">
|
|
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
|
|
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
|
|
</span>
|
|
</span>
|
|
<el-dropdown-menu slot="dropdown">
|
|
<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-menu>
|
|
</el-dropdown>
|
|
</el-dropdown>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
|
|
|
|
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
|
|
|
- @pagination="getList" />
|
|
|
|
|
|
+ <pagination
|
|
|
|
+ v-show="total > 0"
|
|
|
|
+ :total="total"
|
|
|
|
+ :page.sync="queryParams.pageNum"
|
|
|
|
+ :limit.sync="queryParams.pageSize"
|
|
|
|
+ @pagination="getList"
|
|
|
|
+ />
|
|
|
|
|
|
<!-- 添加或修改角色配置对话框 -->
|
|
<!-- 添加或修改角色配置对话框 -->
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
@@ -95,7 +226,10 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item prop="roleKey">
|
|
<el-form-item prop="roleKey">
|
|
<span slot="label">
|
|
<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>
|
|
<i class="el-icon-question"></i>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
权限字符
|
|
权限字符
|
|
@@ -103,24 +237,55 @@
|
|
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
|
|
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="角色顺序" prop="roleSort">
|
|
<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>
|
|
<el-form-item label="状态">
|
|
<el-form-item label="状态">
|
|
<el-radio-group v-model="form.status">
|
|
<el-radio-group v-model="form.status">
|
|
- <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
|
|
|
|
- :label="dict.value">{{ dict.label }}</el-radio>
|
|
|
|
|
|
+ <el-radio
|
|
|
|
+ v-for="dict in dict.type.sys_normal_disable"
|
|
|
|
+ :key="dict.value"
|
|
|
|
+ :label="dict.value"
|
|
|
|
+ >{{ dict.label }}</el-radio
|
|
|
|
+ >
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="菜单权限">
|
|
<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="menu" node-key="id"
|
|
|
|
- :check-strictly="!form.menuCheckStrictly" empty-text="加载中,请稍候" :props="defaultProps"></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="menu"
|
|
|
|
+ node-key="id"
|
|
|
|
+ :check-strictly="!form.menuCheckStrictly"
|
|
|
|
+ empty-text="加载中,请稍候"
|
|
|
|
+ :props="defaultProps"
|
|
|
|
+ ></el-tree>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="备注">
|
|
<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-item>
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -130,7 +295,12 @@
|
|
</el-dialog>
|
|
</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 :model="form" label-width="80px">
|
|
<el-form-item label="角色名称">
|
|
<el-form-item label="角色名称">
|
|
<el-input v-model="form.roleName" :disabled="true" />
|
|
<el-input v-model="form.roleName" :disabled="true" />
|
|
@@ -140,17 +310,43 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="权限范围">
|
|
<el-form-item label="权限范围">
|
|
<el-select v-model="form.dataScope" @change="dataScopeSelectChange">
|
|
<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-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="数据权限" v-show="form.dataScope == 2">
|
|
<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-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>
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -162,13 +358,27 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<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 {
|
|
|
|
+ treeselect as deptTreeselect,
|
|
|
|
+ roleDeptTreeselect,
|
|
|
|
+} from "@/api/system/dept";
|
|
|
|
+import {
|
|
|
|
+ treeselect as menuTreeselect,
|
|
|
|
+ roleMenuTreeselect,
|
|
|
|
+} from "@/api/system/menu";
|
|
|
|
+import {
|
|
|
|
+ addRole,
|
|
|
|
+ changeRoleStatus,
|
|
|
|
+ dataScope,
|
|
|
|
+ delRole,
|
|
|
|
+ getRole,
|
|
|
|
+ listRole,
|
|
|
|
+ updateRole,
|
|
|
|
+} from "@/api/system/role";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "Role",
|
|
name: "Role",
|
|
- dicts: ['sys_normal_disable'],
|
|
|
|
|
|
+ dicts: ["sys_normal_disable"],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
// 遮罩层
|
|
// 遮罩层
|
|
@@ -201,24 +411,24 @@ export default {
|
|
dataScopeOptions: [
|
|
dataScopeOptions: [
|
|
{
|
|
{
|
|
value: "1",
|
|
value: "1",
|
|
- label: "全部数据权限"
|
|
|
|
|
|
+ label: "全部数据权限",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: "2",
|
|
value: "2",
|
|
- label: "自定数据权限"
|
|
|
|
|
|
+ label: "自定数据权限",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: "3",
|
|
value: "3",
|
|
- label: "本部门数据权限"
|
|
|
|
|
|
+ label: "本部门数据权限",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: "4",
|
|
value: "4",
|
|
- label: "本部门及以下数据权限"
|
|
|
|
|
|
+ label: "本部门及以下数据权限",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: "5",
|
|
value: "5",
|
|
- label: "仅本人数据权限"
|
|
|
|
- }
|
|
|
|
|
|
+ label: "仅本人数据权限",
|
|
|
|
+ },
|
|
],
|
|
],
|
|
// 菜单列表
|
|
// 菜单列表
|
|
menuOptions: [],
|
|
menuOptions: [],
|
|
@@ -230,26 +440,26 @@ export default {
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
roleName: undefined,
|
|
roleName: undefined,
|
|
roleKey: undefined,
|
|
roleKey: undefined,
|
|
- status: undefined
|
|
|
|
|
|
+ status: undefined,
|
|
},
|
|
},
|
|
// 表单参数
|
|
// 表单参数
|
|
form: {},
|
|
form: {},
|
|
defaultProps: {
|
|
defaultProps: {
|
|
children: "children",
|
|
children: "children",
|
|
- label: "label"
|
|
|
|
|
|
+ label: "label",
|
|
},
|
|
},
|
|
// 表单校验
|
|
// 表单校验
|
|
rules: {
|
|
rules: {
|
|
roleName: [
|
|
roleName: [
|
|
- { required: true, message: "角色名称不能为空", trigger: "blur" }
|
|
|
|
|
|
+ { required: true, message: "角色名称不能为空", trigger: "blur" },
|
|
],
|
|
],
|
|
roleKey: [
|
|
roleKey: [
|
|
- { required: true, message: "权限字符不能为空", trigger: "blur" }
|
|
|
|
|
|
+ { required: true, message: "权限字符不能为空", trigger: "blur" },
|
|
],
|
|
],
|
|
roleSort: [
|
|
roleSort: [
|
|
- { required: true, message: "角色顺序不能为空", trigger: "blur" }
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
|
|
+ { required: true, message: "角色顺序不能为空", trigger: "blur" },
|
|
|
|
+ ],
|
|
|
|
+ },
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -259,22 +469,23 @@ export default {
|
|
/** 查询角色列表 */
|
|
/** 查询角色列表 */
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
- listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
|
- this.roleList = response.rows;
|
|
|
|
- this.total = response.total;
|
|
|
|
- this.loading = false;
|
|
|
|
- }
|
|
|
|
|
|
+ listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
|
|
|
|
+ (response) => {
|
|
|
|
+ this.roleList = response.rows;
|
|
|
|
+ this.total = response.total;
|
|
|
|
+ this.loading = false;
|
|
|
|
+ }
|
|
);
|
|
);
|
|
},
|
|
},
|
|
/** 查询菜单树结构 */
|
|
/** 查询菜单树结构 */
|
|
getMenuTreeselect() {
|
|
getMenuTreeselect() {
|
|
- menuTreeselect().then(response => {
|
|
|
|
|
|
+ menuTreeselect().then((response) => {
|
|
this.menuOptions = response.data;
|
|
this.menuOptions = response.data;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
/** 查询部门树结构 */
|
|
/** 查询部门树结构 */
|
|
getDeptTreeselect() {
|
|
getDeptTreeselect() {
|
|
- deptTreeselect().then(response => {
|
|
|
|
|
|
+ deptTreeselect().then((response) => {
|
|
this.deptOptions = response.data;
|
|
this.deptOptions = response.data;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -298,14 +509,14 @@ export default {
|
|
},
|
|
},
|
|
/** 根据角色ID查询菜单树结构 */
|
|
/** 根据角色ID查询菜单树结构 */
|
|
getRoleMenuTreeselect(roleId) {
|
|
getRoleMenuTreeselect(roleId) {
|
|
- return roleMenuTreeselect(roleId).then(response => {
|
|
|
|
|
|
+ return roleMenuTreeselect(roleId).then((response) => {
|
|
this.menuOptions = response.menus;
|
|
this.menuOptions = response.menus;
|
|
return response;
|
|
return response;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
/** 根据角色ID查询部门树结构 */
|
|
/** 根据角色ID查询部门树结构 */
|
|
getRoleDeptTreeselect(roleId) {
|
|
getRoleDeptTreeselect(roleId) {
|
|
- return roleDeptTreeselect(roleId).then(response => {
|
|
|
|
|
|
+ return roleDeptTreeselect(roleId).then((response) => {
|
|
this.deptOptions = response.depts;
|
|
this.deptOptions = response.depts;
|
|
return response;
|
|
return response;
|
|
});
|
|
});
|
|
@@ -313,13 +524,17 @@ export default {
|
|
// 角色状态修改
|
|
// 角色状态修改
|
|
handleStatusChange(row) {
|
|
handleStatusChange(row) {
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
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() {
|
|
cancel() {
|
|
@@ -336,11 +551,11 @@ export default {
|
|
if (this.$refs.menu != undefined) {
|
|
if (this.$refs.menu != undefined) {
|
|
this.$refs.menu.setCheckedKeys([]);
|
|
this.$refs.menu.setCheckedKeys([]);
|
|
}
|
|
}
|
|
- this.menuExpand = false,
|
|
|
|
- this.menuNodeAll = false,
|
|
|
|
- this.deptExpand = true,
|
|
|
|
- this.deptNodeAll = false,
|
|
|
|
- this.form = {
|
|
|
|
|
|
+ (this.menuExpand = false),
|
|
|
|
+ (this.menuNodeAll = false),
|
|
|
|
+ (this.deptExpand = true),
|
|
|
|
+ (this.deptNodeAll = false),
|
|
|
|
+ (this.form = {
|
|
roleId: undefined,
|
|
roleId: undefined,
|
|
roleName: undefined,
|
|
roleName: undefined,
|
|
roleKey: undefined,
|
|
roleKey: undefined,
|
|
@@ -350,8 +565,8 @@ export default {
|
|
deptIds: [],
|
|
deptIds: [],
|
|
menuCheckStrictly: true,
|
|
menuCheckStrictly: true,
|
|
deptCheckStrictly: true,
|
|
deptCheckStrictly: true,
|
|
- remark: undefined
|
|
|
|
- };
|
|
|
|
|
|
+ remark: undefined,
|
|
|
|
+ });
|
|
this.resetForm("form");
|
|
this.resetForm("form");
|
|
},
|
|
},
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
@@ -367,9 +582,9 @@ export default {
|
|
},
|
|
},
|
|
// 多选框选中数据
|
|
// 多选框选中数据
|
|
handleSelectionChange(selection) {
|
|
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) {
|
|
handleCommand(command, row) {
|
|
@@ -386,12 +601,12 @@ export default {
|
|
},
|
|
},
|
|
// 树权限(展开/折叠)
|
|
// 树权限(展开/折叠)
|
|
handleCheckedTreeExpand(value, type) {
|
|
handleCheckedTreeExpand(value, type) {
|
|
- if (type == 'menu') {
|
|
|
|
|
|
+ if (type == "menu") {
|
|
let treeList = this.menuOptions;
|
|
let treeList = this.menuOptions;
|
|
for (let i = 0; i < treeList.length; i++) {
|
|
for (let i = 0; i < treeList.length; i++) {
|
|
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
|
|
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.deptOptions;
|
|
for (let i = 0; i < treeList.length; i++) {
|
|
for (let i = 0; i < treeList.length; i++) {
|
|
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
|
|
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
|
|
@@ -400,17 +615,17 @@ export default {
|
|
},
|
|
},
|
|
// 树权限(全选/全不选)
|
|
// 树权限(全选/全不选)
|
|
handleCheckedTreeNodeAll(value, type) {
|
|
handleCheckedTreeNodeAll(value, type) {
|
|
- if (type == 'menu') {
|
|
|
|
|
|
+ if (type == "menu") {
|
|
this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
|
|
this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
|
|
- } else if (type == 'dept') {
|
|
|
|
|
|
+ } else if (type == "dept") {
|
|
this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
|
|
this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 树权限(父子联动)
|
|
// 树权限(父子联动)
|
|
handleCheckedTreeConnect(value, type) {
|
|
handleCheckedTreeConnect(value, type) {
|
|
- if (type == 'menu') {
|
|
|
|
|
|
+ if (type == "menu") {
|
|
this.form.menuCheckStrictly = value ? true : false;
|
|
this.form.menuCheckStrictly = value ? true : false;
|
|
- } else if (type == 'dept') {
|
|
|
|
|
|
+ } else if (type == "dept") {
|
|
this.form.deptCheckStrictly = value ? true : false;
|
|
this.form.deptCheckStrictly = value ? true : false;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -424,19 +639,19 @@ export default {
|
|
/** 修改按钮操作 */
|
|
/** 修改按钮操作 */
|
|
handleUpdate(row) {
|
|
handleUpdate(row) {
|
|
this.reset();
|
|
this.reset();
|
|
- const roleId = row.roleId || this.ids
|
|
|
|
|
|
+ const roleId = row.roleId || this.ids;
|
|
const roleMenu = this.getRoleMenuTreeselect(roleId);
|
|
const roleMenu = this.getRoleMenuTreeselect(roleId);
|
|
- getRole(roleId).then(response => {
|
|
|
|
|
|
+ getRole(roleId).then((response) => {
|
|
this.form = response.data;
|
|
this.form = response.data;
|
|
this.open = true;
|
|
this.open = true;
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
- roleMenu.then(res => {
|
|
|
|
- let checkedKeys = res.checkedKeys
|
|
|
|
|
|
+ roleMenu.then((res) => {
|
|
|
|
+ let checkedKeys = res.checkedKeys;
|
|
checkedKeys.forEach((v) => {
|
|
checkedKeys.forEach((v) => {
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.$refs.menu.setChecked(v, true, false);
|
|
this.$refs.menu.setChecked(v, true, false);
|
|
- })
|
|
|
|
- })
|
|
|
|
|
|
+ });
|
|
|
|
+ });
|
|
});
|
|
});
|
|
});
|
|
});
|
|
this.title = "修改角色";
|
|
this.title = "修改角色";
|
|
@@ -444,7 +659,7 @@ export default {
|
|
},
|
|
},
|
|
/** 选择角色权限范围触发 */
|
|
/** 选择角色权限范围触发 */
|
|
dataScopeSelectChange(value) {
|
|
dataScopeSelectChange(value) {
|
|
- if (value !== '2') {
|
|
|
|
|
|
+ if (value !== "2") {
|
|
this.$refs.dept.setCheckedKeys([]);
|
|
this.$refs.dept.setCheckedKeys([]);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -452,11 +667,11 @@ export default {
|
|
handleDataScope(row) {
|
|
handleDataScope(row) {
|
|
this.reset();
|
|
this.reset();
|
|
const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
|
|
const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
|
|
- getRole(row.roleId).then(response => {
|
|
|
|
|
|
+ getRole(row.roleId).then((response) => {
|
|
this.form = response.data;
|
|
this.form = response.data;
|
|
this.openDataScope = true;
|
|
this.openDataScope = true;
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
- roleDeptTreeselect.then(res => {
|
|
|
|
|
|
+ roleDeptTreeselect.then((res) => {
|
|
this.$refs.dept.setCheckedKeys(res.checkedKeys);
|
|
this.$refs.dept.setCheckedKeys(res.checkedKeys);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
@@ -470,18 +685,18 @@ export default {
|
|
},
|
|
},
|
|
/** 提交按钮 */
|
|
/** 提交按钮 */
|
|
submitForm: function () {
|
|
submitForm: function () {
|
|
- this.$refs["form"].validate(valid => {
|
|
|
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
if (this.form.roleId != undefined) {
|
|
if (this.form.roleId != undefined) {
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
- updateRole(this.form).then(response => {
|
|
|
|
|
|
+ updateRole(this.form).then((response) => {
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.open = false;
|
|
this.open = false;
|
|
this.getList();
|
|
this.getList();
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
- addRole(this.form).then(response => {
|
|
|
|
|
|
+ addRole(this.form).then((response) => {
|
|
this.$modal.msgSuccess("新增成功");
|
|
this.$modal.msgSuccess("新增成功");
|
|
this.open = false;
|
|
this.open = false;
|
|
this.getList();
|
|
this.getList();
|
|
@@ -494,7 +709,7 @@ export default {
|
|
submitDataScope: function () {
|
|
submitDataScope: function () {
|
|
if (this.form.roleId != undefined) {
|
|
if (this.form.roleId != undefined) {
|
|
this.form.deptIds = this.getDeptAllCheckedKeys();
|
|
this.form.deptIds = this.getDeptAllCheckedKeys();
|
|
- dataScope(this.form).then(response => {
|
|
|
|
|
|
+ dataScope(this.form).then((response) => {
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.openDataScope = false;
|
|
this.openDataScope = false;
|
|
this.getList();
|
|
this.getList();
|
|
@@ -504,19 +719,27 @@ export default {
|
|
/** 删除按钮操作 */
|
|
/** 删除按钮操作 */
|
|
handleDelete(row) {
|
|
handleDelete(row) {
|
|
const roleIds = row.roleId || this.ids;
|
|
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('是否确认删除角色编号为"' + roleIds + '"的数据项?')
|
|
|
|
+ .then(function () {
|
|
|
|
+ return delRole(roleIds);
|
|
|
|
+ })
|
|
|
|
+ .then(() => {
|
|
|
|
+ this.getList();
|
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
|
+ })
|
|
|
|
+ .catch(() => {});
|
|
},
|
|
},
|
|
/** 导出按钮操作 */
|
|
/** 导出按钮操作 */
|
|
handleExport() {
|
|
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>
|
|
</script>
|