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

@@ -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'
            }
          ]
        },