|
|
@@ -103,7 +103,7 @@
|
|
|
|
|
|
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="角色编号" prop="roleId" width="120" />
|
|
|
+ <el-table-column label="角色编号" prop="id" width="120" />
|
|
|
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
|
|
|
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
|
|
|
<el-table-column label="显示顺序" prop="roleSort" width="100" />
|
|
|
@@ -410,7 +410,7 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
}).then(function() {
|
|
|
- return changeRoleStatus(row.roleId, row.status);
|
|
|
+ return changeRoleStatus(row.id, row.status);
|
|
|
}).then(() => {
|
|
|
this.msgSuccess(text + "成功");
|
|
|
}).catch(function() {
|
|
|
@@ -437,7 +437,7 @@ export default {
|
|
|
this.deptExpand = true,
|
|
|
this.deptNodeAll = false,
|
|
|
this.form = {
|
|
|
- roleId: undefined,
|
|
|
+ id: undefined,
|
|
|
roleName: undefined,
|
|
|
roleKey: undefined,
|
|
|
roleSort: 0,
|
|
|
@@ -552,7 +552,7 @@ export default {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
console.log(234)
|
|
|
- if (this.form.roleId != undefined) {
|
|
|
+ if (this.form.id != undefined) {
|
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
|
updateRole(this.form).then(response => {
|
|
|
this.msgSuccess("修改成功");
|
|
|
@@ -572,8 +572,8 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮（数据权限） */
|
|
|
submitDataScope: function() {
|
|
|
- console.log(345678)
|
|
|
- if (this.form.roleId != undefined) {
|
|
|
+ console.log(345678,this.form.id)
|
|
|
+ if (this.form.id != undefined) {
|
|
|
this.form.deptIds = this.getDeptAllCheckedKeys();
|
|
|
dataScope(this.form).then(response => {
|
|
|
this.msgSuccess("修改成功");
|
yahyahy