From 49ecdc73115d94e343cbe271c154fe32e8888c7d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 14:42:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/system/role.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/system/role.vue b/admin/src/views/system/role.vue
index 91cf09e..cfb8d9d 100644
--- a/admin/src/views/system/role.vue
+++ b/admin/src/views/system/role.vue
@@ -40,13 +40,14 @@
</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'])"
+ v-if="containPermissions(['system:role:update', 'system:role:createRolePermission','system:datapermission:create', 'system:role:createRoleMenu', 'system:role:delete'])"
label="鎿嶄綔"
min-width="270"
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)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row)" v-permissions="['system:role:update']">缂栬緫</el-button>
+ <el-button type="text" @click="setData(row)" v-permissions="['system:datapermission:create']">鏁版嵁鏉冮檺</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>
@@ -65,6 +66,7 @@
<PermissionConfigWindow ref="permissionConfigWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
<!-- 鎺堟潈鑿滃崟 -->
<MenuConfigWindow ref="menuConfigWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
+ <OperaSystemRoleDataWindow ref="OperaSystemRoleDataWindow" @success="handlePageChange(tableData.pagination.pageIndex)" />
</TableLayout>
</template>
@@ -75,10 +77,12 @@
import OperaRoleWindow from '@/components/system/role/OperaRoleWindow'
import PermissionConfigWindow from '@/components/system/role/PermissionConfigWindow'
import MenuConfigWindow from '@/components/system/role/MenuConfigWindow'
+import OperaSystemRoleDataWindow from '@/components/system/role/OperaSystemRoleDataWindow'
+import { findByRoleId } from '@/api/system/role'
export default {
name: 'SystemRole',
extends: BaseTable,
- components: { MenuConfigWindow, PermissionConfigWindow, OperaRoleWindow, TableLayout, Pagination },
+ components: { MenuConfigWindow, PermissionConfigWindow, OperaRoleWindow, TableLayout, OperaSystemRoleDataWindow, Pagination },
data () {
return {
// 鎼滅储
@@ -99,6 +103,21 @@
}]
})
this.search()
+ },
+ methods: {
+ setData (row) {
+ findByRoleId({ roleId: row.id })
+ .then(res => {
+ if (!res) {
+ this.$refs.OperaSystemRoleDataWindow.open('鏁版嵁鏉冮檺', { roleId: row.id },row)
+ } else {
+ this.$refs.OperaSystemRoleDataWindow.open('鏁版嵁鏉冮檺', res,row)
+ }
+ })
+ .catch(err => {
+ this.$tip.error(err)
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3