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

廖井涛

2025-03-25 768e16999a8ce4bb500490ee76c659aa61ea1783

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

@@ -1,8 +1,9 @@
import { createRouter, createWebHistory } from 'vue-router'
import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router'
import HomeView from '../views/HomeView.vue'

const router = createRouter({
  history: createWebHistory(import.meta.env.BASE_URL),
  history: createWebHashHistory(),
  //history: createWebHistory(import.meta.env.BASE_URL),
  routes: [
    {
      path: '/',
@@ -20,7 +21,125 @@
      name: 'main',
      component: () => import('../layout/MainErpView.vue'),
      children:[
          //user模块
        {
          path:'user',
          name: 'user',
          component: () => import('../views/system/user/User.vue'),
          children:[
            {
              path: 'notPermission',
              name: 'notPermission',
              component: () => import('../views/system/user/NotPermission.vue'),
            },
            {
              path: 'userList',
              name: 'userList',
              component: () => import('../views/system/user/UserList.vue')
            },
            {
              name:'user',
              path: '',
              redirect:'/main/user/userList'
            }
          ]
        },
        {
          path:'role',
          name: 'role',
          component: () => import('../views/system/role/Role.vue'),
          children:[
            {
              path: 'roleList',
              name: 'roleList',
              component: () => import('../views/system/role/RoleList.vue')
            },
            {
              name:'role',
              path: '',
              redirect:'/main/role/roleList'
            }
          ]
        },
{
          path: '/main/glassOptimize/MoveManage',
          component: () => import('@/views/pp/glassOptimize/MoveManage.vue')
        },
        {
          path:'userPassWord',
          name: 'userPassWord',
          component: () => import('../views/system/userPassWord/userPassWord.vue'),
          children:[
            {
              path: 'updateUserPassWord',
              name: 'updateUserPassWord',
              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模块
        {
          path:'orderBasicData',
          name: 'orderBasicData',
          component: () => import('../views/sd/basicData/BasicData.vue'),
          children:[
            {
              path: 'searchBasicData',
              name: 'searchBasicData',
              component: () => import('../views/sd/basicData/SearchBasicData.vue')
            },
            {
              path: 'searchGlassType',
              name: 'searchGlassType',
              component: () => import('../views/sd/basicData/SearchGlassType.vue')
            },
            {
              name: 'OrderBasicData',
              path: '',
              redirect:'/main/orderBasicData/searchBasicData'
            }
          ]
        },
        {
          path: 'product',//产品
          name: 'product',
@@ -47,6 +166,12 @@
              component: () => import('../views/sd/product/Test11.vue')
            },
            {
              path: 'testSort',
              name: 'testSort',
              component: () => import('../views/sd/product/testSort.vue')
            },
            {
              name: 'product',
              path: '',
              redirect:'/main/product/selectProduct'
            }
@@ -57,6 +182,7 @@
          name: 'order',
          component: () => import('../views/sd/order/Order.vue'),
          children:[

            {
              path: 'selectOrder',
              name: 'selectOrder',
@@ -73,13 +199,23 @@
              component: () => import('../views/sd/order/UpdateOrderCraft.vue'),
            },
            {
              path: 'orderSummaryReport',
              name: 'orderSummaryReport',
              component: () => import('../views/sd/order/OrderSummaryReport.vue'),
            },
            {
              path: 'orderReport',
              name: 'orderReport',
              component: () => import('../views/sd/order/OrderReport.vue'),
            },
            {
              path: 'orderProductSummaryReport',
              name: 'orderProductSummaryReport',
              component: () => import('../views/sd/order/OrderProductSummaryReport.vue'),
            },
            {
              path: '',
              redirect:'/main/order/SelectOrder'
              redirect:'/main/order/selectOrder'
            }
          ]
        },
@@ -104,9 +240,19 @@
              component: () => import('../views/sd/delivery/DeliveryReport.vue'),
            },
            {
              path: 'deliveryProductReport',
              name: 'deliveryProductReport',
              component: () => import('../views/sd/delivery/DeliveryProductReport.vue'),
            },
            {
              path: 'createDelivery',
              name: 'createDelivery',
              component: () => import('../views/sd/delivery/CreateDelivery.vue'),
            },
            {
              path: 'deliveryPrinting',
              name: 'deliveryPrinting',
              component: () => import('../views/sd/delivery/DeliveryPrinting.vue'),
            },


@@ -168,11 +314,63 @@
              path: 'createCustomer',
              name: 'createCustomer',
              component: () => import('../views/sd/customer/CreateCustomer.vue'),
            },
            {
              path: 'selectCustomerOrder',
              name: 'selectCustomerOrder',
              component: () => import('../views/sd/customer/SelectCustomerOrder.vue'),
            }
          ]
        },

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

@@ -252,16 +450,86 @@
            {
              path: 'printProcess',
              name: 'printProcess',
              component: () => import('../views/pp/processCard/PrintProcess.vue'),
              component: () => import('../components/pp/PrintProcess.vue'),
            },
            {
              path: 'reShelving',
              name: 'reShelving',
              component: () => import('../views/pp/processCard/ReShelving.vue'),
              path: 'printLabel',
              name: 'printLabel',
              component: () => import('../views/pp/processCard/PrintLabel.vue'),
            },
            {
              path: 'printCustomLabel',
              name: 'printCustomLabel',
              component: () => import('../components/pp/PrintCustomLabel.vue'),
            },
            {
              path: 'printCustomLabelSemi',
              name: 'printCustomLabelSemi',
              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',
              name: 'printCustomLabelSemi2',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi2.vue'),
            },
            {
              path: 'printLabel1',
              name: 'printLabel1',
              component: () => import('../views/pp/processCard/PrintLabel1.vue'),
            },
            {
              path: 'productionScheduling',
              name: 'productionScheduling',
              component: () => import('../views/pp/processCard/ProductionScheduling.vue'),
            },
            {
              path: 'selectDetailProcessCard',
              name: 'selectDetailProcessCard',
              component: () => import('../views/pp/processCard/SelectDetailProcessCard.vue'),
            },
            {
              path: 'selectPrintProject',
              name: 'selectPrintProject',
              component: () => import('../views/pp/processCard/SelectPrintProject.vue'),
            },
            {
              path: 'selectSortDetailProcessCard',
              name: 'selectSortDetailProcessCard',
              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'
            }
          ]

@@ -273,15 +541,16 @@
          component: () => import('../views/pp/reportingWorks/ReportingWorks.vue'),
          children:[

            {
              path: 'selectReportingWorks',
              name: 'selectReportingWorks',
              component: () => import('../views/pp/reportingWorks/SelectReportingWorks.vue'),
            },

            {
              path: 'addReportingWork',
              name: 'addReportingWork',
              component: () => import('../views/pp/reportingWorks/AddReportingWork.vue'),
            },
            {
              path: 'selectReportingWorks',
              name: 'selectReportingWorks',
              component: () => import('../views/pp/reportingWorks/SelectReportingWorks.vue'),
            },
            {
              path: 'qualityInspectionReview',
@@ -300,7 +569,7 @@
            },
            {
              path: '',
              redirect:'/main/reportingWorks/SelectReportingWorks'
              redirect:'/main/reportingWorks/addReportingWork'
            }
          ]
        },
@@ -308,27 +577,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'),
            },
            {
              path: 'printReplenishFlowCard',
              name: 'printReplenishFlowCard',
              component: () => import('../views/pp/replenish/PrintReplenishFlowCard.vue'),
            },
            {
              path: 'printRepairCustomLabelSemi',
              name: 'printRepairCustomLabelSemi',
              component: () => import('../components/pp/PrintRepairCustomLabelSemi.vue'),
            },
            {
              path: 'printRepairCustomLabel',
              name: 'printRepairCustomLabel',
              component: () => import('../components/pp/PrintRepairCustomLabel.vue'),
            },
            {
              path: '',
              redirect:'/main/Replenish/SelectReplenish'
              redirect:'/main/replenish/selectReplenish'
            }
          ]
        },
@@ -336,22 +625,37 @@
          //返工管理
          path: 'rework',
          name: 'rework',
          component: () => import('../views/pp/Rework/Rework.vue'),
          component: () => import('../views/pp/rework/Rework.vue'),
          children:[

            {
              path: 'addRework',
              name: 'addRework',
              component: () => import('../views/pp/Rework/AddRework.vue'),
              component: () => import('../views/pp/rework/AddRework.vue'),
            },
            {
              path: 'selectRework',
              name: 'selectRework',
              component: () => import('../views/pp/Rework/SelectRework.vue'),
              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'
            }
          ]
        },
@@ -425,7 +729,7 @@
            },
            {
              path: '',
              redirect:'/main/machine/SelectMachine'
              redirect:'/main/machine/selectMachine'
            }
          ]
        },
@@ -454,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',
@@ -464,6 +774,12 @@
              path: 'productionSchedule',
              name: 'productionSchedule',
              component: () => import('../views/pp/report/ProductionSchedule.vue'),
            },
            {
              //流程卡进度
              path: 'processCardProgress',
              name: 'processCardProgress',
              component: () => import('../views/pp/report/ProcessCardProgress.vue'),
            },
            {
              //品质报表
@@ -513,13 +829,56 @@
              name: 'damageReport',
              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'),
            },
            // {
            //   path: '',
            //   redirect:'/main/report/ProductionSchedule'
            // }
          ]
        },

        {
          //基础数据管理
          path: 'productionBasicData',
          name: 'productionBasicData',
          component: () => import('../views/pp/productionBasicData/ProductionBasicData.vue'),
          children:[
            {
              path: 'selectProductionBasicData',
              name: 'selectProductionBasicData',
              component: () => import('../views/pp/productionBasicData/SelectProductionBasicData.vue'),
            },
            {
              path: 'addBreakageReason',
              name: 'addBreakageReason',
              component: () => import('../views/pp/productionBasicData/AddBreakageReason.vue'),
            },
            {
              path: 'addBreakageType',
              name: 'addBreakageType',
              component: () => import('../views/pp/productionBasicData/AddBreakageType.vue'),
            },
            {
              path: 'addTeamGroup',
              name: 'addTeamGroup',
              component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
            },
            {
              path: '',
              redirect:'/main/productionBasicData/selectProductionBasicData'
            }
          ]
        },



@@ -527,125 +886,195 @@
        {
          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/productStock/TransferRecord.vue'),
            },
            {
              // 领出记录
              path: 'takeOutRecord',
              name: 'takeOutRecord',
              component:()=>import('../views/mm/productStock/TakeOutRecord.vue'),
            },
            {
              // 返工记录
              path: 'reworkRecord',
              name: 'reworkRecord',
              component:()=>import('../views/mm/productStock/ReworkRecord.vue'),
            },
            {
              // 出入库记录
              path: 'storageRecord',
              name: 'storageRecord',
              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'
            }
          ]
        },





        {
          // 物料资料
          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'
            }
          ]
        },




        {
          // 物料库存
          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/ingredientStock/MaterialOutbound.vue')
            },
              //出库新增
            {
              path:'createOutBound',
              name:'createOutBound',
              component:()=>import('../views/mm/ingredientStock/CreateOutBound.vue')
            },
            //返库
            {
              path:'returnToStorage',
              name:'returnToStorage',
              component:()=>import('../views/mm/ingredientStock/ReturnToStorage.vue')
            },

            //返库新增
            {
              path:'returnToStorageCreate',
              name:'returnToStorageCreate',
              component:()=>import('../views/mm/ingredientStock/ReturnToStorageCreate.vue')
            },
            {
              path: '',
              redirect:'/main/ingredientsStock/SelectIngredientsStock'
              redirect:'/main/ingredientsStock/selectIngredientsStock'
            }
          ]
        },





        {
          // 供应商管理！！！
          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: '',
@@ -653,27 +1082,50 @@
            }
          ]
        },
        /*------------- sunshiqiang Add --*/
        {
          /*----------- 仓储报表 ----------------*/
          path: 'stockReport',
          name: 'stockReport',
          component: () => import('../views/mm/stockReport/stockReport.vue'),
          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: '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'
            }
          ]
        },
@@ -691,8 +1143,26 @@
              path: 'CreatePurchaseOrder',
              name: 'CreatePurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Create.vue')
            }
            , {
            },
            /*----------- 新增 ----------------*/
            {
              path: 'PaymentPurchaseOrder',
              name: 'PaymentPurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Payment.vue')
            },
            /*----------- 退货 ----------------*/
            {
              path: 'ReturnPurchaseOrder',
              name: 'ReturnPurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Return.vue')
            },
            /*----------- 入库 ----------------*/
            {
              path: 'StoragePurchaseOrder',
              name: 'StoragePurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Storage.vue')
            },
            {
              path: '',
              redirect: '/main/purchaseOrder/SelectPurchaseOrder'
            }
@@ -733,8 +1203,30 @@
          ]
        },
        {
          /*----------- 基础数据 ----------------*/
          path: 'warehouseBasicData',
          name: 'warehouseBasicData',
          component: () => import('../views/mm/basicData/WarehouseBasicData.vue'),
          children: [
            {
              path: 'warehouseSearchBasicData',
              name: 'warehouseSearchBasicData',
              component: () => import('../views/mm/basicData/WarehouseSearchBasicData.vue'),
            },
            {
              path: 'warehouseCreateBasicData',
              name: 'warehouseCreateBasicData',
              component: () => import('../views/mm/basicData/WarehouseCreateBasicData.vue'),
            },
            {
              path: '',
              redirect: '/main/warehouseBasicData/warehouseSearchBasicData'
            }
          ]
        },
        {
          path: '',
          redirect:'/main/Product'
          redirect:'/main/order'
        }
      ]
    },
@@ -742,6 +1234,11 @@
      path: '/register',
      name: 'register',
      component: () => import('../views/RegisterView.vue')
    },
    {
      path: '/app',
      name: 'app',
      component: () => import('../views/system/app/appDownload.vue')
    }
    
  ]