朱兆平 / vue_cli · 提交

转到一个项目

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

.......

内嵌 并排对比
正在显示 6 个修改的文件 包含 27 行增加 和 25 行删除
@@ -17,9 +17,9 @@ export default { @@ -17,9 +17,9 @@ export default {
17 return axios({ 17 return axios({
18 method: 'GET', 18 method: 'GET',
19 url: url, 19 url: url,
20 - data: params, 20 + params: params,
21 headers: { 21 headers: {
22 - 'Content-Type': 'application/json;charset=UTF-8', 22 + 'Content-Type': 'application/x-www-form-urlencoded'
23 } 23 }
24 }); 24 });
25 }, 25 },
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </el-table-column> 21 </el-table-column>
22 <el-table-column type="index"> 22 <el-table-column type="index">
23 </el-table-column> 23 </el-table-column>
24 - <el-table-column prop="companyId" label="ID" v-if="show" sortable> 24 + <el-table-column prop="companyId" label="ID" sortable>
25 </el-table-column> 25 </el-table-column>
26 <el-table-column prop="companyName" label="公司名称" sortable> 26 <el-table-column prop="companyName" label="公司名称" sortable>
27 </el-table-column> 27 </el-table-column>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </el-table-column> 21 </el-table-column>
22 <el-table-column type="index"> 22 <el-table-column type="index">
23 </el-table-column> 23 </el-table-column>
24 - <el-table-column prop="departmentId" label="ID" v-if="show" sortable> 24 + <el-table-column prop="departmentId" label="ID" sortable>
25 </el-table-column> 25 </el-table-column>
26 <el-table-column prop="departmentName" label="部门名称" sortable> 26 <el-table-column prop="departmentName" label="部门名称" sortable>
27 </el-table-column> 27 </el-table-column>
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 data() { 106 data() {
107 return { 107 return {
108 filters: { 108 filters: {
109 - companyName: '' 109 + departmentName: ''
110 }, 110 },
111 111
112 departmentList: [], 112 departmentList: [],
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 </el-table-column> 27 </el-table-column>
28 <el-table-column prop="description" label="描述" min-width="200" sortable> 28 <el-table-column prop="description" label="描述" min-width="200" sortable>
29 </el-table-column> 29 </el-table-column>
30 - <el-table-column prop="permissionSign" label="排序" width="100" sortable> 30 + <el-table-column prop="permissionOrder" label="排序" width="100" sortable>
31 </el-table-column> 31 </el-table-column>
32 <el-table-column prop="url" label="路径" width="100" sortable> 32 <el-table-column prop="url" label="路径" width="100" sortable>
33 </el-table-column> 33 </el-table-column>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input v-model="filters.roleName" placeholder="部门名称"></el-input> 7 + <el-input v-model="filters.roleName" placeholder="岗位/角色名称"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 <el-button type="primary" v-on:click="getRoles()">查询</el-button> 10 <el-button type="primary" v-on:click="getRoles()">查询</el-button>
@@ -21,11 +21,13 @@ @@ -21,11 +21,13 @@
21 </el-table-column> 21 </el-table-column>
22 <el-table-column type="index" width="60"> 22 <el-table-column type="index" width="60">
23 </el-table-column> 23 </el-table-column>
24 - <el-table-column prop="roleId" label="ID" width="100" v-if="show" sortable> 24 + <el-table-column prop="roleId" label="ID" width="100" sortable>
25 </el-table-column> 25 </el-table-column>
26 - <el-table-column prop="roleName" label="部门名称" min-width="200" sortable> 26 + <el-table-column prop="roleName" label="岗位/角色名称" min-width="200" sortable>
27 </el-table-column> 27 </el-table-column>
28 - <el-table-column prop="description" label="部门描述" min-width="200" sortable> 28 + <el-table-column prop="departmentName" label="部门名称" min-width="200" sortable>
  29 + </el-table-column>
  30 + <el-table-column prop="description" label="岗位/角色描述" min-width="200" sortable>
29 </el-table-column> 31 </el-table-column>
30 <el-table-column label="操作" min-width="260"> 32 <el-table-column label="操作" min-width="260">
31 <template slot-scope="scope"> 33 <template slot-scope="scope">
@@ -50,10 +52,10 @@ @@ -50,10 +52,10 @@
50 <span>{{editForm.roleId}}</span> 52 <span>{{editForm.roleId}}</span>
51 </el-form-item> 53 </el-form-item>
52 <el-form-item label="岗位名称"> 54 <el-form-item label="岗位名称">
53 - <el-input v-model="editForm.roleName" auto-complete="off" placeholder="请输入角色名称：例如:ROLE_name"></el-input> 55 + <el-input v-model="editForm.roleName" auto-complete="off" placeholder="请输入岗位/角色名称：例如:ROLE_name"></el-input>
54 </el-form-item> 56 </el-form-item>
55 <el-form-item label="岗位描述"> 57 <el-form-item label="岗位描述">
56 - <el-input v-model="editForm.description" auto-complete="off" placeholder="请输入角色描述：例如:用户管理员"></el-input> 58 + <el-input v-model="editForm.description" auto-complete="off" placeholder="请输入岗位/角色描述：例如:用户管理员"></el-input>
57 </el-form-item> 59 </el-form-item>
58 <el-form-item label="部门名称"> 60 <el-form-item label="部门名称">
59 <el-select v-model="editForm.departmentId" placeholder="请选择"> 61 <el-select v-model="editForm.departmentId" placeholder="请选择">
@@ -75,11 +77,11 @@ @@ -75,11 +77,11 @@
75 <!--新增界面--> 77 <!--新增界面-->
76 <el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false"> 78 <el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
77 <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm"> 79 <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
78 - <el-form-item label="岗位名称" prop="roleName">  
79 - <el-input v-model="addForm.roleName" auto-complete="off" placeholder="请输入角色名称：例如:ROLE_name"></el-input> 80 + <el-form-item label="岗位/角色名称" prop="roleName">
  81 + <el-input v-model="addForm.roleName" auto-complete="off" placeholder="请输入岗位/角色名称：例如:ROLE_name"></el-input>
80 </el-form-item> 82 </el-form-item>
81 - <el-form-item label="岗位描述" prop="description">  
82 - <el-input v-model="addForm.description" auto-complete="off" placeholder="请输入角色描述：例如:用户管理员"></el-input> 83 + <el-form-item label="岗位/角色描述" prop="description">
  84 + <el-input v-model="addForm.description" auto-complete="off" placeholder="请输入岗位/角色描述：例如:用户管理员"></el-input>
83 </el-form-item> 85 </el-form-item>
84 <el-form-item label="部门名称" prop="roleSign"> 86 <el-form-item label="部门名称" prop="roleSign">
85 <el-select v-model="addForm.departmentId" placeholder="请选择"> 87 <el-select v-model="addForm.departmentId" placeholder="请选择">
@@ -140,7 +142,7 @@ @@ -140,7 +142,7 @@
140 editLoading: false, 142 editLoading: false,
141 editFormRules: { 143 editFormRules: {
142 roleName: [ 144 roleName: [
143 - { required: true, message: '请输入岗位名称', trigger: 'blur' } 145 + { required: true, message: '请输入岗位/角色名称', trigger: 'blur' }
144 ] 146 ]
145 }, 147 },
146 //编辑界面数据 148 //编辑界面数据
@@ -159,10 +161,10 @@ @@ -159,10 +161,10 @@
159 addLoading: false, 161 addLoading: false,
160 addFormRules: { 162 addFormRules: {
161 roleName: [ 163 roleName: [
162 - { required: true, message: '请输入岗位名称', trigger: 'blur' } 164 + { required: true, message: '请输入岗位/角色名称', trigger: 'blur' }
163 ], 165 ],
164 description: [ 166 description: [
165 - { required: true, message: '请输入岗位描述', trigger: 'blur' } 167 + { required: true, message: '请输入岗位/角色描述', trigger: 'blur' }
166 ] 168 ]
167 }, 169 },
168 //新增界面数据 170 //新增界面数据
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input v-model="filters.realname" placeholder="姓名"></el-input> 7 + <el-input v-model="filters.realName" placeholder="姓名"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-input v-model="filters.username" placeholder="账号"></el-input> 10 + <el-input v-model="filters.userName" placeholder="账号"></el-input>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 <el-button type="primary" v-on:click="getUsers">查询</el-button> 13 <el-button type="primary" v-on:click="getUsers">查询</el-button>
@@ -190,8 +190,8 @@ @@ -190,8 +190,8 @@
190 data() { 190 data() {
191 return { 191 return {
192 filters: { 192 filters: {
193 - username: '',  
194 - realname: '' 193 + userName: '',
  194 + realName: ''
195 }, 195 },
196 users: [], 196 users: [],
197 total: 0, 197 total: 0,
@@ -269,8 +269,8 @@ @@ -269,8 +269,8 @@
269 let para = { 269 let para = {
270 pageNum: this.pageNum, 270 pageNum: this.pageNum,
271 pageSize: this.pageSize, 271 pageSize: this.pageSize,
272 - username: this.filters.username,  
273 - realname: this.filters.realname 272 + userName: this.filters.userName,
  273 + realName: this.filters.realName
274 }; 274 };
275 this.listLoading = true; 275 this.listLoading = true;
276 getUserList(para).then((res) => { 276 getUserList(para).then((res) => {