From bee325343d5d899ad3fd984e69f1385320d3ab55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 21 Sep 2022 23:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E8=8F=9C=E5=8D=95=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=9A=84=E6=97=B6=E5=80=99=E6=A0=87=E9=A2=98=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/page/GlobalHeader.vue | 5 ++++-
 jshERP-web/src/components/page/GlobalLayout.vue | 4 ++++
 jshERP-web/src/components/tools/UserMenu.vue    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/components/page/GlobalHeader.vue b/jshERP-web/src/components/page/GlobalHeader.vue
index 2f710946..8f258a47 100644
--- a/jshERP-web/src/components/page/GlobalHeader.vue
+++ b/jshERP-web/src/components/page/GlobalHeader.vue
@@ -20,7 +20,7 @@
       <span v-if="device === 'desktop'"></span>
       <span v-else>{{ systemTitle }}</span>
 
-      <user-menu :theme="theme"/>
+      <user-menu :theme="theme" @searchGlobalHeader="searchGlobalHeader" />
     </div>
     <!-- 顶部导航栏模式 -->
     <div v-else :class="['top-nav-header-index', theme]">
@@ -156,6 +156,9 @@
             this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` }
           }
         }
+      },
+      searchGlobalHeader(key, id, title, component){
+        this.$emit("searchGlobalLayout", key, id, title, component)
       }
       //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
     }
diff --git a/jshERP-web/src/components/page/GlobalLayout.vue b/jshERP-web/src/components/page/GlobalLayout.vue
index 8c6cd3ee..092af0b1 100644
--- a/jshERP-web/src/components/page/GlobalLayout.vue
+++ b/jshERP-web/src/components/page/GlobalLayout.vue
@@ -61,6 +61,7 @@
         :collapsed="collapsed"
         :device="device"
         @toggle="toggle"
+        @searchGlobalLayout="searchGlobalLayout"
       />
 
       <!-- layout content -->
@@ -165,6 +166,9 @@
             this.findMenuBykey(i.children,key)
           }
         }
+      },
+      searchGlobalLayout(key, id, title, component){
+        this.$emit("dynamicRouterShow", key, id, title, component)
       }
       //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
     }
diff --git a/jshERP-web/src/components/tools/UserMenu.vue b/jshERP-web/src/components/tools/UserMenu.vue
index 82f9ee4e..c070b820 100644
--- a/jshERP-web/src/components/tools/UserMenu.vue
+++ b/jshERP-web/src/components/tools/UserMenu.vue
@@ -191,7 +191,7 @@
       // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
       searchMethods(value) {
         let route = this.searchMenuOptions.filter(item => item.id === value)[0]
-        this.$router.push({ path: route.url })
+        this.$emit("searchGlobalHeader",route.url, route.id, route.text, route.component)
         this.searchMenuVisible = false
       },
       // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题