From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/router/index.js | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 61648ce..bfd49d0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,6 +59,11 @@
hidden: true,
},
{
+ path: "/callbacklccpn",
+ component: () => import("@/views/tideLogin.vue"),
+ hidden: true,
+ },
+ {
path: "/register",
component: () => import("@/views/register"),
hidden: true,
@@ -112,13 +117,25 @@
permissions: ["business:order"],
children: [
{
- // 鍘熸潗鏂欎笅鍗�
- path: "customsInspection",
+ // 鍘熸潗鏂欎笅鍗�-杩涜涓嬪崟
+ path: "customsInspectionOrder",
component: () =>
- import("@/views/business/materialOrder/customsInspection"),
- name: "CustomsInspection",
+ import("@/views/business/materialOrder/customsInspectionOrder"),
+ name: "CustomsInspectionOrder",
meta: {
- title: "鍘熸潗鏂欎笅鍗曡鎯�",
+ title: "杩涜鍘熸潗鏂欎笅鍗�",
+ activeMenu: "/business/materialOrder",
+ keepAlive: true
+ },
+ },
+ {
+ // 鍘熸潗鏂欎笅鍗�-鏌ョ湅璇︽儏
+ path: "customsInspectionView",
+ component: () =>
+ import("@/views/business/materialOrder/customsInspectionView"),
+ name: "CustomsInspectionView",
+ meta: {
+ title: "鏌ョ湅鍘熸潗鏂欎笅鍗曡鎯�",
activeMenu: "/business/materialOrder",
keepAlive: true
},
@@ -128,7 +145,14 @@
path: "copperOrder",
component: () => import("@/views/business/materialOrder/copperOrder"),
name: "CopperOrder",
- meta: { title: "閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder",keepAlive: true },
+ meta: { title: "杩涜閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder",keepAlive: true },
+ },
+ {
+ // 閾滄潗鏂欎笅鍗�-鏌ョ湅璇︽儏
+ path: "copperView",
+ component: () => import("@/views/business/materialOrder/copperView"),
+ name: "CopperView",
+ meta: { title: "鏌ョ湅閾滄潗鏂欎笅鍗曡鎯�", activeMenu: "/business/materialOrder",keepAlive: true },
},
],
},
@@ -145,7 +169,7 @@
component: () =>
import("@/views/business/productOrder/components/addView.vue"),
name: "AddView",
- meta: { title: "鏌ョ湅鎴愬搧涓嬪崟", activeMenu: "/business/productOrder",keepAlive: true },
+ meta: { title: "鏌ョ湅鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/productOrder",keepAlive: true },
},
{
// 杩涜涓嬪崟-鎴愬搧涓嬪崟
--
Gitblit v1.9.3