Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-12-05 723cbdddb7d06a1d12564d8d88dfe8d4984315a3

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

@@ -755,11 +755,7 @@
              name: 'selectMachine',
              component: () => import('../views/pp/machine/SelectMachine.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/machine/AddMachine.vue'),
            },

            {
              path: 'maintenanceAndRepair',
              name: 'maintenanceAndRepair',
@@ -941,6 +937,11 @@
              component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
            },
            {
              path: '',
              redirect:'/main/productionBasicData/selectProductionBasicData'
            }