From f6722e13ba28cd292c162df9292bb3418ba12bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/system/role/MenuConfigWindow.vue | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/company/src/components/system/role/MenuConfigWindow.vue b/company/src/components/system/role/MenuConfigWindow.vue
index 536f92e..b19a78a 100644
--- a/company/src/components/system/role/MenuConfigWindow.vue
+++ b/company/src/components/system/role/MenuConfigWindow.vue
@@ -25,7 +25,7 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import { createRoleMenu } from '@/api/system/role'
-import { fetchTree as fetchMenuList, fetchTree1 } from '@/api/system/menu'
+import { fetchTree1 } from '@/api/system/menu'
import { mapState } from 'vuex'
export default {
name: 'MenuConfigWindow',
@@ -50,8 +50,7 @@
* @role 瑙掕壊瀵硅薄
*/
open (role) {
- if (this.userInfo.type === 1) {
- fetchTree1({})
+ fetchTree1(0)
.then(records => {
this.role = role
this.menus = records
@@ -66,23 +65,24 @@
.catch(e => {
this.$tip.apiFailed(e)
})
- } else {
- fetchMenuList({})
- .then(records => {
- this.role = role
- this.menus = records
- // 濡傛灉涓哄浐瀹氳鑹诧紝鍒欏浐瀹氳彍鍗曚笉鍙洿鏀�
- this.__resetDisabled(this.menus, this.role)
- // 鎵惧嚭鍙惰妭鐐�
- role.menus = role.menus.filter(menu => role.menus.findIndex(m => m.parentId === menu.id) === -1)
- // 鍒濆鍖栭�変腑
- this.selectedIds = role.menus.map(r => r.id)
- this.visible = true
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- }
+ // }
+ // else {
+ // fetchMenuList()
+ // .then(records => {
+ // this.role = role
+ // this.menus = records
+ // // 濡傛灉涓哄浐瀹氳鑹诧紝鍒欏浐瀹氳彍鍗曚笉鍙洿鏀�
+ // this.__resetDisabled(this.menus, this.role)
+ // // 鎵惧嚭鍙惰妭鐐�
+ // role.menus = role.menus.filter(menu => role.menus.findIndex(m => m.parentId === menu.id) === -1)
+ // // 鍒濆鍖栭�変腑
+ // this.selectedIds = role.menus.map(r => r.id)
+ // this.visible = true
+ // })
+ // .catch(e => {
+ // this.$tip.apiFailed(e)
+ // })
+ // }
},
// 纭閫夋嫨鑿滃崟
--
Gitblit v1.9.3