From 8b7d4b9527b9e196df4b9ac7cf113f06798f7941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 15 八月 2024 15:01:00 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 2bd628a..9061f56 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -72,12 +72,18 @@
component: () => import('../views/system/userPassWord/UpdateUserPassWord.vue')
},
{
+ path: 'updateUserName',
+ name: 'updateUserName',
+ component: () => import('../views/system/userPassWord/UpdateUserName.vue')
+ },
+ {
name:'userPassWord',
path: '',
redirect:'/main/userPassWord/updateUserPassWord'
}
]
},
+
//sd妯″潡
{
@@ -159,6 +165,11 @@
path: 'updateOrderCraft',
name: 'updateOrderCraft',
component: () => import('../views/sd/order/UpdateOrderCraft.vue'),
+ },
+ {
+ path: 'orderSummaryReport',
+ name: 'orderSummaryReport',
+ component: () => import('../views/sd/order/OrderSummaryReport.vue'),
},
{
path: 'orderReport',
@@ -360,12 +371,32 @@
{
path: 'printProcess',
name: 'printProcess',
- component: () => import('../views/pp/processCard/PrintProcess.vue'),
+ component: () => import('../components/pp/PrintProcess.vue'),
},
{
path: 'printLabel',
name: 'printLabel',
component: () => import('../views/pp/processCard/PrintLabel.vue'),
+ },
+ {
+ path: 'printCustomLabel',
+ name: 'printCustomLabel',
+ component: () => import('../components/pp/PrintCustomLabel.vue'),
+ },
+ {
+ path: 'printCustomLabelSemi',
+ name: 'printCustomLabelSemi',
+ component: () => import('../components/pp/PrintCustomLabelSemi.vue'),
+ },
+ {
+ path: 'printCustomLabelSemi2',
+ name: 'printCustomLabelSemi2',
+ component: () => import('../views/pp/processCard/PrintCustomLabelSemi2.vue'),
+ },
+ {
+ path: 'printLabel1',
+ name: 'printLabel1',
+ component: () => import('../views/pp/processCard/PrintLabel1.vue'),
},
{
path: 'productionScheduling',
@@ -376,6 +407,26 @@
path: 'selectDetailProcessCard',
name: 'selectDetailProcessCard',
component: () => import('../views/pp/processCard/SelectDetailProcessCard.vue'),
+ },
+ {
+ path: 'selectPrintProject',
+ name: 'selectPrintProject',
+ component: () => import('../views/pp/processCard/SelectPrintProject.vue'),
+ },
+ {
+ path: 'selectSortDetailProcessCard',
+ name: 'selectSortDetailProcessCard',
+ component: () => import('../components/pp/SelectSortDetailProcessCard.vue'),
+ },
+ {
+ path: 'printFlowCardDetails',
+ name: 'printFlowCardDetails',
+ component: () => import('../views/pp/processCard/PrintFlowCardDetails.vue'),
+ },
+ {
+ path: 'printCustomLabelDetails',
+ name: 'printCustomLabelDetails',
+ component: () => import('../components/pp/PrintCustomLabelDetails.vue'),
},
{
path: '',
@@ -446,6 +497,26 @@
component: () => import('../views/pp/Replenish/SelectReplenish.vue'),
},
{
+ path: 'printRepairProcess',
+ name: 'printRepairProcess',
+ component: () => import('../views/pp/Replenish/PrintRepairProcess.vue'),
+ },
+ {
+ path: 'printReplenishFlowCard',
+ name: 'printReplenishFlowCard',
+ component: () => import('../views/pp/Replenish/PrintReplenishFlowCard.vue'),
+ },
+ {
+ path: 'printRepairCustomLabelSemi',
+ name: 'printRepairCustomLabelSemi',
+ component: () => import('../components/pp/PrintRepairCustomLabelSemi.vue'),
+ },
+ {
+ path: 'printRepairCustomLabel',
+ name: 'printRepairCustomLabel',
+ component: () => import('../components/pp/PrintRepairCustomLabel.vue'),
+ },
+ {
path: '',
redirect:'/main/Replenish/SelectReplenish'
}
@@ -467,6 +538,21 @@
path: 'selectRework',
name: 'selectRework',
component: () => import('../views/pp/rework/SelectRework.vue'),
+ },
+ {
+ path: 'printReworkFlowCard',
+ name: 'printReworkFlowCard',
+ component: () => import('../views/pp/rework/PrintReworkFlowCard.vue'),
+ },
+ {
+ path: 'printReworkCustomLabelSemi',
+ name: 'printReworkCustomLabelSemi',
+ component: () => import('../views/pp/rework/PrintReworkCustomLabelSemi.vue'),
+ },
+ {
+ path: 'printReworkCustomLabel',
+ name: 'printReworkCustomLabel',
+ component: () => import('../views/pp/rework/PrintReworkCustomLabel.vue'),
},
{
path: '',
@@ -639,7 +725,13 @@
component: () => import('../views/pp/report/DamageReport.vue'),
},
{
- //璺ㄥ伐搴忔鐮存姤琛�
+ //璁㈠崟鎺掍骇璁″垝
+ path: 'scheduleProductionSchedule',
+ name: 'scheduleProductionSchedule',
+ component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
+ },
+ {
+ //鎺掍骇璁″垝
path: 'crossProcessBreaking',
name: 'crossProcessBreaking',
component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -806,7 +898,11 @@
name: 'selectIngredientsStock',
component:()=>import('../views/mm/mainIngredientStock/SelectIngredientsStock.vue')
},
-
+ {
+ path: 'selectSurplusMaterials',
+ name: 'selectSurplusMaterials',
+ component:()=>import('../views/mm/mainIngredientStock/SelectSurplusMaterials.vue')
+ },
{
path: 'accessoriesMonthlySettlement',
name: 'accessoriesMonthlySettlement',
--
Gitblit v1.8.0