From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +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 | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 215 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index f85f0b3..4ba8821 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -83,6 +83,23 @@
}
]
},
+ {
+ path:'userLog',
+ name: 'userLog',
+ component: () => import('../views/system/userLog/UserLog.vue'),
+ children:[
+ {
+ path: 'userListLog',
+ name: 'userListLog',
+ component: () => import('../views/system/userLog/UserListLog.vue'),
+ },
+ {
+ name:'userLog',
+ path: '',
+ redirect:'/main/userLog/userListLog'
+ }
+ ]
+ },
{
path:'glassPrice',
@@ -111,7 +128,34 @@
}
]
},
-
+ //bom妯″潡
+ {
+ path:'bom',
+ name: 'bom',
+ component: () => import('../views/sd/bom/BOM.vue'),
+ children:[
+ {
+ path: 'materialBOM',
+ name: 'materialBOM',
+ component: () => import('../views/sd/bom/MaterialBOM.vue')
+ },
+ {
+ path: 'productBOM',
+ name: 'productBOM',
+ component: () => import('../views/sd/bom/ProductBOM.vue')
+ },
+ {
+ path: 'orderBOM',
+ name: 'orderBOM',
+ component: () => import('../views/sd/bom/OrderBOM.vue')
+ },
+ {
+ name: 'bom1',
+ path: '',
+ redirect:'/main/bom/orderBOM'
+ }
+ ]
+ },
//sd妯″潡
{
@@ -128,6 +172,11 @@
path: 'searchGlassType',
name: 'searchGlassType',
component: () => import('../views/sd/basicData/SearchGlassType.vue')
+ },
+ {
+ path: 'searchProcessAttributeConfig',
+ name: 'searchProcessAttributeConfig',
+ component: () => import('../views/sd/basicData/SearchProcessAttributeConfig.vue')
},
{
name: 'OrderBasicData',
@@ -188,6 +237,11 @@
path: 'createOrder',
name: 'createOrder',
component: () => import('../views/sd/order/CreateOrder.vue'),
+ },
+ {
+ path: 'createOrder2',
+ name: 'createOrder2',
+ component: () => import('../views/sd/order/CreateOrder2.vue'),
},
{
path: 'updateOrderCraft',
@@ -357,7 +411,7 @@
component: () => import('../views/pp/glassOptimize/OptimizeParms.vue'),
},
{
- path: '/optimizeProject/:projectNo/:thickNess/:model',
+ path: '/optimizeProject/:projectNo/:thickNess/:model/:quantity/:area/:optimizeState',
name: 'optimizeInfo',
component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
},
@@ -524,6 +578,16 @@
component: () => import('../views/pp/processCard/PrintProjectDetails.vue'),
},
{
+ path: 'TagStyleDesigner',
+ name: 'TagStyleDesigner',
+ component: () => import('../components/pp/TagStyleDesigner.vue'),
+ },
+ {
+ path: 'printProjectDetailSmallPiece',
+ name: 'printProjectDetailSmallPiece',
+ component: () => import('../views/pp/processCard/PrintProjectDetailSmallPiece.vue'),
+ },
+ {
path: '',
redirect:'/main/processCard/selectProcessCard'
}
@@ -655,7 +719,7 @@
}
]
},
- {
+ /*{
//BOM绠＄悊
path: 'BOM',
name: 'BOM',
@@ -696,7 +760,7 @@
redirect:'/main/BOM/SelectBOM'
}
]
- },
+ },*/
{
//璁惧绠＄悊
path: 'machine',
@@ -708,11 +772,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',
@@ -766,6 +826,12 @@
component: () => import('../views/pp/report/ProcessToBeCompleted.vue'),
},
{
+ //宸ュ簭寰呭畬鎴愭眹鎬�
+ path: 'processCompletedSummarize',
+ name: 'processCompletedSummarize',
+ component: () => import('../views/pp/report/ProcessCompletedSummarize.vue'),
+ },
+ {
//鐢熶骇杩涘害
path: 'productionSchedule',
name: 'productionSchedule',
@@ -814,10 +880,22 @@
component: () => import('../views/pp/report/WorkInProgress.vue'),
},
{
+ //鍦ㄥ埗鍝佹眹鎬绘姤琛�
+ path: 'workInProgressCombination',
+ name: 'workInProgressCombination',
+ component: () => import('../views/pp/report/WorkInProgressCombination.vue'),
+ },
+ {
//鎴愬搧鐜囨姤琛�
path: 'yield',
name: 'yield',
component: () => import('../views/pp/report/Yield.vue'),
+ },
+ {
+ //鎴愬搧鐜囨姤琛�
+ path: 'yieldProcess',
+ name: 'yieldProcess',
+ component: () => import('../views/pp/report/yieldProcess.vue'),
},
{
//娆＄牬鎶ヨ〃
@@ -826,13 +904,19 @@
component: () => import('../views/pp/report/DamageReport.vue'),
},
{
+ //闈炶法宸ュ簭娆＄牬鎶ヨ〃
+ path: 'notCrossProcessBreaking',
+ name: 'notCrossProcessBreaking',
+ component: () => import('../views/pp/report/NotCrossProcessBreaking.vue'),
+ },
+ {
//璁㈠崟鎺掍骇璁″垝
path: 'scheduleProductionSchedule',
name: 'scheduleProductionSchedule',
component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
},
{
- //鎺掍骇璁″垝
+ //璺ㄥ伐搴忔鐮�
path: 'crossProcessBreaking',
name: 'crossProcessBreaking',
component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -868,6 +952,11 @@
path: 'addTeamGroup',
name: 'addTeamGroup',
component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
+ },
+ {
+ path: 'addMachine',
+ name: 'addMachine',
+ component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
},
{
path: '',
@@ -1130,6 +1219,15 @@
path: 'materialReturnReport',
name: 'materialReturnReport',
component: () => import('../views/mm/stockReport/MaterialReturnReport.vue'),
+ },{
+ path: 'finishedGlassShelfEmitReport',
+ name: 'finishedGlassShelfEmitReport',
+ component: () => import('../views/mm/stockReport/FinishedGlassShelfEmitReport.vue'),
+ },
+ {
+ path: 'finishedGlassShelfWithdrawReport',
+ name: 'finishedGlassShelfWithdrawReport',
+ component: () => import('../views/mm/stockReport/FinishedGlassShelfWithdrawReport.vue'),
}, {
path: '',
redirect: '/main/stockReport/finishedProductInventoryReport'
@@ -1226,11 +1324,113 @@
component: () => import('../views/mm/basicData/WarehouseCreateBasicData.vue'),
},
{
+ path: 'canvas',
+ name: 'canvas',
+ component: () => import('../views/mm/basicData/canvas.vue'),
+ },
+ {
path: '',
redirect: '/main/warehouseBasicData/warehouseSearchBasicData'
}
]
},
+
+ {
+ path: 'finishedGlassShelf',
+ name: 'finishedGlassShelf',
+ component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelf.vue'),
+ children:[
+ {
+ // 鏂欐灦搴撳瓨
+ path: 'finishedGlassShelfInformation',
+ name: 'finishedGlassShelfInformation',
+ component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue'),
+ },
+ {
+ // 鏂欐灦搴撳瓨
+ path: 'createFinishedGlassShelf',
+ name: 'createFinishedGlassShelf',
+ component: () => import('../views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue'),
+ },
+ {
+ // 鏂欐灦鍑哄簱鏌ヨ
+ path: 'finishedGlassShelfEmit',
+ name: 'finishedGlassShelfEmit',
+ component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue'),
+ },
+ {
+ // 鏂欐灦鍑哄簱鏄庣粏鏌ヨ
+ path: 'createFinishedGlassShelfEmit',
+ name: 'createFinishedGlassShelfEmit',
+ component: () => import('../views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue'),
+ },
+ {
+ // 鏂欐灦鍏ュ簱鏌ヨ
+ path: 'finishedGlassShelfWithdraw',
+ name: 'finishedGlassShelfWithdraw',
+ component: () => import('../views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue'),
+ },
+ {
+ // 鏂欐灦鍏ュ簱鏄庣粏鏌ヨ
+ path: 'createFinishedGlassShelfWithdraw',
+ name: 'createFinishedGlassShelfWithdraw',
+ component: () => import('../views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue'),
+ },
+
+
+ {
+ path: '',
+ redirect:'/main/finishedGlassShelf/finishedGlassShelfInformation'
+ }
+ ]
+ },
+ /*{
+ //绗笁鏂圭幓鐠冧紭鍖�
+ path: 'glassOptimizeThirdParty',
+ name: 'glassOptimizeThirdParty',
+ component: () => import('../views/pp/glassOptimizeThirdParty/Optimize.vue'),
+ children:[
+ {
+ path: 'optimizeProject1',
+ name: 'optimizeProject1',
+ component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeProject.vue'),
+ },
+ {
+ path: 'optimizePrint',
+ name: 'optimizePrint',
+ component: () => import('../views/pp/glassOptimizeThirdParty/OptimizePrint.vue'),
+ },
+ {
+ path: 'OptimizationRectPrint',
+ name: 'OptimizationRectPrint',
+ component: () => import('../views/pp/glassOptimizeThirdParty/OptimizationRectPrint.vue'),
+ },
+ {
+ path: 'OptimizeControl',
+ name: 'OptimizeControl',
+ component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeControl.vue'),
+ },
+ {
+ path: 'Optimization',
+ name: 'Optimization',
+ component: () => import('../views/pp/glassOptimizeThirdParty/Optimization.vue'),
+ },
+ {
+ path: 'optimizeparms',
+ name: 'optimizeparms',
+ component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeParms.vue'),
+ },
+ {
+ path: '/optimizeProject/:projectNo/:thickNess/:model',
+ name: 'optimizeInfo',
+ component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeProject.vue')
+ },
+ {
+ path: '',
+ redirect:'/main/glassOptimizeThirdParty/optimizeProject1'
+ }
+ ]
+ },*/
{
path: '',
redirect:'/main/order'
@@ -1246,6 +1446,11 @@
path: '/app',
name: 'app',
component: () => import('../views/system/app/appDownload.vue')
+ },
+ {
+ path: '/productionScheduleCollect',
+ name: 'productionScheduleCollect',
+ component: () => import('../views/pp/report/WorkInProgressCombination.vue'),
}
]
--
Gitblit v1.8.0