From fcbce36f8734813b13c8f9c5b26b4bd192274534 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 16:30:28 +0800
Subject: [PATCH] 工程打印明细新增玻璃编号显示
---
north-glass-erp/northglass-erp/src/router/index.js | 341 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 321 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index d4cb144..ede174d 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -84,6 +84,61 @@
]
},
+ {
+ path:'glassPrice',
+ name: 'glassPrice',
+ component: () => import('../views/sd/glassPrice/GlassPrice.vue'),
+ children:[
+ {
+ path: 'producePriceCompute',
+ name: 'producePriceCompute',
+ component: () => import('../views/sd/glassPrice/ProducePriceCompute.vue')
+ },
+ {
+ path: 'glassPriceSet',
+ name: 'glassPriceSet',
+ component: () => import('../views/sd/glassPrice/GlassPriceSet.vue')
+ },
+ {
+ path: 'glassPriceList',
+ name: 'glassPriceList',
+ component: () => import('../views/sd/glassPrice/GlassPriceList.vue')
+ },
+ {
+ name: 'GlassPrice1',
+ path: '',
+ redirect:'/main/glassPrice/producePriceCompute'
+ }
+ ]
+ },
+ //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妯″潡
{
@@ -160,6 +215,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',
@@ -292,6 +352,53 @@
},
//pp妯″潡
+ {
+ //鐜荤拑浼樺寲
+ path: 'glassOptimize',
+ name: 'glassOptimize',
+ component: () => import('../views/pp/glassOptimize/Optimize.vue'),
+ children:[
+ {
+ path: 'optimizeProject',
+ name: 'optimizeProject',
+ component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
+ },
+ {
+ path: 'optimizePrint',
+ name: 'optimizePrint',
+ component: () => import('../views/pp/glassOptimize/OptimizePrint.vue'),
+ },
+ {
+ path: 'OptimizationRectPrint',
+ name: 'OptimizationRectPrint',
+ component: () => import('../views/pp/glassOptimize/OptimizationRectPrint.vue'),
+ },
+ {
+ path: 'OptimizeControl',
+ name: 'OptimizeControl',
+ component: () => import('../views/pp/glassOptimize/OptimizeControl.vue'),
+ },
+ {
+ path: 'Optimization',
+ name: 'Optimization',
+ component: () => import('../views/pp/glassOptimize/Optimization.vue'),
+ },
+ {
+ path: 'optimizeparms',
+ name: 'optimizeparms',
+ component: () => import('../views/pp/glassOptimize/OptimizeParms.vue'),
+ },
+ {
+ path: '/optimizeProject/:projectNo/:thickNess/:model/:quantity/:area/:optimizeState',
+ name: 'optimizeInfo',
+ component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
+ },
+ {
+ path: '',
+ redirect:'/main/glassOptimize/optimizeProject'
+ }
+ ]
+ },
{
//宸ュ崟绠＄悊
path: 'workOrder',
@@ -449,6 +556,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'
}
@@ -580,7 +697,7 @@
}
]
},
- {
+ /*{
//BOM绠＄悊
path: 'BOM',
name: 'BOM',
@@ -621,7 +738,7 @@
redirect:'/main/BOM/SelectBOM'
}
]
- },
+ },*/
{
//璁惧绠＄悊
path: 'machine',
@@ -679,10 +796,22 @@
component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
},
{
+ //璁㈠崟鎶ュ伐
+ path: 'orderReportingWorks',
+ name: 'orderReportingWorks',
+ component: () => import('../views/pp/report/OrderReportingWorks.vue'),
+ },
+ {
//宸ュ簭寰呭畬鎴�
path: 'processToBeCompleted',
name: 'processToBeCompleted',
component: () => import('../views/pp/report/ProcessToBeCompleted.vue'),
+ },
+ {
+ //宸ュ簭寰呭畬鎴愭眹鎬�
+ path: 'processCompletedSummarize',
+ name: 'processCompletedSummarize',
+ component: () => import('../views/pp/report/ProcessCompletedSummarize.vue'),
},
{
//鐢熶骇杩涘害
@@ -733,10 +862,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'),
},
{
//娆＄牬鎶ヨ〃
@@ -745,13 +886,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'),
@@ -869,6 +1016,12 @@
name: 'storageRecord',
component:()=>import('../views/mm/productStock/StorageRecord.vue'),
},
+ {
+ // 瑁呯鎵撳嵃
+ path: 'storageRecordPint',
+ name: 'storageRecordPint',
+ component:()=>import('../views/mm/productStock/StorageRecordPint.vue'),
+ },
{
path: '',
@@ -958,6 +1111,12 @@
name:'returnToStorageCreate',
component:()=>import('../views/mm/ingredientStock/ReturnToStorageCreate.vue')
},
+ //鐗╂枡鏂板
+ {
+ path:'materialAdditionRecord',
+ name:'materialAdditionRecord',
+ component:()=>import('../views/mm/ingredientStock/MaterialAdditionRecord.vue')
+ },
{
path: '',
redirect:'/main/ingredientsStock/selectIngredientsStock'
@@ -998,27 +1157,57 @@
name: 'stockReport',
component: () => import('../views/mm/stockReport/StockReport.vue'),
children:[
- {
- path: 'warehouseReport',
- name: 'warehouseReport',
- component: () => import('../views/mm/stockReport/WarehouseReport.vue'),
- }, {
- path: 'stockMonthReport',
- name: 'stockMonthReport',
- component: () => import('../views/mm/stockReport/StockMonthReport.vue'),
- }, {
- path: 'subsidiaryMonthReport',
- name: 'subsidiaryMonthReport',
- component: () => import('../views/mm/stockReport/SubsidiaryMonthReport.vue'),
- },
/*----------- 鏂板 ----------------*/
{
- path: 'StockWarehouseReport',
- name: 'StockWarehouseReport',
- component: () => import('../views/mm/stockReport/StockWarehouseReport.vue'),
+ path: 'finishedProductDeliveryReport',
+ name: 'finishedProductDeliveryReport',
+ component: () => import('../views/mm/stockReport/FinishedProductDeliveryReport.vue'),
+ },
+ {
+ path: 'finishedProductInventoryReport',
+ name: 'finishedProductInventoryReport',
+ component: () => import('../views/mm/stockReport/FinishedProductInventoryReport.vue'),
+ },
+ {
+ path: 'finishedProductOutboundReport',
+ name: 'finishedProductOutboundReport',
+ component: () => import('../views/mm/stockReport/FinishedProductOutboundReport.vue'),
+ },
+ {
+ path: 'finishedProductTransferReport',
+ name: 'finishedProductTransferReport',
+ component: () => import('../views/mm/stockReport/FinishedProductTransferReport.vue'),
+ },{
+ path: 'materialAdditionReport',
+ name: 'materialAdditionReport',
+ component: () => import('../views/mm/stockReport/MaterialAdditionReport.vue'),
+ },
+ {
+ path: 'materialOutboundReport',
+ name: 'materialOutboundReport',
+ component: () => import('../views/mm/stockReport/MaterialOutboundReport.vue'),
+ },
+ {
+ path: 'optimizeOutboundReport',
+ name: 'optimizeOutboundReport',
+ component: () => import('../views/mm/stockReport/OptimizeOutboundReport.vue'),
+ },
+ {
+ 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/warehouseReport'
+ redirect: '/main/stockReport/finishedProductInventoryReport'
}
]
},
@@ -1112,11 +1301,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'
@@ -1127,6 +1418,16 @@
path: '/register',
name: 'register',
component: () => import('../views/RegisterView.vue')
+ },
+ {
+ 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