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

廖井涛

2024-08-15 8b7d4b9527b9e196df4b9ac7cf113f06798f7941

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

@@ -419,6 +419,16 @@
              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: '',
              redirect:'/main/processCard/SelectProcessCard'
            }
@@ -888,7 +898,11 @@
              name: 'selectIngredientsStock',
              component:()=>import('../views/mm/mainIngredientStock/SelectIngredientsStock.vue')
            },

            {
              path: 'selectSurplusMaterials',
              name: 'selectSurplusMaterials',
              component:()=>import('../views/mm/mainIngredientStock/SelectSurplusMaterials.vue')
            },
            {
              path: 'accessoriesMonthlySettlement',
              name: 'accessoriesMonthlySettlement',