|
|
@@ -47,45 +47,48 @@
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- plain
|
|
|
+ plain
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['company:role:add']"
|
|
|
- >新增</el-button>
|
|
|
+ >新增
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- plain
|
|
|
+ plain
|
|
|
type="success"
|
|
|
icon="el-icon-edit"
|
|
|
size="mini"
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['company:role:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ >修改
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- plain
|
|
|
+ plain
|
|
|
type="danger"
|
|
|
icon="el-icon-delete"
|
|
|
size="mini"
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
v-hasPermi="['company:role:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table height="500" border v-loading="loading" :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="角色名称" 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 height="500" border v-loading="loading" :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="角色名称" 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="状态" align="center" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-switch
|
|
|
@@ -109,21 +112,24 @@
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['company:role:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ >修改
|
|
|
+ </el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-circle-check"
|
|
|
@click="handleDataScope(scope.row)"
|
|
|
v-hasPermi="['company:role:edit']"
|
|
|
- >数据权限</el-button>
|
|
|
+ >数据权限
|
|
|
+ </el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['company:role:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -140,13 +146,13 @@
|
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
|
- <el-input v-model="form.roleName" placeholder="请输入角色名称" />
|
|
|
+ <el-input v-model="form.roleName" placeholder="请输入角色名称"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="权限字符" prop="roleKey">
|
|
|
- <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
|
|
|
+ <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">
|
|
|
@@ -154,13 +160,16 @@
|
|
|
v-for="dict in statusOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictValue"
|
|
|
- >{{dict.dictLabel}}</el-radio>
|
|
|
+ >{{ dict.dictLabel }}
|
|
|
+ </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="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"
|
|
|
@@ -186,10 +195,10 @@
|
|
|
<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" />
|
|
|
+ <el-input v-model="form.roleName" :disabled="true"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="权限字符">
|
|
|
- <el-input v-model="form.roleKey" :disabled="true" />
|
|
|
+ <el-input v-model="form.roleKey" :disabled="true"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="权限范围">
|
|
|
<el-select v-model="form.dataScope">
|
|
|
@@ -203,8 +212,10 @@
|
|
|
</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-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"
|
|
|
@@ -227,9 +238,18 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/company/companyRole";
|
|
|
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/company/companyMenu";
|
|
|
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/company/companyDept";
|
|
|
+import {
|
|
|
+ listRole,
|
|
|
+ getRole,
|
|
|
+ delRole,
|
|
|
+ addRole,
|
|
|
+ updateRole,
|
|
|
+ exportRole,
|
|
|
+ dataScope,
|
|
|
+ changeRoleStatus
|
|
|
+} from "@/api/company/companyRole";
|
|
|
+import {treeselect as menuTreeselect, roleMenuTreeselect} from "@/api/company/companyMenu";
|
|
|
+import {treeselect as deptTreeselect, roleDeptTreeselect} from "@/api/company/companyDept";
|
|
|
|
|
|
export default {
|
|
|
name: "Role",
|
|
|
@@ -283,7 +303,9 @@ export default {
|
|
|
{
|
|
|
value: "5",
|
|
|
label: "仅本人数据权限"
|
|
|
- }
|
|
|
+ },
|
|
|
+ {value: '6', label: '组长级数据权限'},
|
|
|
+ {value: '7', label: '销售经理级数据权限'}
|
|
|
],
|
|
|
// 菜单列表
|
|
|
menuOptions: [],
|
|
|
@@ -306,13 +328,13 @@ export default {
|
|
|
// 表单校验
|
|
|
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"}
|
|
|
]
|
|
|
}
|
|
|
};
|
|
|
@@ -383,16 +405,16 @@ export default {
|
|
|
handleStatusChange(row) {
|
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
|
this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- return changeRoleStatus(row.roleId, row.status);
|
|
|
- }).then(() => {
|
|
|
- this.msgSuccess(text + "成功");
|
|
|
- }).catch(function() {
|
|
|
- row.status = row.status === "0" ? "1" : "0";
|
|
|
- });
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function () {
|
|
|
+ return changeRoleStatus(row.roleId, row.status);
|
|
|
+ }).then(() => {
|
|
|
+ this.msgSuccess(text + "成功");
|
|
|
+ }).catch(function () {
|
|
|
+ row.status = row.status === "0" ? "1" : "0";
|
|
|
+ });
|
|
|
},
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
@@ -410,21 +432,21 @@ export default {
|
|
|
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: [],
|
|
|
- menuCheckStrictly: true,
|
|
|
- deptCheckStrictly: true,
|
|
|
- remark: undefined
|
|
|
- };
|
|
|
+ this.menuNodeAll = false,
|
|
|
+ this.deptExpand = true,
|
|
|
+ this.deptNodeAll = false,
|
|
|
+ this.form = {
|
|
|
+ roleId: undefined,
|
|
|
+ roleName: undefined,
|
|
|
+ roleKey: undefined,
|
|
|
+ roleSort: 0,
|
|
|
+ status: "0",
|
|
|
+ menuIds: [],
|
|
|
+ deptIds: [],
|
|
|
+ menuCheckStrictly: true,
|
|
|
+ deptCheckStrictly: true,
|
|
|
+ remark: undefined
|
|
|
+ };
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -441,7 +463,7 @@ export default {
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
this.ids = selection.map(item => item.roleId)
|
|
|
- this.single = selection.length!=1
|
|
|
+ this.single = selection.length != 1
|
|
|
this.multiple = !selection.length
|
|
|
},
|
|
|
// 树权限(展开/折叠)
|
|
|
@@ -461,17 +483,17 @@ export default {
|
|
|
// 树权限(全选/全不选)
|
|
|
handleCheckedTreeNodeAll(value, type) {
|
|
|
if (type == 'menu') {
|
|
|
- this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
|
|
|
+ this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
|
|
|
} else if (type == 'dept') {
|
|
|
- this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
|
|
|
+ this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
|
|
|
}
|
|
|
},
|
|
|
// 树权限(父子联动)
|
|
|
handleCheckedTreeConnect(value, type) {
|
|
|
if (type == 'menu') {
|
|
|
- this.form.menuCheckStrictly = value ? true: false;
|
|
|
+ this.form.menuCheckStrictly = value ? true : false;
|
|
|
} else if (type == 'dept') {
|
|
|
- this.form.deptCheckStrictly = value ? true: false;
|
|
|
+ this.form.deptCheckStrictly = value ? true : false;
|
|
|
}
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
@@ -513,7 +535,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
- submitForm: function() {
|
|
|
+ submitForm: function () {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.roleId != undefined) {
|
|
|
@@ -545,7 +567,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮(数据权限) */
|
|
|
- submitDataScope: function() {
|
|
|
+ submitDataScope: function () {
|
|
|
if (this.form.roleId != undefined) {
|
|
|
this.form.deptIds = this.getDeptAllCheckedKeys();
|
|
|
dataScope(this.form).then(response => {
|
|
|
@@ -561,28 +583,30 @@ export default {
|
|
|
handleDelete(row) {
|
|
|
const roleIds = row.roleId || this.ids;
|
|
|
this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- return delRole(roleIds);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.msgSuccess("删除成功");
|
|
|
- }).catch(function() {});
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function () {
|
|
|
+ return delRole(roleIds);
|
|
|
+ }).then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.msgSuccess("删除成功");
|
|
|
+ }).catch(function () {
|
|
|
+ });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
const queryParams = this.queryParams;
|
|
|
this.$confirm('是否确认导出所有角色数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- return exportRole(queryParams);
|
|
|
- }).then(response => {
|
|
|
- this.download(response.msg);
|
|
|
- }).catch(function() {});
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function () {
|
|
|
+ return exportRole(queryParams);
|
|
|
+ }).then(response => {
|
|
|
+ this.download(response.msg);
|
|
|
+ }).catch(function () {
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
};
|