Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-03-07 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7

 north-glass-erp/northglass-erp/src/router/index.js

@@ -337,6 +337,11 @@
              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')
@@ -734,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',