Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-03-25 768e16999a8ce4bb500490ee76c659aa61ea1783

 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',
@@ -335,6 +339,31 @@
              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: '',
@@ -729,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',
@@ -918,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'),
            },

            {
@@ -1193,6 +1234,11 @@
      path: '/register',
      name: 'register',
      component: () => import('../views/RegisterView.vue')
    },
    {
      path: '/app',
      name: 'app',
      component: () => import('../views/system/app/appDownload.vue')
    }
    
  ]