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

廖井涛

8 天以前 ceb1dea2b24d5c3216816f42fd0e514613656416

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

@@ -83,7 +83,79 @@
            }
          ]
        },
        {
          path:'userLog',
          name: 'userLog',
          component: () => import('../views/system/userLog/UserLog.vue'),
          children:[
            {
              path: 'userListLog',
              name: 'userListLog',
              component: () => import('../views/system/userLog/UserListLog.vue'),
            },
            {
              name:'userLog',
              path: '',
              redirect:'/main/userLog/userListLog'
            }
          ]
        },

        {
          path:'glassPrice',
          name: 'glassPrice',
          component: () => import('../views/sd/glassPrice/GlassPrice.vue'),
          children:[
            {
              path: 'producePriceCompute',
              name: 'producePriceCompute',
              component: () => import('../views/sd/glassPrice/ProducePriceCompute.vue')
            },
            {
              path: 'glassPriceSet',
              name: 'glassPriceSet',
              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'
            }
          ]
        },
          //bom模块
        {
          path:'bom',
          name: 'bom',
          component: () => import('../views/sd/bom/BOM.vue'),
          children:[
            {
              path: 'materialBOM',
              name: 'materialBOM',
              component: () => import('../views/sd/bom/MaterialBOM.vue')
            },
            {
              path: 'productBOM',
              name: 'productBOM',
              component: () => import('../views/sd/bom/ProductBOM.vue')
            },
            {
              path: 'orderBOM',
              name: 'orderBOM',
              component: () => import('../views/sd/bom/OrderBOM.vue')
            },
            {
              name: 'bom1',
              path: '',
              redirect:'/main/bom/orderBOM'
            }
          ]
        },

          //sd模块
        {
@@ -100,6 +172,11 @@
              path: 'searchGlassType',
              name: 'searchGlassType',
              component: () => import('../views/sd/basicData/SearchGlassType.vue')
            },
            {
              path: 'searchProcessAttributeConfig',
              name: 'searchProcessAttributeConfig',
              component: () => import('../views/sd/basicData/SearchProcessAttributeConfig.vue')
            },
            {
              name: 'OrderBasicData',
@@ -160,6 +237,11 @@
              path: 'createOrder',
              name: 'createOrder',
              component: () => import('../views/sd/order/CreateOrder.vue'),
            },
            {
              path: 'createOrder2',
              name: 'createOrder2',
              component: () => import('../views/sd/order/CreateOrder2.vue'),
            },
            {
              path: 'updateOrderCraft',
@@ -293,6 +375,53 @@

          //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: '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/:quantity/:area/:optimizeState',
              name: 'optimizeInfo',
              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
            },
            {
              path: '',
              redirect:'/main/glassOptimize/optimizeProject'
            }
          ]
        },
        {
          //工单管理
          path: 'workOrder',
          name: 'workOrder',
@@ -321,7 +450,7 @@
            },
            {
              path: '',
              redirect:'/main/workOrder/SelectWorkOrder'
              redirect:'/main/workOrder/selectWorkOrder'
            }
          ]

@@ -444,8 +573,23 @@
              component: () => import('../components/pp/SelectSortTable.vue'),
            },
            {
              path: 'printProjectDetails',
              name: 'printProjectDetails',
              component: () => import('../views/pp/processCard/PrintProjectDetails.vue'),
            },
            {
              path: 'TagStyleDesigner',
              name: 'TagStyleDesigner',
              component: () => import('../components/pp/TagStyleDesigner.vue'),
            },
            {
              path: 'printProjectDetailSmallPiece',
              name: 'printProjectDetailSmallPiece',
              component: () => import('../views/pp/processCard/PrintProjectDetailSmallPiece.vue'),
            },
            {
              path: '',
              redirect:'/main/processCard/SelectProcessCard'
              redirect:'/main/processCard/selectProcessCard'
            }
          ]

@@ -485,7 +629,7 @@
            },
            {
              path: '',
              redirect:'/main/reportingWorks/AddReportingWork'
              redirect:'/main/reportingWorks/addReportingWork'
            }
          ]
        },
@@ -493,33 +637,33 @@
          //补片管理
          path: 'replenish',
          name: 'replenish',
          component: () => import('../views/pp/Replenish/Replenish.vue'),
          component: () => import('../views/pp/replenish/Replenish.vue'),
          children:[

            {
              path: 'addReplenish',
              name: 'addReplenish',
              component: () => import('../views/pp/Replenish/AddReplenish.vue'),
              component: () => import('../views/pp/replenish/AddReplenish.vue'),
            },
            {
              path: 'printReplenishFlowCard',
              name: 'printReplenishFlowCard',
              component: () => import('../views/pp/Replenish/PrintReplenishFlowCard.vue'),
              component: () => import('../views/pp/replenish/PrintReplenishFlowCard.vue'),
            },
            {
              path: 'selectReplenish',
              name: 'selectReplenish',
              component: () => import('../views/pp/Replenish/SelectReplenish.vue'),
              component: () => import('../views/pp/replenish/SelectReplenish.vue'),
            },
            {
              path: 'printRepairProcess',
              name: 'printRepairProcess',
              component: () => import('../views/pp/Replenish/PrintRepairProcess.vue'),
              component: () => import('../views/pp/replenish/PrintRepairProcess.vue'),
            },
            {
              path: 'printReplenishFlowCard',
              name: 'printReplenishFlowCard',
              component: () => import('../views/pp/Replenish/PrintReplenishFlowCard.vue'),
              component: () => import('../views/pp/replenish/PrintReplenishFlowCard.vue'),
            },
            {
              path: 'printRepairCustomLabelSemi',
@@ -533,7 +677,7 @@
            },
            {
              path: '',
              redirect:'/main/Replenish/SelectReplenish'
              redirect:'/main/replenish/selectReplenish'
            }
          ]
        },
@@ -571,11 +715,11 @@
            },
            {
              path: '',
              redirect:'/main/Rework/SelectRework'
              redirect:'/main/rework/selectRework'
            }
          ]
        },
        {
        /*{
          //BOM管理
          path: 'BOM',
          name: 'BOM',
@@ -616,7 +760,7 @@
              redirect:'/main/BOM/SelectBOM'
            }
          ]
        },
        },*/
        {
          //设备管理
          path: 'machine',
@@ -628,11 +772,7 @@
              name: 'selectMachine',
              component: () => import('../views/pp/machine/SelectMachine.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/machine/AddMachine.vue'),
            },

            {
              path: 'maintenanceAndRepair',
              name: 'maintenanceAndRepair',
@@ -645,7 +785,7 @@
            },
            {
              path: '',
              redirect:'/main/machine/SelectMachine'
              redirect:'/main/machine/selectMachine'
            }
          ]
        },
@@ -674,10 +814,22 @@
              component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
            },
            {
              //订单报工
              path: 'orderReportingWorks',
              name: 'orderReportingWorks',
              component: () => import('../views/pp/report/OrderReportingWorks.vue'),
            },
            {
              //工序待完成
              path: 'processToBeCompleted',
              name: 'processToBeCompleted',
              component: () => import('../views/pp/report/ProcessToBeCompleted.vue'),
            },
            {
              //工序待完成汇总
              path: 'processCompletedSummarize',
              name: 'processCompletedSummarize',
              component: () => import('../views/pp/report/ProcessCompletedSummarize.vue'),
            },
            {
              //生产进度
@@ -728,10 +880,22 @@
              component: () => import('../views/pp/report/WorkInProgress.vue'),
            },
            {
              //在制品汇总报表
              path: 'workInProgressCombination',
              name: 'workInProgressCombination',
              component: () => import('../views/pp/report/WorkInProgressCombination.vue'),
            },
            {
              //成品率报表
              path: 'yield',
              name: 'yield',
              component: () => import('../views/pp/report/Yield.vue'),
            },
            {
              //成品率报表
              path: 'yieldProcess',
              name: 'yieldProcess',
              component: () => import('../views/pp/report/yieldProcess.vue'),
            },
            {
              //次破报表
@@ -740,13 +904,19 @@
              component: () => import('../views/pp/report/DamageReport.vue'),
            },
            {
              //非跨工序次破报表
              path: 'notCrossProcessBreaking',
              name: 'notCrossProcessBreaking',
              component: () => import('../views/pp/report/NotCrossProcessBreaking.vue'),
            },
            {
              //订单排产计划
              path: 'scheduleProductionSchedule',
              name: 'scheduleProductionSchedule',
              component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
            },
            {
              //排产计划
              //跨工序次破
              path: 'crossProcessBreaking',
              name: 'crossProcessBreaking',
              component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -784,8 +954,13 @@
              component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
            },
            {
              path: '',
              redirect:'/main/productionBasicData/SelectProductionBasicData'
              redirect:'/main/productionBasicData/selectProductionBasicData'
            }
          ]
        },
@@ -796,78 +971,84 @@
        {
          path: 'productStock',
          name: 'productStock',
          component: () => import('../views/mm/mainProductStock/ProductStock.vue'),
          component: () => import('../views/mm/productStock/ProductStock.vue'),
          children:[
            {
              // 成品库存
              path: 'productStockList',
              name: 'productStockList',
              component: () => import('../views/mm/mainProductStock/ProductStockList.vue'),
              component: () => import('../views/mm/productStock/ProductStockList.vue'),
            },
            {
              // 成品入库
              path: 'createProductStock',
              name: 'createProductStock',
              component:()=>   import('../views/mm/mainProductStock/CreateProductStock.vue'),
              component:()=>   import('../views/mm/productStock/CreateProductStock.vue'),
            },
            {
              // 成品出库
              path: 'finishedProductOut',
              name: 'finishedProductOut',
              component:()=>import('../views/mm/mainProductStock/FinishedProductOut.vue')
              component:()=>import('../views/mm/productStock/FinishedProductOut.vue')
            },
            {
              // 成品出库
              path: 'finishedProductReturn',
              name: 'finishedProductReturn',
              component:()=>import('../views/mm/mainProductStock/FinishedProductReturn.vue')
              component:()=>import('../views/mm/productStock/FinishedProductReturn.vue')
            },
            {
              // 订单调拨
              path: 'orderAllocation',
              name: 'orderAllocation',
              component:()=>import('../views/mm/mainProductStock/OrderAllocation.vue'),
              component:()=>import('../views/mm/productStock/OrderAllocation.vue'),
            },
            {
              // 成品领出
              path: 'finishedGoodsIssue',
              name: 'finishedGoodsIssue',
              component:()=>import('../views/mm/mainProductStock/FinishedGoodsIssue.vue'),
              component:()=>import('../views/mm/productStock/FinishedGoodsIssue.vue'),
            },
            {
              // 成品返工
              path: 'finishedProductRework',
              name: 'finishedProductRework',
              component:()=>import('../views/mm/mainProductStock/FinishedProductRework.vue'),
              component:()=>import('../views/mm/productStock/FinishedProductRework.vue'),
            },
            {
              // 调拨记录
              path: 'transferRecord',
              name: 'transferRecord',
              component:()=>import('../views/mm/mainProductStock/TransferRecord.vue'),
              component:()=>import('../views/mm/productStock/TransferRecord.vue'),
            },
            {
              // 领出记录
              path: 'takeOutRecord',
              name: 'takeOutRecord',
              component:()=>import('../views/mm/mainProductStock/TakeOutRecord.vue'),
              component:()=>import('../views/mm/productStock/TakeOutRecord.vue'),
            },
            {
              // 返工记录
              path: 'reworkRecord',
              name: 'reworkRecord',
              component:()=>import('../views/mm/mainProductStock/ReworkRecord.vue'),
              component:()=>import('../views/mm/productStock/ReworkRecord.vue'),
            },
            {
              // 出入库记录
              path: 'storageRecord',
              name: 'storageRecord',
              component:()=>import('../views/mm/mainProductStock/StorageRecord.vue'),
              component:()=>import('../views/mm/productStock/StorageRecord.vue'),
            },
            {
              // 装箱打印
              path: 'storageRecordPint',
              name: 'storageRecordPint',
              component:()=>import('../views/mm/productStock/StorageRecordPint.vue'),
            },

            {
              path: '',
              redirect:'/main/productStock/ProductStockList'
              redirect:'/main/productStock/productStockList'
            }
          ]
        },
@@ -880,21 +1061,21 @@
          // 物料资料
          path:'ingredients',
          name:'ingredients',
          component: () => import('../views/mm/mainIngredient/Ingredients.vue'),
          component: () => import('../views/mm/ingredient/Ingredients.vue'),
          children:[
            {
              path: 'selectIngredients',
              name: 'selectIngredients',
              component:()=>import('../views/mm/mainIngredient/SelectIngredients.vue')
              component:()=>import('../views/mm/ingredient/SelectIngredients.vue')
            },
            {
              path: 'createIngredients',
              name: 'createIngredients',
              component:()=>import('../views/mm/mainIngredient/CreateIngredients.vue')
              component:()=>import('../views/mm/ingredient/CreateIngredients.vue')
            },
            {
              path: '',
              redirect:'/main/ingredients/SelectIngredients'
              redirect:'/main/ingredients/selectIngredients'
            }
          ]
        },
@@ -906,56 +1087,62 @@
          // 物料库存
          path:'ingredientsStock',
          name:'ingredientsStock',
          component: () => import('../views/mm/mainIngredientStock/IngredientsStock.vue'),
          component: () => import('../views/mm/ingredientStock/IngredientsStock.vue'),
          children:[
            {
              path: 'selectIngredientsStock',
              name: 'selectIngredientsStock',
              component:()=>import('../views/mm/mainIngredientStock/SelectIngredientsStock.vue')
              component:()=>import('../views/mm/ingredientStock/SelectIngredientsStock.vue')
            },
            {
              path: 'selectSurplusMaterials',
              name: 'selectSurplusMaterials',
              component:()=>import('../views/mm/mainIngredientStock/SelectSurplusMaterials.vue')
              component:()=>import('../views/mm/ingredientStock/SelectSurplusMaterials.vue')
            },
            {
              path: 'accessoriesMonthlySettlement',
              name: 'accessoriesMonthlySettlement',
              component:()=>import('../views/mm/mainIngredientStock/AccessoriesMonthlySettlement.vue')
              component:()=>import('../views/mm/ingredientStock/AccessoriesMonthlySettlement.vue')
            },
            {
              path: 'originalMonthlySettlement',
              name: 'originalMonthlySettlement',
              component:()=>import('../views/mm/mainIngredientStock/OriginalMonthlySettlement.vue')
              component:()=>import('../views/mm/ingredientStock/OriginalMonthlySettlement.vue')
            },
            //   物料出库
            {
              path: 'materialOutbound',
              name: 'materialOutbound',
              component:()=>import('../views/mm/mainIngredientStock/MaterialOutbound.vue')
              component:()=>import('../views/mm/ingredientStock/MaterialOutbound.vue')
            },
              //出库新增
            {
              path:'createOutBound',
              name:'createOutBound',
              component:()=>import('../views/mm/mainIngredientStock/CreateOutBound.vue')
              component:()=>import('../views/mm/ingredientStock/CreateOutBound.vue')
            },
            //返库
            {
              path:'returnToStorage',
              name:'returnToStorage',
              component:()=>import('../views/mm/mainIngredientStock/ReturnToStorage.vue')
              component:()=>import('../views/mm/ingredientStock/ReturnToStorage.vue')
            },

            //返库新增
            {
              path:'returnToStorageCreate',
              name:'returnToStorageCreate',
              component:()=>import('../views/mm/mainIngredientStock/ReturnToStorageCreate.vue')
              component:()=>import('../views/mm/ingredientStock/ReturnToStorageCreate.vue')
            },
            //物料新增
            {
              path:'materialAdditionRecord',
              name:'materialAdditionRecord',
              component:()=>import('../views/mm/ingredientStock/MaterialAdditionRecord.vue')
            },
            {
              path: '',
              redirect:'/main/ingredientsStock/SelectIngredientsStock'
              redirect:'/main/ingredientsStock/selectIngredientsStock'
            }
          ]
        },
@@ -968,17 +1155,17 @@
          // 供应商管理！！！
          path:'trader',
          name:'trader',
          component: () => import('../views/mm/mainTrader/Trader.vue'),
          component: () => import('../views/mm/trader/Trader.vue'),
          children:[
            {
              path: 'selectTrader',
              name: 'selectTrader',
              component:()=>import('../views/mm/mainTrader/SelectTrader.vue')
              component:()=>import('../views/mm/trader/SelectTrader.vue')
            },
            {
              path: 'createTrader',
              name: 'createTrader',
              component:()=>import('../views/mm/mainTrader/CreateTrader.vue')
              component:()=>import('../views/mm/trader/CreateTrader.vue')
            },
            {
              path: '',
@@ -993,27 +1180,57 @@
          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: 'optimizeOutboundReport',
              name: 'optimizeOutboundReport',
              component: () => import('../views/mm/stockReport/OptimizeOutboundReport.vue'),
            },
            {
              path: 'materialReturnReport',
              name: 'materialReturnReport',
              component: () => import('../views/mm/stockReport/MaterialReturnReport.vue'),
            },{
              path: 'finishedGlassShelfEmitReport',
              name: 'finishedGlassShelfEmitReport',
              component: () => import('../views/mm/stockReport/FinishedGlassShelfEmitReport.vue'),
            },
            {
              path: 'finishedGlassShelfWithdrawReport',
              name: 'finishedGlassShelfWithdrawReport',
              component: () => import('../views/mm/stockReport/FinishedGlassShelfWithdrawReport.vue'),
            }, {
              path: '',
              redirect: '/main/stockReport/WarehouseReport'
              redirect: '/main/stockReport/finishedProductInventoryReport'
            }
          ]
        },
@@ -1107,11 +1324,113 @@
              component: () => import('../views/mm/basicData/WarehouseCreateBasicData.vue'),
            },
            {
              path: 'canvas',
              name: 'canvas',
              component: () => import('../views/mm/basicData/canvas.vue'),
            },
            {
              path: '',
              redirect: '/main/warehouseBasicData/warehouseSearchBasicData'
            }
          ]
        },

        {
          path: 'finishedGlassShelf',
          name: 'finishedGlassShelf',
          component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelf.vue'),
          children:[
            {
              // 料架库存
              path: 'finishedGlassShelfInformation',
              name: 'finishedGlassShelfInformation',
              component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue'),
            },
            {
              // 料架库存
              path: 'createFinishedGlassShelf',
              name: 'createFinishedGlassShelf',
              component: () => import('../views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue'),
            },
            {
              // 料架出库查询
              path: 'finishedGlassShelfEmit',
              name: 'finishedGlassShelfEmit',
              component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue'),
            },
            {
              // 料架出库明细查询
              path: 'createFinishedGlassShelfEmit',
              name: 'createFinishedGlassShelfEmit',
              component: () => import('../views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue'),
            },
            {
              // 料架入库查询
              path: 'finishedGlassShelfWithdraw',
              name: 'finishedGlassShelfWithdraw',
              component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue'),
            },
            {
              // 料架入库明细查询
              path: 'createFinishedGlassShelfWithdraw',
              name: 'createFinishedGlassShelfWithdraw',
              component: () => import('../views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue'),
            },


            {
              path: '',
              redirect:'/main/finishedGlassShelf/finishedGlassShelfInformation'
            }
          ]
        },
        /*{
          //第三方玻璃优化
          path: 'glassOptimizeThirdParty',
          name: 'glassOptimizeThirdParty',
          component: () => import('../views/pp/glassOptimizeThirdParty/Optimize.vue'),
          children:[
            {
              path: 'optimizeProject1',
              name: 'optimizeProject1',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeProject.vue'),
            },
            {
              path: 'optimizePrint',
              name: 'optimizePrint',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizePrint.vue'),
            },
            {
              path: 'OptimizationRectPrint',
              name: 'OptimizationRectPrint',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizationRectPrint.vue'),
            },
            {
              path: 'OptimizeControl',
              name: 'OptimizeControl',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeControl.vue'),
            },
            {
              path: 'Optimization',
              name: 'Optimization',
              component: () => import('../views/pp/glassOptimizeThirdParty/Optimization.vue'),
            },
            {
              path: 'optimizeparms',
              name: 'optimizeparms',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeParms.vue'),
            },
            {
              path: '/optimizeProject/:projectNo/:thickNess/:model',
              name: 'optimizeInfo',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeProject.vue')
            },
            {
              path: '',
              redirect:'/main/glassOptimizeThirdParty/optimizeProject1'
            }
          ]
        },*/
        {
          path: '',
          redirect:'/main/order'
@@ -1122,6 +1441,16 @@
      path: '/register',
      name: 'register',
      component: () => import('../views/RegisterView.vue')
    },
    {
      path: '/app',
      name: 'app',
      component: () => import('../views/system/app/appDownload.vue')
    },
    {
      path: '/productionScheduleCollect',
      name: 'productionScheduleCollect',
      component: () => import('../views/pp/report/WorkInProgressCombination.vue'),
    }
    
  ]