|
|
|
@ -1,155 +1,163 @@
|
|
|
|
<template>
|
|
|
|
<template>
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
<el-form :inline="true" :model="query" class="query-form" size="mini">
|
|
|
|
<el-form :inline="true" :model="query" class="query-form" size="mini">
|
|
|
|
<el-form-item class="query-form-item">
|
|
|
|
<el-form-item class="query-form-item">
|
|
|
|
<el-input v-model="query.name" placeholder="角色名称"></el-input>
|
|
|
|
<el-input v-model="query.name" placeholder="角色名称"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<!-- <el-form-item class="query-form-item">-->
|
|
|
|
<!-- <el-form-item class="query-form-item">-->
|
|
|
|
<!-- <el-select v-model="query.status" placeholder="状态">-->
|
|
|
|
<!-- <el-select v-model="query.status" placeholder="状态">-->
|
|
|
|
<!-- <el-option label="全部" value=""></el-option>-->
|
|
|
|
<!-- <el-option label="全部" value=""></el-option>-->
|
|
|
|
<!-- <el-option label="禁用" value="0"></el-option>-->
|
|
|
|
<!-- <el-option label="禁用" value="0"></el-option>-->
|
|
|
|
<!-- <el-option label="正常" value="1"></el-option>-->
|
|
|
|
<!-- <el-option label="正常" value="1"></el-option>-->
|
|
|
|
<!-- </el-select>-->
|
|
|
|
<!-- </el-select>-->
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button-group>
|
|
|
|
<el-button-group>
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="primary"
|
|
|
|
type="primary"
|
|
|
|
icon="el-icon-refresh"
|
|
|
|
icon="el-icon-refresh"
|
|
|
|
@click="onReset"
|
|
|
|
@click="onReset"
|
|
|
|
></el-button>
|
|
|
|
></el-button>
|
|
|
|
<el-button type="primary" icon="search" @click="onSubmit"
|
|
|
|
<el-button type="primary" icon="search" @click="onSubmit"
|
|
|
|
>查询</el-button
|
|
|
|
>查询
|
|
|
|
>
|
|
|
|
</el-button
|
|
|
|
<el-button type="primary" @click.native="handleForm(null, null)"
|
|
|
|
>
|
|
|
|
>新增</el-button
|
|
|
|
<el-button type="primary" @click.native="handleForm(null, null)"
|
|
|
|
>
|
|
|
|
>新增
|
|
|
|
</el-button-group>
|
|
|
|
</el-button
|
|
|
|
</el-form-item>
|
|
|
|
>
|
|
|
|
</el-form>
|
|
|
|
</el-button-group>
|
|
|
|
<el-table v-loading="loading" :data="list" style="width: 100%">
|
|
|
|
</el-form-item>
|
|
|
|
<el-table-column type="index" label="序号" width="50"></el-table-column>
|
|
|
|
</el-form>
|
|
|
|
<el-table-column label="角色名称" prop="name"> </el-table-column>
|
|
|
|
<el-table v-loading="loading" :data="list" style="width: 100%">
|
|
|
|
<el-table-column label="状态">
|
|
|
|
<el-table-column type="index" label="序号" width="50"></el-table-column>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-table-column label="角色名称" prop="name"></el-table-column>
|
|
|
|
<el-tag :type="scope.row.status | statusFilterType">{{
|
|
|
|
<el-table-column label="状态">
|
|
|
|
scope.row.status | statusFilterName
|
|
|
|
<template slot-scope="scope">
|
|
|
|
}}</el-tag>
|
|
|
|
<el-tag :type="scope.row.status | statusFilterType">{{
|
|
|
|
</template>
|
|
|
|
scope.row.status | statusFilterName
|
|
|
|
</el-table-column>
|
|
|
|
}}
|
|
|
|
<el-table-column label="备注说明" :show-overflow-tooltip="true">
|
|
|
|
</el-tag>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
</template>
|
|
|
|
<span>{{ scope.row.remark }}</span>
|
|
|
|
</el-table-column>
|
|
|
|
</template>
|
|
|
|
<el-table-column label="备注说明" :show-overflow-tooltip="true">
|
|
|
|
</el-table-column>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-table-column label="操作" fixed="right" width="200">
|
|
|
|
<span>{{ scope.row.remark }}</span>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
</template>
|
|
|
|
<el-button
|
|
|
|
</el-table-column>
|
|
|
|
type="text"
|
|
|
|
<el-table-column label="操作" fixed="right" width="200">
|
|
|
|
size="small"
|
|
|
|
<template slot-scope="scope">
|
|
|
|
@click.native="handleAuth(scope.row.id)"
|
|
|
|
<el-button
|
|
|
|
>授权</el-button
|
|
|
|
type="text"
|
|
|
|
>
|
|
|
|
size="small"
|
|
|
|
<el-button
|
|
|
|
@click.native="handleAuth(scope.row)"
|
|
|
|
type="text"
|
|
|
|
>授权
|
|
|
|
size="small"
|
|
|
|
</el-button
|
|
|
|
@click.native="handleForm(scope.$index, scope.row)"
|
|
|
|
>
|
|
|
|
>编辑</el-button
|
|
|
|
<el-button
|
|
|
|
>
|
|
|
|
type="text"
|
|
|
|
<el-button
|
|
|
|
size="small"
|
|
|
|
type="text"
|
|
|
|
@click.native="handleForm(scope.$index, scope.row)"
|
|
|
|
size="small"
|
|
|
|
>编辑
|
|
|
|
@click.native="handleDel(scope.$index, scope.row)"
|
|
|
|
</el-button
|
|
|
|
:loading="deleteLoading"
|
|
|
|
>
|
|
|
|
>删除</el-button
|
|
|
|
<el-button
|
|
|
|
>
|
|
|
|
type="text"
|
|
|
|
</template>
|
|
|
|
size="small"
|
|
|
|
</el-table-column>
|
|
|
|
@click.native="handleDel(scope.$index, scope.row)"
|
|
|
|
</el-table>
|
|
|
|
:loading="deleteLoading"
|
|
|
|
|
|
|
|
>删除
|
|
|
|
|
|
|
|
</el-button
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
<el-pagination
|
|
|
|
<el-pagination
|
|
|
|
:page-size="query.limit"
|
|
|
|
:page-size="query.limit"
|
|
|
|
@current-change="handleCurrentChange"
|
|
|
|
@current-change="handleCurrentChange"
|
|
|
|
layout="prev, pager, next"
|
|
|
|
layout="prev, pager, next"
|
|
|
|
:total="total"
|
|
|
|
:total="total"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
</el-pagination>
|
|
|
|
</el-pagination>
|
|
|
|
|
|
|
|
|
|
|
|
<!--授权界面-->
|
|
|
|
<!--授权界面-->
|
|
|
|
<el-dialog
|
|
|
|
<el-dialog
|
|
|
|
title="授权"
|
|
|
|
:title="authTitle"
|
|
|
|
:visible.sync="authFormVisible"
|
|
|
|
:visible.sync="authFormVisible"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
class="dialog"
|
|
|
|
class="dialog"
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-tree
|
|
|
|
|
|
|
|
style="max-height: 75vh; overflow-y: auto"
|
|
|
|
|
|
|
|
:data="authList"
|
|
|
|
|
|
|
|
show-checkbox=""
|
|
|
|
|
|
|
|
default-expand-all=""
|
|
|
|
|
|
|
|
node-key="id"
|
|
|
|
|
|
|
|
ref="tree"
|
|
|
|
|
|
|
|
:props="defaultProps"
|
|
|
|
|
|
|
|
:default-checked-keys="authDefaultCheckedKeys"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</el-tree>
|
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
|
|
|
<el-button @click.native="authFormVisible = !authFormVisible"
|
|
|
|
|
|
|
|
>取消</el-button
|
|
|
|
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-button
|
|
|
|
<el-tree
|
|
|
|
type="primary"
|
|
|
|
style="max-height: 75vh; overflow-y: auto"
|
|
|
|
@click.native="authSubmit()"
|
|
|
|
:data="authList"
|
|
|
|
:loading="authLoading"
|
|
|
|
show-checkbox=""
|
|
|
|
>提交
|
|
|
|
default-expand-all=""
|
|
|
|
</el-button>
|
|
|
|
node-key="id"
|
|
|
|
</div>
|
|
|
|
ref="tree"
|
|
|
|
</el-dialog>
|
|
|
|
:props="defaultProps"
|
|
|
|
|
|
|
|
:default-checked-keys="authDefaultCheckedKeys"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</el-tree>
|
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
|
|
|
<el-button @click.native="authFormVisible = !authFormVisible"
|
|
|
|
|
|
|
|
>取消
|
|
|
|
|
|
|
|
</el-button
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
|
|
|
|
type="primary"
|
|
|
|
|
|
|
|
@click.native="authSubmit()"
|
|
|
|
|
|
|
|
:loading="authLoading"
|
|
|
|
|
|
|
|
>提交
|
|
|
|
|
|
|
|
</el-button>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
<!--表单-->
|
|
|
|
<!--表单-->
|
|
|
|
<el-dialog
|
|
|
|
<el-dialog
|
|
|
|
:title="formMap[formName]"
|
|
|
|
:title="formMap[formName]"
|
|
|
|
:visible.sync="formVisible"
|
|
|
|
:visible.sync="formVisible"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
:before-close="hideForm"
|
|
|
|
:before-close="hideForm"
|
|
|
|
width="85%"
|
|
|
|
width="85%"
|
|
|
|
top="5vh"
|
|
|
|
top="5vh"
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-form :model="formData" :rules="formRules" ref="dataForm">
|
|
|
|
|
|
|
|
<el-form-item label="角色名称" prop="name">
|
|
|
|
|
|
|
|
<el-input v-model="formData.name" auto-complete="off"></el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="排序" prop="listorder">
|
|
|
|
|
|
|
|
<el-input
|
|
|
|
|
|
|
|
type=""
|
|
|
|
|
|
|
|
v-model="formData.listorder"
|
|
|
|
|
|
|
|
auto-complete="off"
|
|
|
|
|
|
|
|
></el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
|
|
|
|
|
<el-radio-group v-model="formData.status" :disabled="true">
|
|
|
|
|
|
|
|
<el-radio :label="0">禁用</el-radio>
|
|
|
|
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="备注说明">
|
|
|
|
|
|
|
|
<el-input type="textarea" v-model="formData.remark"></el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
|
|
|
<el-button @click.native="hideForm">取消</el-button>
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
|
|
|
|
type="primary"
|
|
|
|
|
|
|
|
@click.native="formSubmit()"
|
|
|
|
|
|
|
|
:loading="formLoading"
|
|
|
|
|
|
|
|
>提交</el-button
|
|
|
|
|
|
|
|
>
|
|
|
|
>
|
|
|
|
</div>
|
|
|
|
<el-form :model="formData" :rules="formRules" ref="dataForm">
|
|
|
|
</el-dialog>
|
|
|
|
<el-form-item label="角色名称" prop="name">
|
|
|
|
</div>
|
|
|
|
<el-input v-model="formData.name" auto-complete="off"></el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="排序" prop="listorder">
|
|
|
|
|
|
|
|
<el-input
|
|
|
|
|
|
|
|
type=""
|
|
|
|
|
|
|
|
v-model="formData.listorder"
|
|
|
|
|
|
|
|
auto-complete="off"
|
|
|
|
|
|
|
|
></el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
|
|
|
|
|
<el-radio-group v-model="formData.status" :disabled="true">
|
|
|
|
|
|
|
|
<el-radio :label="0">禁用</el-radio>
|
|
|
|
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="备注说明">
|
|
|
|
|
|
|
|
<el-input type="textarea" v-model="formData.remark"></el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
|
|
|
<el-button @click.native="hideForm">取消</el-button>
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
|
|
|
|
type="primary"
|
|
|
|
|
|
|
|
@click.native="formSubmit()"
|
|
|
|
|
|
|
|
:loading="formLoading"
|
|
|
|
|
|
|
|
>提交
|
|
|
|
|
|
|
|
</el-button
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
@ -160,6 +168,7 @@ import {
|
|
|
|
authRoleSave,
|
|
|
|
authRoleSave,
|
|
|
|
authRoleDelete
|
|
|
|
authRoleDelete
|
|
|
|
} from "../../../api/auth/authRole";
|
|
|
|
} from "../../../api/auth/authRole";
|
|
|
|
|
|
|
|
|
|
|
|
const formJson = {
|
|
|
|
const formJson = {
|
|
|
|
id: "",
|
|
|
|
id: "",
|
|
|
|
name: "",
|
|
|
|
name: "",
|
|
|
|
@ -202,13 +211,14 @@ export default {
|
|
|
|
formData: formJson,
|
|
|
|
formData: formJson,
|
|
|
|
formRules: {
|
|
|
|
formRules: {
|
|
|
|
name: [
|
|
|
|
name: [
|
|
|
|
{ required: true, message: "请输入名称", trigger: "blur" }
|
|
|
|
{required: true, message: "请输入名称", trigger: "blur"}
|
|
|
|
],
|
|
|
|
],
|
|
|
|
status: [
|
|
|
|
status: [
|
|
|
|
{ required: true, message: "请选择状态", trigger: "change" }
|
|
|
|
{required: true, message: "请选择状态", trigger: "change"}
|
|
|
|
]
|
|
|
|
]
|
|
|
|
},
|
|
|
|
},
|
|
|
|
deleteLoading: false
|
|
|
|
deleteLoading: false,
|
|
|
|
|
|
|
|
authTitle: "授权",
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
@ -246,11 +256,12 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// 显示授权界面
|
|
|
|
// 显示授权界面
|
|
|
|
handleAuth(roleId) {
|
|
|
|
handleAuth(row) {
|
|
|
|
this.authFormData.role_id = roleId;
|
|
|
|
this.authFormData.role_id = row.id;
|
|
|
|
|
|
|
|
this.authTitle = "授权角色<" + row.name + ">";
|
|
|
|
this.authFormData.auth_rules = [];
|
|
|
|
this.authFormData.auth_rules = [];
|
|
|
|
this.authList = [];
|
|
|
|
this.authList = [];
|
|
|
|
authRoleAuthList({ id: roleId })
|
|
|
|
authRoleAuthList({id: row.id})
|
|
|
|
.then(response => {
|
|
|
|
.then(response => {
|
|
|
|
if (response.code != 20000) {
|
|
|
|
if (response.code != 20000) {
|
|
|
|
this.authFormVisible = false;
|
|
|
|
this.authFormVisible = false;
|
|
|
|
@ -260,6 +271,7 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
this.authFormVisible = true;
|
|
|
|
this.authFormVisible = true;
|
|
|
|
this.authList = response.data.list || [];
|
|
|
|
this.authList = response.data.list || [];
|
|
|
|
console.log("this.authList=" + this.authList);
|
|
|
|
console.log("this.authList=" + this.authList);
|
|
|
|
@ -267,11 +279,10 @@ export default {
|
|
|
|
let tempCheckedKeys = [];
|
|
|
|
let tempCheckedKeys = [];
|
|
|
|
let id = null;
|
|
|
|
let id = null;
|
|
|
|
let node = null;
|
|
|
|
let node = null;
|
|
|
|
let getTreeNode = function(arr, id) {
|
|
|
|
let getTreeNode = function (arr, id) {
|
|
|
|
for (let i in arr) {
|
|
|
|
for (let i in arr) {
|
|
|
|
let tempNode = arr[i];
|
|
|
|
let tempNode = arr[i];
|
|
|
|
if (tempNode.id === id) {
|
|
|
|
if (tempNode.id === id) {
|
|
|
|
// 找到了，就不找了
|
|
|
|
|
|
|
|
node = tempNode;
|
|
|
|
node = tempNode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 如果还有子节点，再继续找
|
|
|
|
// 如果还有子节点，再继续找
|
|
|
|
@ -290,11 +301,12 @@ export default {
|
|
|
|
this.authDefaultCheckedKeys = tempCheckedKeys;
|
|
|
|
this.authDefaultCheckedKeys = tempCheckedKeys;
|
|
|
|
// this.$refs.tree.setCheckedKeys(tempCheckedKeys);
|
|
|
|
// this.$refs.tree.setCheckedKeys(tempCheckedKeys);
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {});
|
|
|
|
.catch(() => {
|
|
|
|
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
authSubmit() {
|
|
|
|
authSubmit() {
|
|
|
|
this.authLoading = true;
|
|
|
|
this.authLoading = true;
|
|
|
|
let getNodeParents = function(node) {
|
|
|
|
let getNodeParents = function (node) {
|
|
|
|
let arr = [];
|
|
|
|
let arr = [];
|
|
|
|
let id = node.data.id || null;
|
|
|
|
let id = node.data.id || null;
|
|
|
|
if (id) {
|
|
|
|
if (id) {
|
|
|
|
@ -405,7 +417,7 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.then(() => {
|
|
|
|
.then(() => {
|
|
|
|
this.deleteLoading = true;
|
|
|
|
this.deleteLoading = true;
|
|
|
|
let para = { id: row.id };
|
|
|
|
let para = {id: row.id};
|
|
|
|
authRoleDelete(para)
|
|
|
|
authRoleDelete(para)
|
|
|
|
.then(response => {
|
|
|
|
.then(response => {
|
|
|
|
this.deleteLoading = false;
|
|
|
|
this.deleteLoading = false;
|
|
|
|
@ -443,7 +455,8 @@ export default {
|
|
|
|
return statusMap[status];
|
|
|
|
return statusMap[status];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
mounted() {},
|
|
|
|
mounted() {
|
|
|
|
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
// 加载表格数据
|
|
|
|
// 加载表格数据
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
|
