|
|
@@ -4,33 +4,40 @@
|
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
<el-form :inline="true" :model="filters">
|
|
|
<el-form-item>
|
|
|
- <el-input v-model="filters.name" placeholder="请输入角色名称进行搜索"></el-input>
|
|
|
+ <el-input v-model="filters.keyName" placeholder="请输入角色名称进行搜索" clearable></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button type="primary" @click="getUsers">查询</el-button>
|
|
|
+ <el-button type="primary" @click.native="getRoles">查询</el-button>
|
|
|
</el-form-item>
|
|
|
<el-form-item style="float:right;">
|
|
|
- <el-button type="primary" @click="handleAdd">新增</el-button>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item style="float:right;">
|
|
|
- <el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
|
|
|
+ <el-button type="primary" @click.native="handleAdd">新增</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</el-col>
|
|
|
|
|
|
<!--列表-->
|
|
|
- <el-table :data="users" highlight-current-row :height="tableHeight" v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
|
|
|
- <el-table-column type="selection" width="55"></el-table-column>
|
|
|
- <el-table-column type="index" width="60"></el-table-column>
|
|
|
- <el-table-column prop="name" label="姓名" width="120" sortable></el-table-column>
|
|
|
- <el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable></el-table-column>
|
|
|
- <el-table-column prop="age" label="年龄" width="100" sortable></el-table-column>
|
|
|
- <el-table-column prop="birth" label="生日" width="120" sortable></el-table-column>
|
|
|
- <el-table-column prop="addr" label="地址" min-width="180" sortable></el-table-column>
|
|
|
+ <el-table :data="list" highlight-current-row :height="tableHeight" v-loading="listLoading" style="width: 100%;">
|
|
|
+ <el-table-column prop="roleName" label="角色名称" width="120" sortable></el-table-column>
|
|
|
+ <el-table-column prop="sex" label="权限">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-col :span="2" v-if="scope.row.uploadPower == 1">
|
|
|
+ <el-tag size="medium">上传</el-tag>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2" v-if="scope.row.dowloadPower == 1">
|
|
|
+ <el-tag size="medium">下载</el-tag>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2" v-if="scope.row.viewPower == 1">
|
|
|
+ <el-tag size="medium">浏览</el-tag>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2" v-if="scope.row.approvalPower == 1">
|
|
|
+ <el-tag size="medium">审批</el-tag>
|
|
|
+ </el-col>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
|
|
|
- <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
|
|
|
+ <el-button size="small" @click.native="handleEdit(scope.$index, scope.row)">编辑</el-button>
|
|
|
+ <el-button type="danger" size="small" @click.native.native="handleDel(scope.$index, scope.row)">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -48,44 +55,44 @@
|
|
|
</el-pagination>
|
|
|
</el-col>
|
|
|
|
|
|
- <!--编辑界面-->
|
|
|
- <el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false">
|
|
|
- <el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
|
|
|
- <el-form-item label="姓名" prop="name">
|
|
|
- <el-input v-model="editForm.name" auto-complete="off"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="性别">
|
|
|
- <el-radio-group v-model="editForm.sex">
|
|
|
- <el-radio class="radio" :label="1">男</el-radio>
|
|
|
- <el-radio class="radio" :label="0">女</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="年龄">
|
|
|
- <el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="生日">
|
|
|
- <el-date-picker type="date" placeholder="选择日期" v-model="editForm.birth"></el-date-picker>
|
|
|
+ <!--新增界面-->
|
|
|
+ <el-dialog title="新增角色" :visible.sync="addFormVisible" :close-on-click-modal="false">
|
|
|
+ <el-form :model="addForm" label-width="80px" :rules="formRules" ref="addForm">
|
|
|
+ <el-form-item label="角色名称" prop="roleName">
|
|
|
+ <el-input v-model="addForm.roleName" auto-complete="off"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="地址">
|
|
|
- <el-input type="textarea" v-model="editForm.addr"></el-input>
|
|
|
+ <el-form-item label="权限配置">
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6" v-for="(item,index) in roleList" :key="item.val" style="text-align:center;">
|
|
|
+ <el-checkbox v-model="addForm[item.label]">{{item.name}}</el-checkbox>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <!-- <el-table :data="roleList" border :show-header="false" style="width: 100%">
|
|
|
+ <el-table-column prop="name" label="名称" width="80"></el-table-column>
|
|
|
+ <el-table-column prop="role" label="权限">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div v-for="(item,index) in scope.row.role"></div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table> -->
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button @click.native="editFormVisible = false">取消</el-button>
|
|
|
- <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
|
|
|
+ <el-button @click.native="addFormVisible = false">取消</el-button>
|
|
|
+ <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <!--新增界面-->
|
|
|
- <el-dialog title="新增角色" :visible.sync="addFormVisible" :close-on-click-modal="false">
|
|
|
- <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
|
|
|
+ <!--编辑界面-->
|
|
|
+ <el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false">
|
|
|
+ <el-form :model="editForm" label-width="80px" :rules="formRules" ref="editForm">
|
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
|
- <el-input v-model="addForm.roleName" auto-complete="off"></el-input>
|
|
|
+ <el-input v-model="editForm.roleName" auto-complete="off"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="权限配置">
|
|
|
<el-row>
|
|
|
<el-col :span="6" v-for="(item,index) in roleList" :key="item.val" style="text-align:center;">
|
|
|
- <el-checkbox v-model="addForm[item.label]">{{item.name}}</el-checkbox>
|
|
|
+ <el-checkbox v-model="editForm[item.label]" :checked="editForm[item.label]">{{item.name}}</el-checkbox>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<!-- <el-table :data="roleList" border :show-header="false" style="width: 100%">
|
|
|
@@ -99,8 +106,8 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button @click.native="addFormVisible = false">取消</el-button>
|
|
|
- <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
|
|
|
+ <el-button @click.native="editFormVisible = false">取消</el-button>
|
|
|
+ <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</section>
|
|
|
@@ -108,14 +115,12 @@
|
|
|
|
|
|
<script>
|
|
|
import util from '../../common/js/util'
|
|
|
- //import NProgress from 'nprogress'
|
|
|
- import { getUserListPage, removeUser, batchRemoveUser, editUser, addUser } from '../../api/api';
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
filters: {
|
|
|
- name: ''
|
|
|
+ keyName: ''
|
|
|
},
|
|
|
// roleList: [{
|
|
|
// name: '项目文档',
|
|
|
@@ -142,24 +147,22 @@
|
|
|
{name:'浏览',val:2,label:'viewPower',viewPower:false},
|
|
|
{name:'审批',val:3,label:'approvalPower',approvalPower:false}
|
|
|
],
|
|
|
- users: [],
|
|
|
+ list: [],
|
|
|
total: 0,
|
|
|
page: 1,
|
|
|
size: 20,
|
|
|
listLoading: false,
|
|
|
tableHeight: 0,
|
|
|
- sels: [],//列表选中列
|
|
|
|
|
|
- // 新增界面
|
|
|
- // 新增界面是否显示
|
|
|
- addFormVisible: false,
|
|
|
- addLoading: false,
|
|
|
- addFormRules: {
|
|
|
+ formRules: {
|
|
|
roleName: [
|
|
|
{ required: true, message: '请输入姓名', trigger: 'blur' }
|
|
|
]
|
|
|
- },
|
|
|
- // 新增界面数据
|
|
|
+ },
|
|
|
+
|
|
|
+ // 新增界面
|
|
|
+ addFormVisible: false,
|
|
|
+ addLoading: false,
|
|
|
addForm: {
|
|
|
roleName: '',
|
|
|
uploadPower: false,
|
|
|
@@ -169,55 +172,71 @@
|
|
|
},
|
|
|
|
|
|
// 编辑界面
|
|
|
- // 编辑界面是否显示
|
|
|
editFormVisible: false,
|
|
|
editLoading: false,
|
|
|
- editFormRules: {
|
|
|
- name: [
|
|
|
- { required: true, message: '请输入姓名', trigger: 'blur' }
|
|
|
- ]
|
|
|
- },
|
|
|
- //编辑界面数据
|
|
|
editForm: {
|
|
|
id: 0,
|
|
|
- name: '',
|
|
|
- role: []
|
|
|
+ roleName: '',
|
|
|
+ uploadPower: false,
|
|
|
+ dowloadPower:false,
|
|
|
+ viewPower:false,
|
|
|
+ approvalPower:false
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- //性别显示转换
|
|
|
- formatSex: function (row, column) {
|
|
|
- return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
|
|
|
- },
|
|
|
+ // 分页
|
|
|
handleCurrentChange(val) {
|
|
|
this.page = val;
|
|
|
- this.getUsers();
|
|
|
+ this.getRoles();
|
|
|
},
|
|
|
+
|
|
|
handleSizeChange(val) {
|
|
|
this.size = val;
|
|
|
- this.getUsers();
|
|
|
+ this.getRoles();
|
|
|
},
|
|
|
+
|
|
|
//获取用户列表
|
|
|
- getUsers() {
|
|
|
- let para = {
|
|
|
- page: this.page,
|
|
|
- name: this.filters.name
|
|
|
- };
|
|
|
+ getRoles() {
|
|
|
this.listLoading = true;
|
|
|
- //NProgress.start();
|
|
|
- getUserListPage(para).then((res) => {
|
|
|
- this.total = res.data.total;
|
|
|
- this.users = res.data.users;
|
|
|
- this.listLoading = false;
|
|
|
- //NProgress.done();
|
|
|
- });
|
|
|
+ this.http.post(this.port.base.roleList, {
|
|
|
+ keyName: this.filters.keyName
|
|
|
+ }, res => {
|
|
|
+ this.listLoading = false;
|
|
|
+ if (res.code == "ok") {
|
|
|
+ this.list = res.data;
|
|
|
+ //this.total = res.data.total;
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: res.msg,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }, error => {
|
|
|
+ this.listLoading = false;
|
|
|
+ this.$message({
|
|
|
+ message: error,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ //显示新增界面
|
|
|
+ handleAdd: function () {
|
|
|
+ this.addFormVisible = true;
|
|
|
+ this.addForm = {
|
|
|
+ roleName: '',
|
|
|
+ uploadPower: false,
|
|
|
+ dowloadPower:false,
|
|
|
+ viewPower:false,
|
|
|
+ approvalPower:false
|
|
|
+ };
|
|
|
},
|
|
|
+
|
|
|
//新增
|
|
|
addSubmit: function () {
|
|
|
this.$refs.addForm.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- var _this = this;
|
|
|
this.addLoading = true;
|
|
|
this.http.post(this.port.base.addRole, {
|
|
|
roleName: this.addForm.roleName,
|
|
|
@@ -228,12 +247,13 @@
|
|
|
flag: 0
|
|
|
}, res => {
|
|
|
this.addLoading = false;
|
|
|
+ this.addFormVisible = false;
|
|
|
if (res.code == "ok") {
|
|
|
this.$message({
|
|
|
message: '创建成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
- this.getUsers();
|
|
|
+ this.getRoles();
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -242,6 +262,7 @@
|
|
|
}
|
|
|
}, error => {
|
|
|
this.addLoading = false;
|
|
|
+ this.addFormVisible = false;
|
|
|
this.$message({
|
|
|
message: error,
|
|
|
type: 'error'
|
|
|
@@ -249,100 +270,100 @@
|
|
|
})
|
|
|
}
|
|
|
});
|
|
|
- },
|
|
|
+ },
|
|
|
+
|
|
|
//删除
|
|
|
handleDel: function (index, row) {
|
|
|
- this.$confirm('确认删除该人员吗?', '提示', {
|
|
|
+ this.$confirm('确认删除该角色吗?', '提示', {
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- this.listLoading = true;
|
|
|
- //NProgress.start();
|
|
|
- let para = { id: row.id };
|
|
|
- removeUser(para).then((res) => {
|
|
|
- this.listLoading = false;
|
|
|
- //NProgress.done();
|
|
|
- this.$message({
|
|
|
- message: '删除成功',
|
|
|
- type: 'success'
|
|
|
- });
|
|
|
- this.getUsers();
|
|
|
- });
|
|
|
- }).catch(() => {
|
|
|
-
|
|
|
+ var _this = this;
|
|
|
+ this.addLoading = true;
|
|
|
+ this.http.post(this.port.base.delRole, {
|
|
|
+ id: row.id
|
|
|
+ }, res => {
|
|
|
+ if (res.code == "ok") {
|
|
|
+ this.$message({
|
|
|
+ message: '删除成功',
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ this.getRoles();
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: res.msg,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }, error => {
|
|
|
+ this.$message({
|
|
|
+ message: error,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ })
|
|
|
});
|
|
|
- },
|
|
|
+ },
|
|
|
+
|
|
|
//显示编辑界面
|
|
|
handleEdit: function (index, row) {
|
|
|
- this.editFormVisible = true;
|
|
|
- this.editForm = Object.assign({}, row);
|
|
|
- },
|
|
|
- //显示新增界面
|
|
|
- handleAdd: function () {
|
|
|
- this.addFormVisible = true;
|
|
|
- this.addForm = {
|
|
|
- roleName: '',
|
|
|
- uploadPower: false,
|
|
|
- dowloadPower:false,
|
|
|
- viewPower:false,
|
|
|
- approvalPower:false
|
|
|
+ this.editFormVisible = true;
|
|
|
+ this.editForm = {
|
|
|
+ id: row.id,
|
|
|
+ roleName: row.roleName,
|
|
|
+ uploadPower: row.uploadPower==0?false:true,
|
|
|
+ dowloadPower: row.dowloadPower==0?false:true,
|
|
|
+ viewPower: row.viewPower==0?false:true,
|
|
|
+ approvalPower: row.approvalPower==0?false:true
|
|
|
};
|
|
|
- },
|
|
|
+ },
|
|
|
+
|
|
|
//编辑
|
|
|
editSubmit: function () {
|
|
|
this.$refs.editForm.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.$confirm('确认提交吗？', '提示', {}).then(() => {
|
|
|
- this.editLoading = true;
|
|
|
- //NProgress.start();
|
|
|
- let para = Object.assign({}, this.editForm);
|
|
|
- para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
|
|
|
- editUser(para).then((res) => {
|
|
|
- this.editLoading = false;
|
|
|
- //NProgress.done();
|
|
|
- this.$message({
|
|
|
- message: '提交成功',
|
|
|
- type: 'success'
|
|
|
- });
|
|
|
- this.$refs['editForm'].resetFields();
|
|
|
- this.editFormVisible = false;
|
|
|
- this.getUsers();
|
|
|
- });
|
|
|
- });
|
|
|
+ this.editLoading = true;
|
|
|
+ this.http.post(this.port.base.addRole, {
|
|
|
+ id: this.editForm.id,
|
|
|
+ roleName: this.editForm.roleName,
|
|
|
+ uploadPower: this.editForm.uploadPower?1:0,
|
|
|
+ dowloadPower: this.editForm.dowloadPower?1:0,
|
|
|
+ viewPower: this.editForm.viewPower?1:0,
|
|
|
+ approvalPower: this.editForm.approvalPower?1:0,
|
|
|
+ flag: 1
|
|
|
+ }, res => {
|
|
|
+ this.editLoading = false;
|
|
|
+ this.editFormVisible = false;
|
|
|
+ if (res.code == "ok") {
|
|
|
+ this.$message({
|
|
|
+ message: '修改成功',
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ this.getRoles();
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: res.msg,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }, error => {
|
|
|
+ this.editLoading = false;
|
|
|
+ this.editFormVisible = false;
|
|
|
+ this.$message({
|
|
|
+ message: error,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ })
|
|
|
}
|
|
|
});
|
|
|
- },
|
|
|
- selsChange: function (sels) {
|
|
|
- this.sels = sels;
|
|
|
- },
|
|
|
- //批量删除
|
|
|
- batchRemove: function () {
|
|
|
- var ids = this.sels.map(item => item.id).toString();
|
|
|
- this.$confirm('确认删除选中记录吗？', '提示', {
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- this.listLoading = true;
|
|
|
- //NProgress.start();
|
|
|
- let para = { ids: ids };
|
|
|
- batchRemoveUser(para).then((res) => {
|
|
|
- this.listLoading = false;
|
|
|
- //NProgress.done();
|
|
|
- this.$message({
|
|
|
- message: '删除成功',
|
|
|
- type: 'success'
|
|
|
- });
|
|
|
- this.getUsers();
|
|
|
- });
|
|
|
- }).catch(() => {
|
|
|
-
|
|
|
- });
|
|
|
- }
|
|
|
+ }
|
|
|
},
|
|
|
+
|
|
|
created() {
|
|
|
let height = window.innerHeight;
|
|
|
this.tableHeight = height - 240;
|
|
|
},
|
|
|
+
|
|
|
mounted() {
|
|
|
- this.getUsers();
|
|
|
+ this.getRoles();
|
|
|
}
|
|
|
}
|
|
|
</script>
|
