From 723cbdddb7d06a1d12564d8d88dfe8d4984315a3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 05 十二月 2025 13:58:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/router/index.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index ee9bfc6..a13144c 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/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'
             }

--
Gitblit v1.8.0