hongxudong 2 лет назад
Родитель
Сommit
876f2a9e8c

+ 2 - 2
src/components/main/components/side-menu/item-mixin.js

@@ -12,8 +12,8 @@ export default {
       return this.parentItem.name
     },
     children () {
-      //过滤掉新建编辑
-      return this.parentItem.children.filter(f => f.flgRight)
+      //过滤掉按钮类型新建编辑
+      return this.parentItem.children.filter(f => f.menuType !== 2)
     },
     textColor () {
       return this.theme === 'dark' ? '#fff' : '#495060'

+ 1 - 1
src/components/main/components/side-menu/side-menu-item.vue

@@ -24,7 +24,7 @@
           }}</span>
         <Icon type="md-arrow-dropdown" />
       </template>
-      <template v-for="item in children" v-if="item.meta.title && item.meta.flgRight">
+      <template v-for="item in children" v-if="item.meta.title && item.menuType !== 2">
         <template v-if="item.children && item.children.length === 1">
           <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name}`" :parent-item="item" :search-text="searchText"></side-menu-item>
           <menu-item v-else :name="getNameOrHref(item, true)" :key="`menu-${item.children[0].name}`">

+ 2 - 2
src/components/main/components/side-menu/side-menu.vue

@@ -64,7 +64,7 @@
           <p class="drawer-title"> {{ showTitle(item) }}</p>
           <div class="drawer-item">
             <p class="drawer-content" v-for="it  in item.children" @mouseenter="mouseenter(it)"
-               @mouseleave="mouseleave(it)" v-if="it.meta.title && it.meta.flgRight">
+               @mouseleave="mouseleave(it)" v-if="it.meta.title && it.menuType !== 2">
             <span :style="'cursor:pointer;' + (menuName && it.meta.title.includes(menuName) ? 'color: orange;':'')"
                   @click="returnSpecificPage(item,it,false)" class="drawer-meta-title">{{ it.meta.title }}</span>
               <Button size="small" type="primary" v-show="it.meta.hover" @click="returnSpecificPage(item,it,true)">
@@ -167,7 +167,7 @@ export default {
           if (res.data) {
             let menu = res.data.menu;
             let menuCopy = menu.copy();
-            menuCopy = menuCopy.filter(it => it.flgRight && it.objectCode !== 'home')
+            menuCopy = menuCopy.filter(it => it.objectCode !== 'home')
             sessionStorage.setItem('menu', JSON.stringify(menuCopy))
             // 功能权限
             if (res.data.function) {

+ 1 - 1
src/components/main/components/user/user.vue

@@ -632,7 +632,7 @@ export default {
           if (res.data) {
             let menu = res.data.menu;
             let menuCopy = menu.copy();
-            menuCopy = menuCopy.filter(it => it.flgRight && it.objectCode !== 'home')
+            menuCopy = menuCopy.filter(it => it.objectCode !== 'home')
             sessionStorage.setItem('menu', JSON.stringify(menuCopy))
             // 功能权限
             if (res.data.function) {

+ 0 - 1
src/libs/tools/user-tools.js

@@ -305,7 +305,6 @@ function _setMenuItem(item) {
     title: item.title,
     path: item.path,
     flgMenu: item.flgMenu,
-    flgRight: item.flgRight,
     flgFast: item.flgFast,
     flgSameRoute: item.flgSameRoute,
     flgChooseId: item.flgChooseId,

+ 0 - 1
src/store/module/user.js

@@ -225,7 +225,6 @@ export default {
       // commit('setAccess', data.user.funCodeList)
       let menu = data.menu;
       let menuCopy = menu.copy();
-      // menuCopy = menuCopy.filter(it => it.flgRight && it.objectCode !== 'home')
       menuCopy = menuCopy.filter(it =>  it.objectCode !== 'home')
       sessionStorage.setItem('menu', JSON.stringify(menuCopy))
       // 功能权限

+ 1 - 1
src/view/apm/operation-log/index.vue

@@ -760,7 +760,7 @@ export default {
           'label-reprint', 'label-print', 'product-delivery', 'produce-order', 'work-book-audit', 'ws-clock-user', 'molding-user-change', 'product-code-change', 'mold-damage',
         'mould-carryover']
         // 只查页面 排除自身
-        menuList = menuList.filter(it => it.menuType === 1 && it.flgMenu && it.flgRight
+        menuList = menuList.filter(it => it.menuType === 1 && it.flgMenu
         && it.objectCode.indexOf('data-collection') == -1 && noLog.indexOf(it.objectCode) == -1
           && (!it.menuTags || typeof it.menuTags == 'json' && JSON.parse(it.menuTags).flgReport));
         if (menuList && menuList.length > 0) {