From e191eb91bf837b58e088aef3bfd410d1b55a690e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 10 二月 2025 08:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncPda' into nbncPda

---
 pages/home/home.vue |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5a34482..76a342f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -67,7 +67,7 @@
 						name: 'orderPutOn',
 						color: 'yellow',
 						cuIcon: 'pullup',
-						url: '/order/orderPutOn'
+						url: '/warehouse/orderList'
 					},
 					{
 						title: '璁㈠崟缁勬墭',
@@ -81,14 +81,28 @@
 						name: 'orderPickConfirm',
 						color: 'green',
 						cuIcon: 'pulldown',
-						url: '/order/orderPickConfirm'
+						url: '/order/orderPickConfirm2'
 					},
 					{
 						title: '骞舵澘閫斾腑鎷f枡',
-						name: 'orderListParallelBoard',
+						name: 'ParallelBoard',
 						color: 'green',
 						cuIcon: 'pulldown',
 						url: '/order/orderListParallelBoard'
+					},
+					{
+						title: '鎷f枡閫斾腑骞舵澘',
+						name: 'PickBoard',
+						color: 'orange',
+						cuIcon: 'pulldown',
+						url: '/order/orderListPickBoard'
+					},
+					{
+						title: '澶氭骞舵澘',
+						name: 'BoardMany',
+						color: 'yellow',
+						cuIcon: 'pulldown',
+						url: '/order/mergeBoardManyTimes'
 					},
 					{
 						title: '鍒朵护鍏ュ簱',
@@ -97,6 +111,13 @@
 						cuIcon: 'pulldown',
 						url: '/order/zlOrderPakin'
 					},
+					{
+						title: '鍟嗗搧淇℃伅鏌ヨ',
+						name: 'MatInformation',
+						color: 'red',
+						cuIcon: 'pulldown',
+						url: '/mat/matInformation'
+					},
 					// {
 					// 	title: '搴撳瓨鏌ヨ',
 					// 	name: 'stockQuery',

--
Gitblit v1.9.1