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,6 +83,23 @@
            }
          ]
        },
        {
          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',
@@ -111,7 +128,34 @@
            }
          ]
        },

          //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模块
        {
@@ -128,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',
@@ -188,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',
@@ -320,6 +374,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',
@@ -477,6 +578,16 @@
              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'
            }
@@ -608,7 +719,7 @@
            }
          ]
        },
        {
        /*{
          //BOM管理
          path: 'BOM',
          name: 'BOM',
@@ -649,7 +760,7 @@
              redirect:'/main/BOM/SelectBOM'
            }
          ]
        },
        },*/
        {
          //设备管理
          path: 'machine',
@@ -661,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',
@@ -707,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'),
            },
            {
              //生产进度
@@ -761,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'),
            },
            {
              //次破报表
@@ -773,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'),
@@ -815,6 +952,11 @@
              path: 'addTeamGroup',
              name: 'addTeamGroup',
              component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
            },
            {
              path: '',
@@ -896,6 +1038,12 @@
              path: 'storageRecord',
              name: 'storageRecord',
              component:()=>import('../views/mm/productStock/StorageRecord.vue'),
            },
            {
              // 装箱打印
              path: 'storageRecordPint',
              name: 'storageRecordPint',
              component:()=>import('../views/mm/productStock/StorageRecordPint.vue'),
            },

            {
@@ -986,6 +1134,12 @@
              name:'returnToStorageCreate',
              component:()=>import('../views/mm/ingredientStock/ReturnToStorageCreate.vue')
            },
            //物料新增
            {
              path:'materialAdditionRecord',
              name:'materialAdditionRecord',
              component:()=>import('../views/mm/ingredientStock/MaterialAdditionRecord.vue')
            },
            {
              path: '',
              redirect:'/main/ingredientsStock/selectIngredientsStock'
@@ -1026,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'
            }
          ]
        },
@@ -1140,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'
@@ -1155,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'),
    }
    
  ]