Merge remote-tracking branch 'origin/master'

NNowhZzU

2023-12-27 97c3f97a11524d8bacc6d36cf2ec4e3b93b5c277

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

@@ -255,9 +255,9 @@
              component: () => import('../views/pp/processCard/PrintProcess.vue'),
            },
            {
              path: 'reShelving',
              name: 'reShelving',
              component: () => import('../views/pp/processCard/ReShelving.vue'),
              path: 'productionScheduling',
              name: 'productionScheduling',
              component: () => import('../views/pp/processCard/ProductionScheduling.vue'),
            },
            {
              path: '',
@@ -631,6 +631,17 @@
              name: 'originalMonthlySettlement',
              component:()=>import('../views/mm/mainIngredientStock/OriginalMonthlySettlement.vue')
            },
            //   物料出库
            {
              path: 'materialOutbound',
              name: 'materialOutbound',
              component:()=>import('../views/mm/mainIngredientStock/MaterialOutbound.vue')
            },
            {
              path:'createOutBound',
              name:'createOutBound',
              component:()=>import('../views/mm/mainIngredientStock/CreateOutBound.vue')
            },
            {
              path: '',
              redirect:'/main/ingredientsStock/SelectIngredientsStock'
@@ -770,7 +781,7 @@
        },
        {
          path: '',
          redirect:'/main/Product'
          redirect:'/main/order'
        }
      ]
    },