朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 7793d57b40f6058a45a63f8a9864fbcad4980ce0 1 个父辈 4975a23d

.......

内嵌 并排对比
正在显示 6 个修改的文件 包含 27 行增加 和 25 行删除
... ... @@ -17,9 +17,9 @@ export default {
return axios({
method: 'GET',
url: url,
data: params,
params: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8',
'Content-Type': 'application/x-www-form-urlencoded'
}
});
},
... ...
... ... @@ -21,7 +21,7 @@
</el-table-column>
<el-table-column type="index">
</el-table-column>
<el-table-column prop="companyId" label="ID" v-if="show" sortable>
<el-table-column prop="companyId" label="ID" sortable>
</el-table-column>
<el-table-column prop="companyName" label="公司名称" sortable>
</el-table-column>
... ...
... ... @@ -21,7 +21,7 @@
</el-table-column>
<el-table-column type="index">
</el-table-column>
<el-table-column prop="departmentId" label="ID" v-if="show" sortable>
<el-table-column prop="departmentId" label="ID" sortable>
</el-table-column>
<el-table-column prop="departmentName" label="部门名称" sortable>
</el-table-column>
... ... @@ -106,7 +106,7 @@
data() {
return {
filters: {
companyName: ''
departmentName: ''
},
departmentList: [],
... ...
... ... @@ -27,7 +27,7 @@
</el-table-column>
<el-table-column prop="description" label="描述" min-width="200" sortable>
</el-table-column>
<el-table-column prop="permissionSign" label="排序" width="100" sortable>
<el-table-column prop="permissionOrder" label="排序" width="100" sortable>
</el-table-column>
<el-table-column prop="url" label="路径" width="100" sortable>
</el-table-column>
... ...
... ... @@ -4,7 +4,7 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.roleName" placeholder="部门名称"></el-input>
<el-input v-model="filters.roleName" placeholder="岗位/角色名称"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="getRoles()">查询</el-button>
... ... @@ -21,11 +21,13 @@
</el-table-column>
<el-table-column type="index" width="60">
</el-table-column>
<el-table-column prop="roleId" label="ID" width="100" v-if="show" sortable>
<el-table-column prop="roleId" label="ID" width="100" sortable>
</el-table-column>
<el-table-column prop="roleName" label="部门名称" min-width="200" sortable>
<el-table-column prop="roleName" label="岗位/角色名称" min-width="200" sortable>
</el-table-column>
<el-table-column prop="description" label="部门描述" min-width="200" sortable>
<el-table-column prop="departmentName" label="部门名称" min-width="200" sortable>
</el-table-column>
<el-table-column prop="description" label="岗位/角色描述" min-width="200" sortable>
</el-table-column>
<el-table-column label="操作" min-width="260">
<template slot-scope="scope">
... ... @@ -50,10 +52,10 @@
<span>{{editForm.roleId}}</span>
</el-form-item>
<el-form-item label="岗位名称">
<el-input v-model="editForm.roleName" auto-complete="off" placeholder="请输入角色名称：例如:ROLE_name"></el-input>
<el-input v-model="editForm.roleName" auto-complete="off" placeholder="请输入岗位/角色名称：例如:ROLE_name"></el-input>
</el-form-item>
<el-form-item label="岗位描述">
<el-input v-model="editForm.description" auto-complete="off" placeholder="请输入角色描述：例如:用户管理员"></el-input>
<el-input v-model="editForm.description" auto-complete="off" placeholder="请输入岗位/角色描述：例如:用户管理员"></el-input>
</el-form-item>
<el-form-item label="部门名称">
<el-select v-model="editForm.departmentId" placeholder="请选择">
... ... @@ -75,11 +77,11 @@
<!--新增界面-->
<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
<el-form-item label="岗位名称" prop="roleName">
<el-input v-model="addForm.roleName" auto-complete="off" placeholder="请输入角色名称：例如:ROLE_name"></el-input>
<el-form-item label="岗位/角色名称" prop="roleName">
<el-input v-model="addForm.roleName" auto-complete="off" placeholder="请输入岗位/角色名称：例如:ROLE_name"></el-input>
</el-form-item>
<el-form-item label="岗位描述" prop="description">
<el-input v-model="addForm.description" auto-complete="off" placeholder="请输入角色描述：例如:用户管理员"></el-input>
<el-form-item label="岗位/角色描述" prop="description">
<el-input v-model="addForm.description" auto-complete="off" placeholder="请输入岗位/角色描述：例如:用户管理员"></el-input>
</el-form-item>
<el-form-item label="部门名称" prop="roleSign">
<el-select v-model="addForm.departmentId" placeholder="请选择">
... ... @@ -140,7 +142,7 @@
editLoading: false,
editFormRules: {
roleName: [
{ required: true, message: '请输入岗位名称', trigger: 'blur' }
{ required: true, message: '请输入岗位/角色名称', trigger: 'blur' }
]
},
//编辑界面数据
... ... @@ -159,10 +161,10 @@
addLoading: false,
addFormRules: {
roleName: [
{ required: true, message: '请输入岗位名称', trigger: 'blur' }
{ required: true, message: '请输入岗位/角色名称', trigger: 'blur' }
],
description: [
{ required: true, message: '请输入岗位描述', trigger: 'blur' }
{ required: true, message: '请输入岗位/角色描述', trigger: 'blur' }
]
},
//新增界面数据
... ...
... ... @@ -4,10 +4,10 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.realname" placeholder="姓名"></el-input>
<el-input v-model="filters.realName" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="filters.username" placeholder="账号"></el-input>
<el-input v-model="filters.userName" placeholder="账号"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="getUsers">查询</el-button>
... ... @@ -190,8 +190,8 @@
data() {
return {
filters: {
username: '',
realname: ''
userName: '',
realName: ''
},
users: [],
total: 0,
... ... @@ -269,8 +269,8 @@
let para = {
pageNum: this.pageNum,
pageSize: this.pageSize,
username: this.filters.username,
realname: this.filters.realname
userName: this.filters.userName,
realName: this.filters.realName
};
this.listLoading = true;
getUserList(para).then((res) => {
... ...