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

@@ -72,12 +72,46 @@
              component: () => import('../views/system/userPassWord/UpdateUserPassWord.vue')
            },
            {
              path: 'updateUserName',
              name: 'updateUserName',
              component: () => import('../views/system/userPassWord/UpdateUserName.vue')
            },
            {
              name:'userPassWord',
              path: '',
              redirect:'/main/userPassWord/updateUserPassWord'
            }
          ]
        },

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


          //sd模块
        {
@@ -159,6 +193,11 @@
              path: 'updateOrderCraft',
              name: 'updateOrderCraft',
              component: () => import('../views/sd/order/UpdateOrderCraft.vue'),
            },
            {
              path: 'orderSummaryReport',
              name: 'orderSummaryReport',
              component: () => import('../views/sd/order/OrderSummaryReport.vue'),
            },
            {
              path: 'orderReport',
@@ -282,6 +321,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',
          name: 'workOrder',
@@ -310,7 +381,7 @@
            },
            {
              path: '',
              redirect:'/main/workOrder/SelectWorkOrder'
              redirect:'/main/workOrder/selectWorkOrder'
            }
          ]

@@ -360,7 +431,7 @@
            {
              path: 'printProcess',
              name: 'printProcess',
              component: () => import('../views/pp/processCard/PrintProcess.vue'),
              component: () => import('../components/pp/PrintProcess.vue'),
            },
            {
              path: 'printLabel',
@@ -370,12 +441,22 @@
            {
              path: 'printCustomLabel',
              name: 'printCustomLabel',
              component: () => import('../views/pp/processCard/PrintCustomLabel.vue'),
              component: () => import('../components/pp/PrintCustomLabel.vue'),
            },
            {
              path: 'printCustomLabelSemi',
              name: 'printCustomLabelSemi',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi.vue'),
              component: () => import('../components/pp/PrintCustomLabelSemi.vue'),
            },
            {
              path: 'printCustomLabelCZ',
              name: 'printCustomLabelCZ',
              component: () => import('../views/pp/processCard/PrintCustomLabel1.vue'),
            },
            {
              path: 'printCustomLabelSemiCZ',
              name: 'printCustomLabelSemiCZ',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi1.vue'),
            },
            {
              path: 'printCustomLabelSemi2',
@@ -408,8 +489,28 @@
              component: () => import('../components/pp/SelectSortDetailProcessCard.vue'),
            },
            {
              path: 'printFlowCardDetails',
              name: 'printFlowCardDetails',
              component: () => import('../views/pp/processCard/PrintFlowCardDetails.vue'),
            },
            {
              path: 'printCustomLabelDetails',
              name: 'printCustomLabelDetails',
              component: () => import('../components/pp/PrintCustomLabelDetails.vue'),
            },
            {
              path: 'selectSortTable',
              name: 'selectSortTable',
              component: () => import('../components/pp/SelectSortTable.vue'),
            },
            {
              path: 'printProjectDetails',
              name: 'printProjectDetails',
              component: () => import('../views/pp/processCard/PrintProjectDetails.vue'),
            },
            {
              path: '',
              redirect:'/main/processCard/SelectProcessCard'
              redirect:'/main/processCard/selectProcessCard'
            }
          ]

@@ -449,7 +550,7 @@
            },
            {
              path: '',
              redirect:'/main/reportingWorks/AddReportingWork'
              redirect:'/main/reportingWorks/addReportingWork'
            }
          ]
        },
@@ -457,47 +558,47 @@
          //补片管理
          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',
              name: 'printRepairCustomLabelSemi',
              component: () => import('../views/pp/Replenish/PrintRepairCustomLabelSemi.vue'),
              component: () => import('../components/pp/PrintRepairCustomLabelSemi.vue'),
            },
            {
              path: 'printRepairCustomLabel',
              name: 'printRepairCustomLabel',
              component: () => import('../views/pp/Replenish/PrintRepairCustomLabel.vue'),
              component: () => import('../components/pp/PrintRepairCustomLabel.vue'),
            },
            {
              path: '',
              redirect:'/main/Replenish/SelectReplenish'
              redirect:'/main/replenish/selectReplenish'
            }
          ]
        },
@@ -519,8 +620,23 @@
              component: () => import('../views/pp/rework/SelectRework.vue'),
            },
            {
              path: 'printReworkFlowCard',
              name: 'printReworkFlowCard',
              component: () => import('../views/pp/rework/PrintReworkFlowCard.vue'),
            },
            {
              path: 'printReworkCustomLabelSemi',
              name: 'printReworkCustomLabelSemi',
              component: () => import('../views/pp/rework/PrintReworkCustomLabelSemi.vue'),
            },
            {
              path: 'printReworkCustomLabel',
              name: 'printReworkCustomLabel',
              component: () => import('../views/pp/rework/PrintReworkCustomLabel.vue'),
            },
            {
              path: '',
              redirect:'/main/Rework/SelectRework'
              redirect:'/main/rework/selectRework'
            }
          ]
        },
@@ -594,7 +710,7 @@
            },
            {
              path: '',
              redirect:'/main/machine/SelectMachine'
              redirect:'/main/machine/selectMachine'
            }
          ]
        },
@@ -621,6 +737,12 @@
              path: 'orderPlanDecomposition',
              name: 'orderPlanDecomposition',
              component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
            },
            {
              //订单报工
              path: 'orderReportingWorks',
              name: 'orderReportingWorks',
              component: () => import('../views/pp/report/OrderReportingWorks.vue'),
            },
            {
              //工序待完成
@@ -689,7 +811,13 @@
              component: () => import('../views/pp/report/DamageReport.vue'),
            },
            {
              //跨工序次破报表
              //订单排产计划
              path: 'scheduleProductionSchedule',
              name: 'scheduleProductionSchedule',
              component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
            },
            {
              //排产计划
              path: 'crossProcessBreaking',
              name: 'crossProcessBreaking',
              component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -728,7 +856,7 @@
            },
            {
              path: '',
              redirect:'/main/productionBasicData/SelectProductionBasicData'
              redirect:'/main/productionBasicData/selectProductionBasicData'
            }
          ]
        },
@@ -739,78 +867,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'
            }
          ]
        },
@@ -823,21 +957,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'
            }
          ]
        },
@@ -849,52 +983,56 @@
          // 物料库存
          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/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: '',
              redirect:'/main/ingredientsStock/SelectIngredientsStock'
              redirect:'/main/ingredientsStock/selectIngredientsStock'
            }
          ]
        },
@@ -907,17 +1045,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: '',
@@ -932,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'
            }
          ]
        },