From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/router/index.js |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 0c9bea2..941701c 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -61,6 +61,10 @@
             }
           ]
         },
+{
+          path: '/main/glassOptimize/MoveManage',
+          component: () => import('@/views/pp/glassOptimize/MoveManage.vue')
+        },
         {
           path:'userPassWord',
           name: 'userPassWord',
@@ -330,6 +334,36 @@
               path: 'optimizeProject',
               name: 'optimizeProject',
               component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
+            },
+            {
+              path: 'optimizePrint',
+              name: 'optimizePrint',
+              component: () => import('../views/pp/glassOptimize/OptimizePrint.vue'),
+            },
+            {
+              path: 'OptimizationRectPrint',
+              name: 'OptimizationRectPrint',
+              component: () => import('../views/pp/glassOptimize/OptimizationRectPrint.vue'),
+            },
+            {
+              path: 'OptimizeControl',
+              name: 'OptimizeControl',
+              component: () => import('../views/pp/glassOptimize/OptimizeControl.vue'),
+            },
+            {
+              path: 'Optimization',
+              name: 'Optimization',
+              component: () => import('../views/pp/glassOptimize/Optimization.vue'),
+            },
+            {
+              path: 'optimizeparms',
+              name: 'optimizeparms',
+              component: () => import('../views/pp/glassOptimize/OptimizeParms.vue'),
+            },
+            {
+              path: '/optimizeProject/:projectNo/:thickNess/:model',
+              name: 'optimizeInfo',
+              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
             },
             {
               path: '',
@@ -724,6 +758,12 @@
               component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
             },
             {
+              //璁㈠崟鎶ュ伐
+              path: 'orderReportingWorks',
+              name: 'orderReportingWorks',
+              component: () => import('../views/pp/report/OrderReportingWorks.vue'),
+            },
+            {
               //宸ュ簭寰呭畬鎴�
               path: 'processToBeCompleted',
               name: 'processToBeCompleted',
@@ -913,6 +953,12 @@
               path: 'storageRecord',
               name: 'storageRecord',
               component:()=>import('../views/mm/productStock/StorageRecord.vue'),
+            },
+            {
+              // 瑁呯鎵撳嵃
+              path: 'storageRecordPint',
+              name: 'storageRecordPint',
+              component:()=>import('../views/mm/productStock/StorageRecordPint.vue'),
             },
 
             {
@@ -1188,6 +1234,11 @@
       path: '/register',
       name: 'register',
       component: () => import('../views/RegisterView.vue')
+    },
+    {
+      path: '/app',
+      name: 'app',
+      component: () => import('../views/system/app/appDownload.vue')
     }
     
   ]

--
Gitblit v1.8.0