From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platform/src/views/system/role.vue | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/platform/src/views/system/role.vue b/platform/src/views/system/role.vue
index f913359..91cf09e 100644
--- a/platform/src/views/system/role.vue
+++ b/platform/src/views/system/role.vue
@@ -16,7 +16,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['system:role:create', 'system:role:delete']">
- <li v-permissions="['system:role:create']"><el-button type="primary" @click="$refs.operaRoleWindow.open('鏂板缓瑙掕壊', null, 0)" icon="el-icon-plus">鏂板缓</el-button></li>
+ <li v-permissions="['system:role:create']"><el-button type="primary" @click="$refs.operaRoleWindow.open('鏂板缓瑙掕壊')" icon="el-icon-plus">鏂板缓</el-button></li>
<li v-permissions="['system:role:delete']"><el-button @click="deleteByIdInBatch" icon="el-icon-delete">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -24,33 +24,31 @@
:data="tableData.list"
:default-sort = "{prop: 'createTime', order: 'descending'}"
stripe
- border
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
- <el-table-column prop="code" label="瑙掕壊缂栫爜" fixed="left" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="name" label="瑙掕壊鍚嶇О" fixed="left" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="remark" label="瑙掕壊澶囨敞" min-width="120px" align="center"></el-table-column>
- <el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px" align="center">
+ <el-table-column prop="code" label="瑙掕壊缂栫爜" fixed="left" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="瑙掕壊鍚嶇О" fixed="left" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="瑙掕壊澶囨敞" min-width="120px"></el-table-column>
+ <el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140px" align="center"></el-table-column>
- <el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px" align="center">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140px" sortable="custom" sort-by="role.CREATE_TIME"></el-table-column>
+ <el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['system:role:update', 'system:role:createRolePermission', 'system:role:createRoleMenu', 'system:role:delete'])"
label="鎿嶄綔"
min-width="270"
- align="center"
fixed="right"
>
<template v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)" slot-scope="{row}">
- <el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row, 0)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.permissionConfigWindow.open(row, 0)" v-permissions="['system:role:createRolePermission']">閰嶇疆鏉冮檺</el-button>
- <el-button type="text" @click="$refs.menuConfigWindow.open(row, 0)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">鎺堟潈鑿滃崟</el-button>
+ <el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">閰嶇疆鏉冮檺</el-button>
+ <el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">鎺堟潈鑿滃崟</el-button>
<el-button v-if="!row.fixed" type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['system:role:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -87,8 +85,7 @@
searchForm: {
code: '',
name: '',
- remark: '',
- type: 0
+ remark: ''
}
}
},
--
Gitblit v1.9.3