Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-18 c3e3920e4e7fcda3dd986c00bb80188381e93015

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

@@ -23,6 +23,23 @@
      children:[
          //sd模块
        {
          path:'orderBasicData',
          name: 'orderBasicData',
          component: () => import('../views/sd/basicData/BasicData.vue'),
          children:[
            {
              path: 'searchBasicData',
              name: 'searchBasicData',
              component: () => import('../views/sd/basicData/SearchBasicData.vue')
            },
            {
              name: 'OrderBasicData',
              path: '',
              redirect:'/main/orderBasicData/searchBasicData'
            }
          ]
        },
        {
          path: 'product',//产品
          name: 'product',
          component: () => import('../views/sd/product/Product.vue'),
@@ -115,6 +132,11 @@
              name: 'createDelivery',
              component: () => import('../views/sd/delivery/CreateDelivery.vue'),
            },
            {
              path: 'deliveryPrinting',
              name: 'deliveryPrinting',
              component: () => import('../views/sd/delivery/DeliveryPrinting.vue'),
            },


            {
@@ -175,6 +197,11 @@
              path: 'createCustomer',
              name: 'createCustomer',
              component: () => import('../views/sd/customer/CreateCustomer.vue'),
            },
            {
              path: 'selectCustomerOrder',
              name: 'selectCustomerOrder',
              component: () => import('../views/sd/customer/SelectCustomerOrder.vue'),
            }
          ]
        },
@@ -531,13 +558,50 @@
              name: 'damageReport',
              component: () => import('../views/pp/report/DamageReport.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'
            }
          ]
        },



@@ -736,7 +800,7 @@
          /*----------- 仓储报表 ----------------*/
          path: 'stockReport',
          name: 'stockReport',
          component: () => import('../views/mm/stockReport/stockReport.vue'),
          component: () => import('../views/mm/stockReport/StockReport.vue'),
          children:[
            {
              path: 'WarehouseReport',