From 0b345eef9549c7a641202bad894eee32c4b02d52 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 18 九月 2025 16:33:31 +0800
Subject: [PATCH] 修复订单组托功能

---
 pages.json |  349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 344 insertions(+), 5 deletions(-)

diff --git a/pages.json b/pages.json
index 726ab5a..96c62c4 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,8 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "涓� 椤�"
+				// "navigationBarTitleText": "涓� 椤�"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -25,9 +26,70 @@
 			}
 		},
 		{
+			"path": "pages/mat/matQuery2",
+			"style": {
+				"navigationBarTitleText": "鐗╂枡"
+			}
+		},
+		{
+			"path": "pages/mat/matQueryByOrder",
+			"style": {
+				"navigationBarTitleText": "鐗╂枡"
+			}
+		},
+		{
 			"path": "pages/pakin/pakin",
 			"style": {
-				"navigationBarTitleText": "缁� 鎵�"
+				// "navigationBarTitleText": "缁� 鎵�"
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/AGV/AGVPakin",
+			"style": {
+				"navigationBarTitleText": "AGV缁勬墭"
+			}
+		},
+		{
+			"path": "pages/AGV/AGVPakinBing",
+			"style": {
+				"navigationBarTitleText": "AGV涓婃灦缁戝畾"
+			}
+		},
+		{
+			"path": "pages/AGV/AGVPakinOn",
+			"style": {
+				"navigationBarTitleText": "AGV涓婃灦缁勬墭"
+			}
+		},
+		{
+			"path": "pages/AGV/AGVStart",
+			"style": {
+				"navigationBarTitleText": "AGV鍚姩鍏ュ簱"
+			}
+		},
+		{
+			"path": "pages/tzsk/AGV/AGVPakin",
+			"style": {
+				"navigationBarTitleText": "AGV缁勬墭"
+			}
+		},
+		{
+			"path": "pages/tzsk/AGV/AGVPakinBing",
+			"style": {
+				"navigationBarTitleText": "AGV涓婃灦缁戝畾"
+			}
+		},
+		{
+			"path": "pages/tzsk/AGV/AGVPakinOn",
+			"style": {
+				"navigationBarTitleText": "AGV涓婃灦缁勬墭"
+			}
+		},
+		{
+			"path": "pages/tzsk/AGV/AGVStart",
+			"style": {
+				"navigationBarTitleText": "AGV鍚姩鍏ュ簱"
 			}
 		},
 		{
@@ -49,9 +111,15 @@
 			}
 		},
 		{
-			"path": "pages/print/print",
+			"path": "pages/stock/stockQuery",
 			"style": {
-				"navigationBarTitleText": "鎵撳嵃"
+				"navigationBarTitleText": "搴撳瓨鏌ヨ"
+			}
+		},
+		{
+			"path": "pages/stock/stockCheck",
+			"style": {
+				"navigationBarTitleText": "鐩樼偣"
 			}
 		},
 		{
@@ -61,12 +129,283 @@
 			}
 		},
 		{
+			"path": "pages/print/print",
+			"style": {
+				"navigationBarTitleText": "鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/stock/restock",
+			"style": {
+				"navigationBarTitleText": "琛ヨ揣"
+			}
+		},
+		{
+			"path": "pages/pakin/piking",
+			"style": {
+				"navigationBarTitleText": "鐩樼偣/鎷f枡杞叏鏉�"
+			}
+		},
+		{
+			"path": "pages/pakin/putOn",
+			"style": {
+				// "navigationBarTitleText": "缁勬墭涓婃灦"
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/stock/changePallet",
+			"style": {
+				"navigationBarTitleText": "鎹㈡澘缁戝畾"
+			}
+		},
+		
+		{
+			"path": "pages/print/qr",
+			"style": {
+				"navigationBarTitleText": "浜岀淮鐮�"
+			}
+		},
+		
+		{
+			"path": "pages/mat/matList",
+			"style": {
+				"navigationBarTitleText": "鍟嗗搧鍒楄〃"
+			}
+		},
+		{
+			"path": "pages/pakin/pickAgain",
+			"style": {
+				"navigationBarTitleText": "鍐嶆鎷f枡"
+			}
+		},
+		{
 			"path": "pages/login/logOut",
 			"style": {
 				"navigationBarTitleText": "閫�鍑虹櫥褰�"
 			}
+		},
+		{
+			"path" : "pages/order/orderPakin2",
+			"style" : 
+			{
+				"navigationBarTitleText" : "璁㈠崟缁勬墭",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehouseGrouping",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞冲簱缁勬墭",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehouseIn",
+			"style" : 
+			{
+				// "navigationBarTitleText" : "骞冲簱涓婃灦",
+				// "enablePullDownRefresh" : false
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehouseOut",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞冲簱涓嬫灦",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/order/orderListParallelBoard",
+			"style" : 
+			{
+				// "navigationBarTitleText" : "骞舵澘閫斾腑鎷f枡",
+				// "enablePullDownRefresh" : false
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/order/orderListPickBoard",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/order/mergeBoardManyTimes",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehouseOutParallelBoard",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞舵澘閫斾腑鎷f枡鍑哄簱",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/order/orderListParallelBoard1",
+			"style" : 
+			{
+				"navigationBarTitleText" : "澶氭鎷f枡",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehousePickOutParallelBoard",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鎷f枡閫斾腑骞舵澘鍏ュ簱",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/pakin/WarehouseOutMergeBoardMany",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞舵澘閫斾腑鍐嶆骞舵澘",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/order/orderDetlListLoc",
+			"style" : 
+			{
+				"navigationBarTitleText" : "杈撳叆鎵樼洏鐮佸尮閰嶄换鍔�",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/order/orderComb",
+			"style" : 
+			{
+				// "navigationBarTitleText" : "璁㈠崟缁勬墭",
+				// "enablePullDownRefresh" : false
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/order/orderPickConfirm",
+			"style" : 
+			{
+				// "navigationBarTitleText" : "骞舵澘鍏ュ簱",
+				// "enablePullDownRefresh" : false
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/warehouse/orderList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞冲簱涓嬫灦",
+				// "enablePullDownRefresh" : false
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/mat/matInformation",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍟嗗搧淇℃伅鏌ヨ"
+				// "enablePullDownRefresh" : false,
+			}
+		},
+		{
+			"path" : "pages/mat/showMatInformation",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍟嗗搧淇℃伅鏌ヨ"
+			}
+		},
+		{
+			"path" : "pages/order/orderDetlList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "骞冲簱涓嬫灦",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/order/zlOrderPakin",
+			"style" : 
+			{
+				// "navigationBarTitleText" : "鍒朵护鍏ュ簱"
+				"navigationStyle": "custom"
+			}
 		}
-	],
+	    ,{
+            "path" : "pages/order/orderPickConfirm2",
+            "style" :
+            {
+				// "navigationBarTitleText" : "骞舵澘鍏ュ簱",
+				// "enablePullDownRefresh" : false
+				"navigationStyle": "custom"
+			}
+        }
+        ,{
+            "path" : "pages/order/pickOrderList",
+            "style" :                                                                                    
+            {
+                // "navigationBarTitleText": "璁㈠崟鐗╂枡",
+                // "enablePullDownRefresh": false
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/pakin/pickOrderList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "璁㈠崟鐗╂枡",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/order/pickOrderList2",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "鍏宠仈璁㈠崟",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/warehouse/outLocs",
+            "style" :                                                                                    
+            {
+                // "navigationBarTitleText": "鍏宠仈搴撲綅",
+                // "enablePullDownRefresh": false
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/warehouse/outMats",
+            "style" :                                                                                    
+            {
+                // "navigationBarTitleText": "涓嬫灦鐗╂枡",
+                // "enablePullDownRefresh": false
+				"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/order/orderSelect",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "閫夋嫨璁㈠崟",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

--
Gitblit v1.9.1