From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/router/index.js | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b12b86e..013fdc1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@
import productRouter from "./product/index.js" // 浜у搧
import operateRouter from "./operate/index.js" // 鎿嶄綔
import warehouseManageRouter from "./warehouseManage/index.js" // 浠撳簱绠＄悊
+import reportRouter from "./report/index.js" // 鎶ヨ〃
Vue.use(Router)
const login = (resolve) => require(["@/views/other/login/index"], resolve)
@@ -12,6 +13,7 @@
const productManage = (resolve) => require(["@/views/productManage/index"], resolve) // 浜у搧
const operate = (resolve) => require(["@/views/operate/index"], resolve) // 鎿嶄綔
const warehouseManage = (resolve) => require(["@/views/warehouseManage/index"], resolve) // 浠撳簱绠＄悊
+const reportForm = (resolve) => require(["@/views/reportForm/index"], resolve) // 鎶ヨ〃
export const routes = [
{
@@ -50,6 +52,16 @@
children: warehouseManageRouter,
meta: {
title: "浠撳簱绠＄悊",
+ isAllways: true
+ }
+ },
+ {
+ path: "reportForm", // 鎶ヨ〃
+ name: "reportForm",
+ component: reportForm,
+ children: reportRouter,
+ meta: {
+ title: "鎶ヨ〃",
isAllways: true
}
}
@@ -97,10 +109,14 @@
const router = createRouter()
router.afterEach((to, from, next) => {
- if ((to.path === "/overview/overviewList" || to.path === "/reportForm/inOutboundDetail") && to.query.name) {
+ console.log(to, "to")
+ if ((to.path === "/overview/overviewList" || to.path === "/productManage/productList") && to.params.name) {
console.log(from, next)
- to.meta.title = to.query.name
- document.title = to.meta.title
+ to.meta.title = to.params.name
+ // document.title = to.meta.title
+ } else if (to.name === "inboundOutboundDetail") {
+ to.meta.title = "鍑哄叆搴撴槑缁�"
+ // document.title = to.meta.title
}
})
// router.beforeEach((to, from, next) => {
--
Gitblit v1.8.0