|
@@ -25,9 +25,9 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item> -->
|
|
|
- <el-form-item label="状态" prop="status">
|
|
|
+ <el-form-item label="状态" prop="enableStatus">
|
|
|
<el-select
|
|
|
- v-model="queryParams.status"
|
|
|
+ v-model="queryParams.enableStatus"
|
|
|
placeholder="角色状态"
|
|
|
clearable
|
|
|
style="width: 240px"
|
|
@@ -132,16 +132,16 @@
|
|
|
<el-table-column label="状态" align="center" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-switch
|
|
|
- v-model="scope.row.status"
|
|
|
+ v-model="scope.row.enableStatus"
|
|
|
active-value="0"
|
|
|
inactive-value="1"
|
|
|
@change="handleStatusChange(scope.row)"
|
|
|
></el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
|
+ <el-table-column label="创建时间" align="center" prop="createDate" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
+ <span>{{ parseTime(scope.row.createDate) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
@@ -215,7 +215,7 @@
|
|
|
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="状态">
|
|
|
- <el-radio-group v-model="form.status">
|
|
|
+ <el-radio-group v-model="form.enableStatus">
|
|
|
<el-radio
|
|
|
v-for="dict in dict.type.sys_normal_disable"
|
|
|
:key="dict.value"
|
|
@@ -386,7 +386,7 @@ export default {
|
|
|
pageSize: 10,
|
|
|
roleName: undefined,
|
|
|
roleKey: undefined,
|
|
|
- status: undefined,
|
|
|
+ enableStatus: undefined,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
@@ -455,17 +455,17 @@ export default {
|
|
|
},
|
|
|
// 角色状态修改
|
|
|
handleStatusChange(row) {
|
|
|
- let text = row.status === "0" ? "启用" : "停用";
|
|
|
+ let text = row.enableStatus === "0" ? "启用" : "停用";
|
|
|
this.$modal
|
|
|
.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?')
|
|
|
.then(function () {
|
|
|
- return changeRoleStatus(row.roleId, row.status);
|
|
|
+ return changeRoleStatus(row.roleId, row.enableStatus);
|
|
|
})
|
|
|
.then(() => {
|
|
|
this.$modal.msgSuccess(text + "成功");
|
|
|
})
|
|
|
.catch(function () {
|
|
|
- row.status = row.status === "0" ? "1" : "0";
|
|
|
+ row.enableStatus = row.enableStatus === "0" ? "1" : "0";
|
|
|
});
|
|
|
},
|
|
|
// 取消按钮
|
|
@@ -491,7 +491,7 @@ export default {
|
|
|
roleId: undefined,
|
|
|
roleName: undefined,
|
|
|
roleSort: 0,
|
|
|
- status: "0",
|
|
|
+ enableStatus: "0",
|
|
|
menuIds: [],
|
|
|
deptIds: [],
|
|
|
menuCheckStrictly: true,
|