odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master' (#99) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/99
This commit is contained in:
wenhua
2024-04-01 07:09:01 +00:00
parent 18113da288 26b50d6103
commit cf2f071f6d
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/system/menu/DistributeRole.vue
View File

@@ -39,7 +39,7 @@
@select="handleSelect"
v-tabh
>
<el-table-column type="selection" width="55"/>
<el-table-column type="selection" width="55" fixed="left" />
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column prop="roleName" label="角色名称" align="center"/>
<el-table-column prop="roleKey" label="角色标识符" align="center"/>
@@ -59,7 +59,7 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right">
<template #default="scope">
<popover-delete :name="scope.row.roleName" :type="'角色'" :btn-text="'取消授权'"
@delete="handleCancelAuthorization([scope.row.roleId])"/>
@@ -98,7 +98,7 @@
v-loading="dialogLoading"
@select="handleDialogSelect"
>
<el-table-column type="selection" width="55"/>
<el-table-column type="selection" width="55" fixed="left" />
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column prop="roleName" label="角色名称" align="center"/>
<el-table-column prop="roleKey" label="角色标识符" align="center"/>
@@ -117,7 +117,7 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right">
<template #default="scope">
<el-button type="primary" size="mini"
@click="handleSubmit(scope.row.roleId)" link>添加

14
src/views/system/menu/index.vue
View File

@@ -16,7 +16,7 @@
</el-form-item>
</el-form>
<div class="table-header-btn">
<el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
<el-button type="primary" @click="handleAdd" :icon="Plus" v-perm="['admin:menu:add']">新增</el-button>
<el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
</div>
@@ -42,15 +42,13 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间"/>
<el-table-column label="操作" prop="operation">
<el-table-column label="操作" prop="operation" align="right">
<template #default="scope">
<el-button type="primary" v-if="scope.row.menuType!=='B'" size="mini" @click="handleAdd(scope.row)" link>新增
<el-button type="primary" size="mini" @click="handleAdd(scope.row)" link v-perm="['admin:menu:add']">新增
</el-button>
<div v-else style="display: inline-block">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</div>
<el-button type="primary" size="mini" @click="handleEdit(scope.row.menuId)" link>修改</el-button>
<el-button type="primary" size="mini" @click="handleAssignRoles(scope.row)" link>分配角色</el-button>
<popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)"/>
<el-button type="primary" size="mini" @click="handleEdit(scope.row.menuId)" link v-perm="['admin:menu:edit']">修改</el-button>
<!-- <el-button type="primary" size="mini" @click="handleAssignRoles(scope.row)" link>分配角色</el-button> -->
<popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)" :perm="['admin:menu:del']" />
</template>
</el-table-column>
</el-table>