From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 146 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 129 insertions(+), 17 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..941701c 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -61,6 +61,10 @@
}
]
},
+{
+ path: '/main/glassOptimize/MoveManage',
+ component: () => import('@/views/pp/glassOptimize/MoveManage.vue')
+ },
{
path:'userPassWord',
name: 'userPassWord',
@@ -80,6 +84,34 @@
name:'userPassWord',
path: '',
redirect:'/main/userPassWord/updateUserPassWord'
+ }
+ ]
+ },
+
+ {
+ 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'
}
]
},
@@ -292,6 +324,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',
+ name: 'optimizeInfo',
+ component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
+ },
+ {
+ path: '',
+ redirect:'/main/glassOptimize/optimizeProject'
+ }
+ ]
+ },
{
//宸ュ崟绠＄悊
path: 'workOrder',
@@ -679,6 +758,12 @@
component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
},
{
+ //璁㈠崟鎶ュ伐
+ path: 'orderReportingWorks',
+ name: 'orderReportingWorks',
+ component: () => import('../views/pp/report/OrderReportingWorks.vue'),
+ },
+ {
//宸ュ簭寰呭畬鎴�
path: 'processToBeCompleted',
name: 'processToBeCompleted',
@@ -869,6 +954,12 @@
name: 'storageRecord',
component:()=>import('../views/mm/productStock/StorageRecord.vue'),
},
+ {
+ // 瑁呯鎵撳嵃
+ path: 'storageRecordPint',
+ name: 'storageRecordPint',
+ component:()=>import('../views/mm/productStock/StorageRecordPint.vue'),
+ },
{
path: '',
@@ -998,27 +1089,43 @@
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: 'materialReturnReport',
+ name: 'materialReturnReport',
+ component: () => import('../views/mm/stockReport/MaterialReturnReport.vue'),
}, {
path: '',
- redirect: '/main/stockReport/warehouseReport'
+ redirect: '/main/stockReport/finishedProductInventoryReport'
}
]
},
@@ -1127,6 +1234,11 @@
path: '/register',
name: 'register',
component: () => import('../views/RegisterView.vue')
+ },
+ {
+ path: '/app',
+ name: 'app',
+ component: () => import('../views/system/app/appDownload.vue')
}
]
--
Gitblit v1.8.0