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 @@
{{ systemTitle }}
-
+
@@ -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"
/>
@@ -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: 解决外部链接打开失败的问题