From e6f29116c0bb60b71b806de17b0ec114f87e0970 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 三月 2025 11:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/router/index.js | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index bf11864..a9811bb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -100,12 +100,40 @@
permissions: ["business:order"],
children: [
{
- // 閾滄潗鏂欎笅鍗�
+ // 鍘熸潗鏂欎笅鍗�
path: "customsInspection",
component: () =>
import("@/views/business/materialOrder/customsInspection"),
- name: "customsInspection",
- meta: { title: "閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder" },
+ name: "CustomsInspection",
+ meta: {
+ title: "鍘熸潗鏂欎笅鍗曡鎯�",
+ activeMenu: "/business/materialOrder",
+ keepAlive: true
+ },
+ },
+ {
+ // 閾滄潗鏂欎笅鍗�
+ path: "copperOrder",
+ component: () => import("@/views/business/materialOrder/copperOrder"),
+ name: "CopperOrder",
+ meta: { title: "閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder",keepAlive: true },
+ },
+ ],
+ },
+ {
+ // 鎴愬搧涓嬪崟
+ path: "/productOrder",
+ component: Layout,
+ hidden: true,
+ permissions: ["business:productOrder"],
+ children: [
+ {
+ // 鎴愬搧涓嬪崟璇︽儏
+ path: "add",
+ component: () =>
+ import("@/views/business/productOrder/components/add.vue"),
+ name: "Add",
+ meta: { title: "鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/materialOrder",keepAlive: true },
},
],
},
@@ -121,7 +149,7 @@
path: "inspection",
component: () => import("@/views/business/inspectionTask/inspection"),
name: "inspection",
- meta: { title: "妫�楠屽崟璇︽儏", activeMenu: "/business/inspectionTask" },
+ meta: { title: "妫�楠屽崟璇︽儏", activeMenu: "/business/inspectionTask", keepAlive: false },
},
],
},
@@ -188,20 +216,6 @@
component: () => import("@/views/monitor/job/log"),
name: "JobLog",
meta: { title: "璋冨害鏃ュ織", activeMenu: "/monitor/job" },
- },
- ],
- },
- {
- path: "/tool/gen-edit",
- component: Layout,
- hidden: true,
- permissions: ["tool:gen:edit"],
- children: [
- {
- path: "index/:tableId(\\d+)",
- component: () => import("@/views/tool/gen/editTable"),
- name: "GenEdit",
- meta: { title: "淇敼鐢熸垚閰嶇疆", activeMenu: "/tool/gen" },
},
],
},
--
Gitblit v1.9.3