|
|
@@ -33,20 +33,6 @@
|
|
|
:model="state.formQuery"
|
|
|
ref="queryRef"
|
|
|
size="default" label-width="0px" class="mt5 mb5">
|
|
|
- <el-input
|
|
|
- v-model="state.formQuery.companyId"
|
|
|
- placeholder="公司id"
|
|
|
- clearable
|
|
|
- @blur="loadData(true)"
|
|
|
- class="wd150 mr10">
|
|
|
- </el-input>
|
|
|
- <el-input
|
|
|
- v-model="state.formQuery.parentId"
|
|
|
- placeholder="父角色id"
|
|
|
- clearable
|
|
|
- @blur="loadData(true)"
|
|
|
- class="wd150 mr10">
|
|
|
- </el-input>
|
|
|
<el-input
|
|
|
v-model="state.formQuery.roleName"
|
|
|
placeholder="角色名"
|
|
|
@@ -54,27 +40,6 @@
|
|
|
@blur="loadData(true)"
|
|
|
class="wd150 mr10">
|
|
|
</el-input>
|
|
|
- <el-input
|
|
|
- v-model="state.formQuery.roleDesc"
|
|
|
- placeholder="角色描述"
|
|
|
- clearable
|
|
|
- @blur="loadData(true)"
|
|
|
- class="wd150 mr10">
|
|
|
- </el-input>
|
|
|
- <el-input
|
|
|
- v-model="state.formQuery.permissions"
|
|
|
- placeholder="角色列表"
|
|
|
- clearable
|
|
|
- @blur="loadData(true)"
|
|
|
- class="wd150 mr10">
|
|
|
- </el-input>
|
|
|
- <el-input
|
|
|
- v-model="state.formQuery.updateTime"
|
|
|
- placeholder="更新时间"
|
|
|
- clearable
|
|
|
- @blur="loadData(true)"
|
|
|
- class="wd150 mr10">
|
|
|
- </el-input>
|
|
|
|
|
|
|
|
|
<el-button class="ml10" plain size="default" type="success" @click="loadData(true)">
|
|
|
@@ -84,6 +49,7 @@
|
|
|
</el-form>
|
|
|
|
|
|
<el-table
|
|
|
+ :header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
|
|
border
|
|
|
stripe="stripe"
|
|
|
:height="state.tableData.height"
|
|
|
@@ -97,7 +63,6 @@
|
|
|
<template #empty>
|
|
|
<el-empty></el-empty>
|
|
|
</template>
|
|
|
- <el-table-column type="selection" align="center" width="55" fixed="left"/>
|
|
|
<el-table-column
|
|
|
v-for="field in state.tableData.columns"
|
|
|
:key="field.prop"
|
|
|
@@ -121,7 +86,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
- <ext-page class="page-pager" v-model:value="state.pageQuery" @change="loadData(false)"/>
|
|
|
+<!-- <ext-page class="page-pager" v-model:value="state.pageQuery" @change="loadData(false)"/>-->
|
|
|
</el-card>
|
|
|
</div>
|
|
|
<RoleDialog ref="roleDialogRef" @refresh="loadData(true)"/>
|
|
|
@@ -156,7 +121,6 @@ const state = reactive({
|
|
|
data: [] as Array < any >,
|
|
|
loading: false,
|
|
|
columns: [
|
|
|
- {type: 'selection', width: 60, align: 'center', fixed: 'left'},
|
|
|
{label: '角色名', prop: 'roleName', resizable: true},
|
|
|
{label: '角色描述', prop: 'roleDesc', resizable: true},
|
|
|
{label: '角色列表', prop: 'permissions', resizable: true},
|
|
|
@@ -208,10 +172,10 @@ const loadData = (refresh: boolean = false) => {
|
|
|
state.pageQuery.pageNum = 1;
|
|
|
}
|
|
|
state.tableData.loading = true;
|
|
|
- $body(`/admin-user/listRole`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
|
|
|
- let {list, total} = res;
|
|
|
- state.tableData.data = list;
|
|
|
- state.pageQuery.total = total;
|
|
|
+ $get(`/admin-user/listRole`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
|
|
|
+ // let {list, total} = res;
|
|
|
+ state.tableData.data = res;
|
|
|
+ // state.pageQuery.total = total;
|
|
|
state.tableData.loading = false;
|
|
|
}).catch(e => {
|
|
|
console.error(e)
|