From fa2f172812de8344fa22c4ef088ea2a67257a0d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:21:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

---
 minipro_standard/pages.json |  209 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 204 insertions(+), 5 deletions(-)

diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 4e8cdef..b334926 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -31,7 +31,6 @@
 				"navigationBarTitleText": "涓汉淇℃伅",
 				"enablePullDownRefresh": false
 			}
-
 		}, {
 			"path": "pages/changePassword/changePassword",
 			"style": {
@@ -53,6 +52,208 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/plannedProgress/plannedProgress",
+			"style": {
+				"navigationBarTitleText": "璁″垝杩涘害",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/planDetails/planDetails",
+			"style": {
+				"navigationBarTitleText": "璁″垝璇︽儏",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/plannedDistribution/plannedDistribution",
+			"style": {
+				"navigationBarTitleText": "璁″垝鍒嗛厤",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/allocation/allocation",
+			"style": {
+				"navigationBarTitleText": "閫夋嫨",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/inspectComplete/inspectComplete",
+			"style": {
+				"navigationBarTitleText": "瀹屽伐妫�",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/selectWorkOrder/selectWorkOrder",
+			"style": {
+				"navigationBarTitleText": "閫夋嫨宸ュ崟",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/inspectPatrol/inspectPatrol",
+			"style": {
+				"navigationBarTitleText": "宸℃",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/linePatrol/linePatrol",
+			"style": {
+				"navigationBarTitleText": "宸$嚎",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	    ,{
+            "path" : "pages/OutOperation/OutOperation",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "鍑哄簱鎿嶄綔",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/InOperation/InOperation",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "鍏ュ簱鎿嶄綔",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
+	"subPackages": [{
+			"root": "pages_adjust",
+			"pages": [{
+					"path": "pages/newOutbound/newOutbound",
+					"style": {
+						"navigationBarTitleText": "鏂板缓鍑哄簱",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/addReceipt/addReceipt",
+					"style": {
+						"navigationBarTitleText": "鏂板缓鍏ュ簱",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/newTransfer/newTransfer",
+					"style": {
+						"navigationBarTitleText": "鏂板缓杞簱",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/manualFeed/manualFeed",
+					"style": {
+						"navigationBarTitleText": "鎵嬪姩鎶曟枡",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/OrderDetail/OrderDetail",
+					"style": {
+						"navigationBarTitleText": "宸ュ崟璇︽儏",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/workOrderReporting/workOrderReporting",
+					"style": {
+						"navigationBarTitleText": "宸ュ崟鎶ュ伐",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/transferList/transferList",
+					"style": {
+						"navigationBarTitleText": "杞簱鍒楄〃",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/warehousingDetails/warehousingDetails",
+					"style": {
+						"navigationBarTitleText": "鍏ュ簱璇︽儏",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/outboundList/outboundList",
+					"style": {
+						"navigationBarTitleText": "鍑哄簱鍗曞垪琛�",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/outboundDetails/outboundDetails",
+					"style": {
+						"navigationBarTitleText": "鍑哄簱璇︽儏",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/warehousingList/warehousingList",
+					"style": {
+						"navigationBarTitleText": "鍏ュ簱鍗曞垪琛�",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/warehousingDetails1/warehousingDetails1",
+					"style": {
+						"navigationBarTitleText": "鍏ュ簱璇︽儏",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/InventoryQuery/InventoryQuery",
+					"style": {
+						"navigationBarTitleText": "搴撳瓨閲忔煡璇�",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/reportingForWork/reportingForWork",
+					"style": {
+						"navigationBarTitleText": "涓�閿姤宸�",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/processPlan/processPlan",
+					"style": {
+						"navigationBarTitleText": "閫夋嫨宸ュ簭璁″垝",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
+		},
+		{
+			"root": "pages_inspect",
+			"pages": [{
+					"path": "pages/InspectionRecords/InspectionRecords",
+					"style": {
+						"navigationBarTitleText": "妫�楠岃褰�",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/InspectionDetails/InspectionDetails",
+					"style": {
+						"navigationBarTitleText": "妫�楠岃鎯�",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
@@ -60,15 +261,13 @@
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#ffffff"
-		// "navigationStyle": "custom"
 	},
 	"tabBar": {
 		"color": "#666666",
 		"selectedColor": "#222222",
 		"borderStyle": "black",
 		"backgroundColor": "#fff",
-		"list": [
-			{
+		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/nav_daiban@2x.png",
 				"selectedIconPath": "static/nav_daiban_sel@2x.png",
@@ -89,4 +288,4 @@
 		]
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3