|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
<template>
|
|
|
|
|
<div>
|
|
|
|
|
<el-card>
|
|
|
|
|
<el-tabs type="border-card" >
|
|
|
|
|
<el-tabs type="border-card">
|
|
|
|
|
<el-tab-pane>
|
|
|
|
|
<span slot="label">内部角色</span>
|
|
|
|
|
<el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
|
|
|
|
@ -213,7 +213,6 @@
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-tabs>
|
|
|
|
|
|
|
|
|
|
<!-- 添加或修改角色配置对话框 -->
|
|
|
|
@ -235,9 +234,9 @@
|
|
|
|
|
<el-input-number v-model="form.roleSort" controls-position="right" :min="0"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
|
|
<el-radio-group v-model="form.status" >
|
|
|
|
|
<el-radio label="0" >正常</el-radio>
|
|
|
|
|
<el-radio label="1" >禁用</el-radio>
|
|
|
|
|
<el-radio-group v-model="form.status">
|
|
|
|
|
<el-radio label="0">正常</el-radio>
|
|
|
|
|
<el-radio label="1">禁用</el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<!--<el-form-item label="供应商角色" prop="isCustomer">-->
|
|
|
|
@ -337,10 +336,10 @@ export default {
|
|
|
|
|
dicts: ['sys_normal_disable'],
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
userStatus:null,
|
|
|
|
|
userStatus: null,
|
|
|
|
|
// 遮罩层
|
|
|
|
|
loading: true,
|
|
|
|
|
Adminloading:true,
|
|
|
|
|
Adminloading: true,
|
|
|
|
|
// 选中数组
|
|
|
|
|
ids: [],
|
|
|
|
|
// 非单个禁用
|
|
|
|
@ -351,9 +350,9 @@ export default {
|
|
|
|
|
showSearch: true,
|
|
|
|
|
// 总条数
|
|
|
|
|
total: 0,
|
|
|
|
|
Admintotal:0,
|
|
|
|
|
Admintotal: 0,
|
|
|
|
|
//内部角色
|
|
|
|
|
AdminroleList:[],
|
|
|
|
|
AdminroleList: [],
|
|
|
|
|
// 角色表格数据
|
|
|
|
|
roleList: [],
|
|
|
|
|
// 弹出层标题
|
|
|
|
@ -403,8 +402,8 @@ export default {
|
|
|
|
|
roleKey: undefined,
|
|
|
|
|
status: undefined
|
|
|
|
|
},
|
|
|
|
|
AdminParams:{},
|
|
|
|
|
Params:{},
|
|
|
|
|
AdminParams: {},
|
|
|
|
|
Params: {},
|
|
|
|
|
// 表单参数
|
|
|
|
|
form: {},
|
|
|
|
|
defaultProps: {
|
|
|
|
@ -451,22 +450,22 @@ export default {
|
|
|
|
|
methods: {
|
|
|
|
|
/** 查询角色列表 */
|
|
|
|
|
getList() {
|
|
|
|
|
this.Adminloading =true;
|
|
|
|
|
this.AdminParams=this.queryParams
|
|
|
|
|
this.AdminParams.isCustomer=0;
|
|
|
|
|
this.Adminloading = true;
|
|
|
|
|
this.AdminParams = this.queryParams
|
|
|
|
|
this.AdminParams.isCustomer = 0;
|
|
|
|
|
listRole(this.addDateRange(this.AdminParams, this.dateRange)).then(response => {
|
|
|
|
|
this.AdminroleList=response.data.list
|
|
|
|
|
this.AdminroleList = response.data.list
|
|
|
|
|
this.Admintotal = response.data.total;
|
|
|
|
|
this.Adminloading =false;
|
|
|
|
|
this.Adminloading = false;
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
getCustomerList() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
this.Params=this.queryParams
|
|
|
|
|
this.Params.isCustomer=1;
|
|
|
|
|
this.Params = this.queryParams
|
|
|
|
|
this.Params.isCustomer = 1;
|
|
|
|
|
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
|
|
this.roleList=response.data.list
|
|
|
|
|
this.roleList = response.data.list
|
|
|
|
|
this.total = response.data.total;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
}
|
|
|
|
@ -619,11 +618,10 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
/** 新增按钮操作 */
|
|
|
|
|
handleAdd(val) {
|
|
|
|
|
this.userStatus=val;
|
|
|
|
|
this.userStatus = val;
|
|
|
|
|
this.reset();
|
|
|
|
|
this.getMenuTreeselect();
|
|
|
|
|
this.open = true;
|
|
|
|
|
this.form.isCustomer=0;
|
|
|
|
|
this.title = "角色管理-新增";
|
|
|
|
|
},
|
|
|
|
|
/** 修改按钮操作 */
|
|
|
|
@ -680,10 +678,12 @@ export default {
|
|
|
|
|
// return
|
|
|
|
|
// }
|
|
|
|
|
debugger
|
|
|
|
|
if(this.userStatus == 0){
|
|
|
|
|
this.form.isCustomer=0;
|
|
|
|
|
}else{
|
|
|
|
|
this.form.isCustomer=1;
|
|
|
|
|
if(this.form.isCustomer == null){
|
|
|
|
|
if (this.userStatus == 0) {
|
|
|
|
|
this.form.isCustomer = 0;
|
|
|
|
|
} else {
|
|
|
|
|
this.form.isCustomer = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
|
if (valid) {
|
|
|
|
|