From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

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

diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 2361f9a..3c1527e 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -100,6 +100,11 @@
               component: () => import('../views/sd/glassPrice/GlassPriceSet.vue')
             },
             {
+              path: 'glassPriceList',
+              name: 'glassPriceList',
+              component: () => import('../views/sd/glassPrice/GlassPriceList.vue')
+            },
+            {
               name: 'GlassPrice1',
               path: '',
               redirect:'/main/glassPrice/producePriceCompute'
@@ -315,6 +320,38 @@
         },
 
           //pp妯″潡
+        {
+          //鐜荤拑浼樺寲
+          path: 'glassOptimize',
+          name: 'glassOptimize',
+          component: () => import('../views/pp/glassOptimize/Optimize.vue'),
+          children:[
+            {
+              path: 'optimizeProject',
+              name: 'optimizeProject',
+              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
+            },
+            {
+              path: 'optimizePrint',
+              name: 'optimizePrint',
+              component: () => import('../views/pp/glassOptimize/OptimizePrint.vue'),
+            },
+            {
+              path: 'optimizeMove',
+              name: 'optimizeMove',
+              component: () => import('../views/pp/glassOptimize/OptimizeMove.vue'),
+            },
+            {
+              path: '/optimizeProject/:projectNo/:thickNess/:model',
+              name: 'optimizeInfo',
+              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
+            },
+            {
+              path: '',
+              redirect:'/main/glassOptimize/optimizeProject'
+            }
+          ]
+        },
         {
           //宸ュ崟绠＄悊
           path: 'workOrder',
@@ -702,6 +739,12 @@
               component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
             },
             {
+              //璁㈠崟鎶ュ伐
+              path: 'orderReportingWorks',
+              name: 'orderReportingWorks',
+              component: () => import('../views/pp/report/OrderReportingWorks.vue'),
+            },
+            {
               //宸ュ簭寰呭畬鎴�
               path: 'processToBeCompleted',
               name: 'processToBeCompleted',
@@ -892,6 +935,12 @@
               name: 'storageRecord',
               component:()=>import('../views/mm/productStock/StorageRecord.vue'),
             },
+            {
+              // 瑁呯鎵撳嵃
+              path: 'storageRecordPint',
+              name: 'storageRecordPint',
+              component:()=>import('../views/mm/productStock/StorageRecordPint.vue'),
+            },
 
             {
               path: '',
@@ -1021,27 +1070,43 @@
           name: 'stockReport',
           component: () => import('../views/mm/stockReport/StockReport.vue'),
           children:[
-            {
-              path: 'warehouseReport',
-              name: 'warehouseReport',
-              component: () => import('../views/mm/stockReport/WarehouseReport.vue'),
-            }, {
-              path: 'stockMonthReport',
-              name: 'stockMonthReport',
-              component: () => import('../views/mm/stockReport/StockMonthReport.vue'),
-            }, {
-              path: 'subsidiaryMonthReport',
-              name: 'subsidiaryMonthReport',
-              component: () => import('../views/mm/stockReport/SubsidiaryMonthReport.vue'),
-            },
             /*----------- 鏂板 ----------------*/
             {
-              path: 'StockWarehouseReport',
-              name: 'StockWarehouseReport',
-              component: () => import('../views/mm/stockReport/StockWarehouseReport.vue'),
+              path: 'finishedProductDeliveryReport',
+              name: 'finishedProductDeliveryReport',
+              component: () => import('../views/mm/stockReport/FinishedProductDeliveryReport.vue'),
+            },
+            {
+              path: 'finishedProductInventoryReport',
+              name: 'finishedProductInventoryReport',
+              component: () => import('../views/mm/stockReport/FinishedProductInventoryReport.vue'),
+            },
+            {
+              path: 'finishedProductOutboundReport',
+              name: 'finishedProductOutboundReport',
+              component: () => import('../views/mm/stockReport/FinishedProductOutboundReport.vue'),
+            },
+            {
+              path: 'finishedProductTransferReport',
+              name: 'finishedProductTransferReport',
+              component: () => import('../views/mm/stockReport/FinishedProductTransferReport.vue'),
+            },{
+              path: 'materialAdditionReport',
+              name: 'materialAdditionReport',
+              component: () => import('../views/mm/stockReport/MaterialAdditionReport.vue'),
+            },
+            {
+              path: 'materialOutboundReport',
+              name: 'materialOutboundReport',
+              component: () => import('../views/mm/stockReport/MaterialOutboundReport.vue'),
+            },
+            {
+              path: 'materialReturnReport',
+              name: 'materialReturnReport',
+              component: () => import('../views/mm/stockReport/MaterialReturnReport.vue'),
             }, {
               path: '',
-              redirect: '/main/stockReport/warehouseReport'
+              redirect: '/main/stockReport/finishedProductInventoryReport'
             }
           ]
         },

--
Gitblit v1.8.0