|
...
|
...
|
@@ -153,12 +153,18 @@ |
|
|
|
</div>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!--权限设置界面-->
|
|
|
|
<el-dialog title="岗位的权限设置"
|
|
|
|
:visible.sync="PermFormVisible"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
top="5vh" width="75%"
|
|
|
|
>
|
|
|
|
<div v-loading.lock="isLoading">
|
|
|
|
<template>
|
|
|
|
<el-tabs style="border: 0px;background-color: rgba(0,0,0,0)" v-model="activeName" @tab-click="handleClick">
|
|
|
|
<el-tab-pane style="border: 0px;background-color: rgba(0,0,0,0)" label="权限管理" name="first">
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="4" >
|
|
|
|
<el-button type="primary" @click.native="treeMerge(false)">合并节点</el-button>
|
|
...
|
...
|
@@ -176,10 +182,30 @@ |
|
|
|
node-key="permissionId" ref="tree">
|
|
|
|
</el-tree>
|
|
|
|
</el-form>
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<div align="center" class="dialog-footer" style="margin-bottom: 20px">
|
|
|
|
<el-button @click.native="PermFormVisible = false">取消</el-button>
|
|
|
|
<el-button type="primary" @click.native="setPermSubmit" :loading="addLoading">提交</el-button>
|
|
|
|
</div>
|
|
|
|
</el-tab-pane>
|
|
|
|
<el-tab-pane label="数据权限" name="second">
|
|
|
|
<el-divider></el-divider>
|
|
|
|
<el-form :model="permForms" style="width: 95%" ref="permForm">
|
|
|
|
<el-tree :data="departmentList" :props="treeDefaultPropss"
|
|
|
|
@check="dataPermTreeClickDeal"
|
|
|
|
:default-expand-all = "treeExpands"
|
|
|
|
show-checkbox highlight-current
|
|
|
|
node-key="data_perm_id" ref="trees">
|
|
|
|
</el-tree>
|
|
|
|
</el-form>
|
|
|
|
<div align="center" class="dialog-footer" style="margin-bottom: 20px">
|
|
|
|
<el-button @click.native="PermFormVisible = false">取消</el-button>
|
|
|
|
<el-button type="primary" @click.native="setDataPerm" :loading="addLoading">提交</el-button>
|
|
|
|
</div>
|
|
|
|
</el-tab-pane>
|
|
|
|
</el-tabs>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</el-dialog>
|
|
|
|
</section>
|
|
|
|
</template>
|
|
...
|
...
|
@@ -187,14 +213,19 @@ |
|
|
|
<script>
|
|
|
|
import util from '../../common/js/util'
|
|
|
|
import NProgress from 'nprogress'
|
|
|
|
import { getList, remove, batchRemove, edit, add, updateRolePerm } from '../../api/role_api';
|
|
|
|
import { getList as getDepartmentList} from '../../api/department';
|
|
|
|
import { getList, remove, batchRemove, edit, add, updateRolePerm ,roleDataPermGet,dataPermSet} from '../../api/role_api';
|
|
|
|
import { getList as getDepartmentList } from '@/api/user/data_perm_api.js'
|
|
|
|
|
|
|
|
// import { getList as getDepartmentList} from '../../api/department';
|
|
|
|
import { getList as permList } from '../../api/perm_api';
|
|
|
|
import moment from 'moment'
|
|
|
|
import {selectList} from "../../api/consigner/vehicle";
|
|
|
|
import {addTrans} from "../../api/trn";
|
|
|
|
export default {
|
|
|
|
name:'Role',
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
activeName: 'first',
|
|
|
|
filters: {
|
|
|
|
roleName: ''
|
|
|
|
},
|
|
...
|
...
|
@@ -224,15 +255,24 @@ |
|
|
|
children: 'children',
|
|
|
|
label: 'name',
|
|
|
|
},
|
|
|
|
treeDefaultPropss: {
|
|
|
|
children: 'children',
|
|
|
|
label: 'perm_name',
|
|
|
|
},
|
|
|
|
treeExpand: true,
|
|
|
|
departmentNameList:[],
|
|
|
|
treeExpands: true,
|
|
|
|
roles: [],
|
|
|
|
permissons: [],
|
|
|
|
departmentList:[],
|
|
|
|
currentRolePermList: [],
|
|
|
|
permIds: [],
|
|
|
|
permIdss: [],
|
|
|
|
total: 0,
|
|
|
|
pageNum: 1,
|
|
|
|
pageSize: 5,
|
|
|
|
listLoading: false,
|
|
|
|
loading:{},
|
|
|
|
isLoading: false,
|
|
|
|
sels: [],//列表选中列
|
|
|
|
dialogMap: {
|
|
|
|
update: '编辑',
|
|
...
|
...
|
@@ -272,7 +312,11 @@ |
|
|
|
roleName: '',
|
|
|
|
roleSign: 1,
|
|
|
|
permissions: []
|
|
|
|
}
|
|
|
|
},
|
|
|
|
permForms: {
|
|
|
|
roleId: -1,
|
|
|
|
permissionIds: []
|
|
|
|
},
|
|
|
|
|
|
|
|
}
|
|
|
|
},
|
|
...
|
...
|
@@ -310,6 +354,12 @@ |
|
|
|
this.$refs.tree.store._getAllNodes()[i].expanded=this.treeExpand;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
treeMerges: function (expand) {
|
|
|
|
this.treeExpands = expand;
|
|
|
|
for(var i=0;i<this.$refs.trees.store._getAllNodes().length;i++){
|
|
|
|
this.$refs.trees.store._getAllNodes()[i].expanded=this.treeExpands;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
handleCurrentChange(val) {
|
|
|
|
this.pageNum = val;
|
|
|
|
this.getRoles();
|
|
...
|
...
|
@@ -341,32 +391,45 @@ |
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
//获取部门列表
|
|
|
|
getdepartmentNames() {
|
|
|
|
|
|
|
|
this.listLoading = true;
|
|
|
|
//NProgress.start();
|
|
|
|
getDepartmentList().then((res) => {
|
|
|
|
this.total = res.data.total;
|
|
|
|
this.departmentNameList = res.data.list;
|
|
|
|
this.listLoading = false;
|
|
|
|
//NProgress.done();
|
|
|
|
}).catch((error) => {
|
|
|
|
|
|
|
|
this.listLoading = false;
|
|
|
|
if(null!= error.response && error.response!==undefined){
|
|
|
|
let status= error.response.status;
|
|
|
|
let msg = error.response.statusText;
|
|
|
|
alert(status+msg);
|
|
|
|
}else {
|
|
|
|
alert(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
//获取数据权限列表
|
|
|
|
// getdepartmentNames() {
|
|
|
|
//
|
|
|
|
// this.listLoading = true;
|
|
|
|
// //NProgress.start();
|
|
|
|
// getDepartmentList().then((res) => {
|
|
|
|
// // this.total = res.data.total;
|
|
|
|
// this.departmentNameList = res.data.list;
|
|
|
|
// console.log(this.departmentNameList);
|
|
|
|
//
|
|
|
|
// this.listLoading = false;
|
|
|
|
// //NProgress.done();
|
|
|
|
// }).catch((error) => {
|
|
|
|
//
|
|
|
|
// this.listLoading = false;
|
|
|
|
// if(null!= error.response && error.response!==undefined){
|
|
|
|
// let status= error.response.status;
|
|
|
|
// let msg = error.response.statusText;
|
|
|
|
// alert(status+msg);
|
|
|
|
// }else {
|
|
|
|
// alert(error);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// });
|
|
|
|
//
|
|
|
|
// },
|
|
|
|
getDataList() {
|
|
|
|
let para = {
|
|
|
|
pageNum: 1,
|
|
|
|
pageSize: 700
|
|
|
|
};
|
|
|
|
getDepartmentList(para).then(res => {
|
|
|
|
this.$message.success('获取列表成功')
|
|
|
|
this.departmentList = res.list
|
|
|
|
// console.log(this.departmentList);
|
|
|
|
}).catch(error => {
|
|
|
|
this.$message.error(error)
|
|
|
|
})
|
|
|
|
},
|
|
|
|
|
|
|
|
//获取权限列表
|
|
|
|
getPermList() {
|
|
|
|
let para = {
|
|
...
|
...
|
@@ -426,13 +489,27 @@ |
|
|
|
this.addForm = Object.assign({}, row);
|
|
|
|
// this.getdepartmentNames();
|
|
|
|
},
|
|
|
|
// 配置权限管理
|
|
|
|
setPerm: function (index, row) {
|
|
|
|
// this.loading = this.$loading({
|
|
|
|
// lock: true,
|
|
|
|
// text: '加载中',
|
|
|
|
// spinner: 'el-icon-loading',
|
|
|
|
// background: 'rgba(0, 0, 0, 0.7)',
|
|
|
|
// fullscreen: true
|
|
|
|
// });
|
|
|
|
this.isLoading = true;
|
|
|
|
this.PermFormVisible = true;
|
|
|
|
this.activeName= 'first';
|
|
|
|
//获取接口权限
|
|
|
|
this.getPermList();
|
|
|
|
//获取数据权限信息
|
|
|
|
this.getRoleDataPerm(row.roleId);
|
|
|
|
var _this = this;
|
|
|
|
this.permIds = [];
|
|
|
|
this.permForm = Object.assign({}, row);
|
|
|
|
let rolePerms = this.permForm.permissions;
|
|
|
|
this.permForms.roleId = this.permForm.roleId;
|
|
|
|
if (util.checkNull(rolePerms)){
|
|
|
|
rolePerms.forEach(function (perm,v_index,v_arr) {
|
|
|
|
if(util.checkNull(perm)){
|
|
...
|
...
|
@@ -440,13 +517,52 @@ |
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
|
|
|
//反向适配
|
|
|
|
this.$refs.tree.setCheckedKeys(this.permIds);
|
|
|
|
});
|
|
|
|
},
|
|
|
|
//获取已增加数据权限的数据
|
|
|
|
getRoleDataPerm(roleId) {
|
|
|
|
const _this = this
|
|
|
|
roleDataPermGet({roleId:roleId}).then((response) => {
|
|
|
|
const res = response.data
|
|
|
|
// console.log(res)
|
|
|
|
if (res.code !== '200') {
|
|
|
|
return _this.$message.error('获取已有的数据权限，失败！')
|
|
|
|
}else {
|
|
|
|
// 获取列表数据
|
|
|
|
if (res.data){
|
|
|
|
_this.currentRolePermList = res.data.dataPermissions;
|
|
|
|
}else{
|
|
|
|
_this.currentRolePermList = [];
|
|
|
|
}
|
|
|
|
// console.log(this.data_perm_id)
|
|
|
|
_this.$message.success('获取已有的数据权限，成功！')
|
|
|
|
}
|
|
|
|
}).catch(error => {
|
|
|
|
// 关闭加载
|
|
|
|
_this.$message.error(error.toString())
|
|
|
|
}).finally(()=>{
|
|
|
|
this.isLoading = false;
|
|
|
|
})
|
|
|
|
},
|
|
|
|
// 配置数据权限
|
|
|
|
handleClick: function (tab, index,row) {
|
|
|
|
let _this = this;
|
|
|
|
this.permForms.permissionIds = [];
|
|
|
|
if (tab.name === 'second'){
|
|
|
|
if (this.currentRolePermList && this.currentRolePermList.length>0){
|
|
|
|
this.currentRolePermList.forEach((v,i) =>{
|
|
|
|
_this.permForms.permissionIds[i]=v.data_perm_id;
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.$nextTick(() => {
|
|
|
|
//反向适配
|
|
|
|
this.$refs.trees.setCheckedKeys(this.permForms.permissionIds);
|
|
|
|
});
|
|
|
|
},
|
|
|
|
//显示新增界面，每次点开初始化数据
|
|
|
|
handleAdd: function (index,row) {
|
|
|
|
this.addFormVisible = true;
|
|
...
|
...
|
@@ -663,10 +779,44 @@ |
|
|
|
// this.uniteParentSame(currentObj.id,treeStatus)
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
dataPermTreeClickDeal: function (currentObj, tree) {
|
|
|
|
// alert(JSON.stringify(tree.checkedKeys))
|
|
|
|
// alert("选择前的数组="+this.permForms.permissionIds)
|
|
|
|
this.permForms.permissionIds = tree.checkedKeys
|
|
|
|
// alert("选择后的数组="+this.permForms.permissionIds)
|
|
|
|
},
|
|
|
|
//提交数据权限
|
|
|
|
setDataPerm(){
|
|
|
|
this.loading = this.$loading({
|
|
|
|
lock: true,
|
|
|
|
text: '正在提交',
|
|
|
|
spinner: 'el-icon-loading',
|
|
|
|
background: 'rgba(0, 0, 0, 0.7)'
|
|
|
|
});
|
|
|
|
let _this = this;
|
|
|
|
dataPermSet(this.permForms).then((response) => {
|
|
|
|
const res = response.data
|
|
|
|
// 添加失败
|
|
|
|
if (res.code !== '200') {
|
|
|
|
// 关闭加载
|
|
|
|
return this.$message.error(res.msg)
|
|
|
|
}
|
|
|
|
// 添加，成功
|
|
|
|
this.$message.success(res.msg)
|
|
|
|
// 隐藏对话框
|
|
|
|
this.PermFormVisible = false;
|
|
|
|
}).catch(error => {
|
|
|
|
this.$message.error(error.toString())
|
|
|
|
}).finally(()=>{
|
|
|
|
this.loading.close()
|
|
|
|
})
|
|
|
|
},
|
|
|
|
|
|
|
|
},
|
|
|
|
mounted() {
|
|
|
|
this.getRoles();
|
|
|
|
this.getDataList();
|
|
|
|
let _this = this;
|
|
|
|
document.onkeydown = function (e) {
|
|
|
|
let key = window.event.keyCode;
|
|
...
|
...
|
@@ -675,6 +825,7 @@ |
|
|
|
}
|
|
|
|
};
|
|
|
|
this.isExpansion=true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
...
|
...
|
@@ -686,6 +837,9 @@ |
|
|
|
|
|
|
|
|
|
|
|
<style lang="scss">
|
|
|
|
.v-modal{
|
|
|
|
z-index:-2000;
|
|
|
|
}
|
|
|
|
/*//一级节点选择器*!*!*/
|
|
|
|
.el-tree-node>.el-tree-node__content {
|
|
|
|
font-weight: 900;
|
...
|
...
|
|
