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 |  100 +++++++++++++++++++++++++++++---------------------
 1 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index eb196f1..bfd49d0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,6 +46,23 @@
     component: () => import("@/views/login"),
     hidden: true,
   },
+  // 绗笁鏂圭櫥褰曢〉
+  {
+    path: "/thirdpartylogin",
+    component: () => import("@/views/thirdpartylogin"),
+    hidden: true,
+  },
+  // 绗笁鏂圭櫥褰曢〉涓浆
+  {
+    path: "/logindemo",
+    component: () => import("@/views/logindemo"),
+    hidden: true,
+  },
+  {
+    path: "/callbacklccpn",
+    component: () => import("@/views/tideLogin.vue"),
+    hidden: true,
+  },
   {
     path: "/register",
     component: () => import("@/views/register"),
@@ -62,7 +79,7 @@
     hidden: true,
   },
   {
-    path: "",
+    path: "/",
     component: Layout,
     redirect: "index",
     children: [
@@ -100,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
         },
@@ -116,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 },
       },
     ],
   },
@@ -125,15 +161,23 @@
     path: "/productOrder",
     component: Layout,
     hidden: true,
-    permissions: ["productOrder:order"],
+    permissions: ["business:productOrder"],
     children: [
       {
-        // 鎴愬搧涓嬪崟璇︽儏
-        path: "add",
+        // 鏌ョ湅鎴愬搧涓嬪崟璇︽儏
+        path: "addView",
         component: () =>
-          import("@/views/business/productOrder/components/add.vue"),
-        name: "Add",
-        meta: { title: "鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/materialOrder",keepAlive: true },
+          import("@/views/business/productOrder/components/addView.vue"),
+        name: "AddView",
+        meta: { title: "鏌ョ湅鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/productOrder",keepAlive: true },
+      },
+      {
+        // 杩涜涓嬪崟-鎴愬搧涓嬪崟
+        path: "addOrder",
+        component: () =>
+          import("@/views/business/productOrder/components/addOrder.vue"),
+        name: "AddOrder",
+        meta: { title: "杩涜鎴愬搧涓嬪崟", activeMenu: "/business/productOrder",keepAlive: true },
       },
     ],
   },
@@ -149,7 +193,7 @@
         path: "inspection",
         component: () => import("@/views/business/inspectionTask/inspection"),
         name: "inspection",
-        meta: { title: "妫�楠屽崟璇︽儏", activeMenu: "/business/inspectionTask" },
+        meta: { title: "妫�楠屽崟璇︽儏", activeMenu: "/business/inspectionTask", keepAlive: false },
       },
     ],
   },
@@ -204,34 +248,6 @@
     component: Layout,
     hidden: true,
     permissions: ["customer:edit"],
-  },
-  {
-    path: "/monitor/job-log",
-    component: Layout,
-    hidden: true,
-    permissions: ["monitor:job:list"],
-    children: [
-      {
-        path: "index/:jobId(\\d+)",
-        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