From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/menu.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/menu.vue b/Source/UBCS-WEB/src/views/system/menu.vue
index 6c8f412..5e3e267 100644
--- a/Source/UBCS-WEB/src/views/system/menu.vue
+++ b/Source/UBCS-WEB/src/views/system/menu.vue
@@ -21,14 +21,14 @@
@on-load="onLoad"
@tree-load="treeLoad">
<template slot="menuLeft">
- <el-button v-if="this.permission.menu.menu_delete"
+ <el-button v-if="permissionList.delBtn"
icon="el-icon-delete"
plain
size="small"
type="danger"
@click="handleDelete">鍒� 闄�
</el-button>
- <el-button v-if="this.permission.menu.menu_clone"
+ <el-button v-if="permissionList.cloneBtn"
icon="el-icon-connection"
plain
size="small"
@@ -38,7 +38,7 @@
</template>
<template slot="menu" slot-scope="scope">
<el-button
- v-if="userInfo.role_name.includes('admin') && scope.row.category === 1"
+ v-if="permissionList.addChildBtn && scope.row.category === 1"
icon="el-icon-circle-plus-outline"
size="small"
type="text"
@@ -56,8 +56,10 @@
<!-- 浠庡叾浠栬彍鍗曞厠闅嗘寜閽� -->
<el-dialog :visible.sync="cloneOtherMenuButtons.cloneButtonSettingBox"
append-to-body
+ class="avue-dialog avue-dialog--top"
style="height: 110vh; margin-top: -10vh;"
title="浠庡叾浠栬彍鍗曞厠闅嗘寜閽�"
+ top="0"
width="1100px"
@close="cleanCloneSelections">
<avue-crud ref="cloneCrud"
@@ -127,6 +129,7 @@
label: "鑿滃崟鍚嶇О",
prop: "name",
search: true,
+ width: 220,
rules: [
{
required: true,
@@ -294,7 +297,6 @@
cloneButtonSettingBox: false,
selectCloneButtons: [],
cloneOption: {
- height: "auto",
menu: false,
header: false,
addBtn: false,
@@ -441,7 +443,9 @@
addBtn: this.vaildData(this.permission.menu.menu_add, false),
viewBtn: this.vaildData(this.permission.menu.menu_view, false),
delBtn: this.vaildData(this.permission.menu.menu_delete, false),
- editBtn: this.vaildData(this.permission.menu.menu_edit, false)
+ editBtn: this.vaildData(this.permission.menu.menu_edit, false),
+ cloneBtn: this.vaildData(this.permission.menu.menu_clone, false),
+ addChildBtn: this.vaildData(this.permission.menu.menu_add_child, false),
};
},
--
Gitblit v1.9.3