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 | 122 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 116 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 9334961..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',
@@ -157,6 +174,11 @@
component: () => import('../views/sd/basicData/SearchGlassType.vue')
},
{
+ path: 'searchProcessAttributeConfig',
+ name: 'searchProcessAttributeConfig',
+ component: () => import('../views/sd/basicData/SearchProcessAttributeConfig.vue')
+ },
+ {
name: 'OrderBasicData',
path: '',
redirect:'/main/orderBasicData/searchBasicData'
@@ -215,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',
@@ -556,6 +583,11 @@
component: () => import('../components/pp/TagStyleDesigner.vue'),
},
{
+ path: 'printProjectDetailSmallPiece',
+ name: 'printProjectDetailSmallPiece',
+ component: () => import('../views/pp/processCard/PrintProjectDetailSmallPiece.vue'),
+ },
+ {
path: '',
redirect:'/main/processCard/selectProcessCard'
}
@@ -740,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',
@@ -796,6 +824,12 @@
path: 'processToBeCompleted',
name: 'processToBeCompleted',
component: () => import('../views/pp/report/ProcessToBeCompleted.vue'),
+ },
+ {
+ //宸ュ簭寰呭畬鎴愭眹鎬�
+ path: 'processCompletedSummarize',
+ name: 'processCompletedSummarize',
+ component: () => import('../views/pp/report/ProcessCompletedSummarize.vue'),
},
{
//鐢熶骇杩涘害
@@ -858,10 +892,22 @@
component: () => import('../views/pp/report/Yield.vue'),
},
{
+ //鎴愬搧鐜囨姤琛�
+ path: 'yieldProcess',
+ name: 'yieldProcess',
+ component: () => import('../views/pp/report/yieldProcess.vue'),
+ },
+ {
//娆＄牬鎶ヨ〃
path: 'damageReport',
name: 'damageReport',
component: () => import('../views/pp/report/DamageReport.vue'),
+ },
+ {
+ //闈炶法宸ュ簭娆＄牬鎶ヨ〃
+ path: 'notCrossProcessBreaking',
+ name: 'notCrossProcessBreaking',
+ component: () => import('../views/pp/report/NotCrossProcessBreaking.vue'),
},
{
//璁㈠崟鎺掍骇璁″垝
@@ -870,7 +916,7 @@
component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
},
{
- //鎺掍骇璁″垝
+ //璺ㄥ伐搴忔鐮�
path: 'crossProcessBreaking',
name: 'crossProcessBreaking',
component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -906,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: '',
@@ -1168,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'
@@ -1274,6 +1334,56 @@
}
]
},
+
+ {
+ 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',
--
Gitblit v1.8.0