From 2b1caeb8defa28b2dc769da5ca23c77873eb36d9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 13 八月 2025 11:30:25 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages.json |  607 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 439 insertions(+), 168 deletions(-)

diff --git a/pages.json b/pages.json
index 7b3defa..e066b2b 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,7 @@
 	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/login",
-			
+
 			"style": {
 				"navigationBarTitleText": "鐧诲綍",
 				"navigationStyle": "custom"
@@ -18,13 +18,13 @@
 		{
 			"path": "pages/index/tab1",
 			"style": {
-				"navigationBarTitleText": "妯″潡鍔熻兘"
+				"navigationBarTitleText": "杞﹂棿宸ュ簭"
 			}
 		},
 		{
 			"path": "pages/index/tab2",
 			"style": {
-				"navigationBarTitleText": "鎶ヨ〃涓績"
+				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
 			}
 		},
 		{
@@ -164,7 +164,7 @@
 				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
 				"enablePullDownRefresh": true
 			}
-		},{
+		}, {
 			"path": "pages/gongxuIn/form",
 			"style": {
 				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
@@ -176,7 +176,7 @@
 				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
 				"enablePullDownRefresh": true
 			}
-		},{
+		}, {
 			"path": "pages/gongxuOut/form",
 			"style": {
 				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
@@ -330,170 +330,441 @@
 			}
 		},
 		{
-					"path": "pages/labelPrinter/index",
-					"style": {
-						"navigationBarTitleText": "鏍囩鎵撳嵃"
-					}
-				},
-				{
-					"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-					"style": {
-						"navigationBarTitleText": "璁惧杩愯鐘舵��",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/shebeiyunxingzhuangtai/detail",
-					"style": {
-						"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-					}
-				},
-				{
-					"path": "pages/mujvzhuangtai/mujvzhuangtai",
-					"style": {
-						"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/mujvzhuangtai/detail",
-					"style": {
-						"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-					}
-				},
-				{
-					"path": "pages/tiaomachaima/tiaomachaima",
-					"style": {
-						"navigationBarTitleText": "鏉$爜鎷嗙爜"
-					}
-				},
-				{
-					"path": "pages/wuliaosaoma/wuliaosaoma",
-					"style": {
-						"navigationBarTitleText": "鐗╂枡娓呭崟"
-					}
-				},
-				{
-					"path": "pages/wuliaosaoma/detail",
-					"style": {
-						"navigationBarTitleText": "鏉$爜妗f"
-					}
-				},
-				{
-					"path": "pages/caigouruku/table",
-					"style": {
-						"navigationBarTitleText": "閲囪喘鍏ュ簱",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/caigouruku/form",
-					"style": {
-						"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
-					}
-				},
-				{
-					"path": "pages/caigoutuiliao/table",
-					"style": {
-						"navigationBarTitleText": "閲囪喘閫�鏂�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/caigoutuiliao/form",
-					"style": {
-						"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
-					}
-				},
-				{
-					"path": "pages/xiaoshouchuku/table",
-					"style": {
-						"navigationBarTitleText": "閿�鍞嚭搴�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/xiaoshouchuku/form",
-					"style": {
-						"navigationBarTitleText": "閿�鍞嚭搴撳崟"
-					}
-				},
-				{
-					"path": "pages/xiaoshoutuihuo/table",
-					"style": {
-						"navigationBarTitleText": "閿�鍞��璐�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/xiaoshoutuihuo/form",
-					"style": {
-						"navigationBarTitleText": "閿�鍞��璐у崟"
-					}
-				},
-				{
-					"path": "pages/qitachuku/qitachuku",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍑哄簱",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/qitachuku/form",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-					}
-				},
-				{
-					"path": "pages/qitaruku/qitaruku",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/qitaruku/form",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-					}
-				}, 
-				{
-					"path": "pages/tiaomadaying/tiaomadaying",
-					"style": {
-						"navigationBarTitleText": "鏉ユ枡鏉$爜鎵撳嵃"
-					}
-				}
+			"path": "pages/shengchanlingliao/table",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanlingliao/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchanruku/table",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanruku/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchandiaobo/table",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchandiaobo/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/labelPrinter/index",
+			"style": {
+				"navigationBarTitleText": "鏍囩鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+			"style": {
+				"navigationBarTitleText": "璁惧杩愯鐘舵��",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiyunxingzhuangtai/detail",
+			"style": {
+				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+			}
+		},
+		{
+			"path": "pages/mujvzhuangtai/mujvzhuangtai",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mujvzhuangtai/detail",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+			}
+		},
+		{
+			"path": "pages/tiaomachaima/tiaomachaima",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鎷嗙爜"
+			}
+		},
+		{
+			"path": "pages/wuliaosaoma/wuliaosaoma",
+			"style": {
+				"navigationBarTitleText": "鐗╂枡娓呭崟"
+			}
+		},
+		{
+			"path": "pages/wuliaosaoma/detail",
+			"style": {
+				"navigationBarTitleText": "鏉$爜妗f"
+			}
+		},
+		{
+			"path": "pages/caigouruku/table",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigouruku/form",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/caigoutuiliao/table",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigoutuiliao/form",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/table",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/form",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/table",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/form",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐у崟"
+			}
+		},
+		{
+			"path": "pages/qitachuku/qitachuku",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachuku/form",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+			}
+		},
+		{
+			"path": "pages/qitaruku/qitaruku",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitaruku/form",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/tiaomadaying/tiaomadaying",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/caigoudingdan/generate",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鐢熸垚"
+			}
+		},
+		{
+			"path": "pages/caigoudingdan/caigoudingdan",
+			"style": {
+				"navigationBarTitleText": "閲囪喘璁㈠崟"
+			}
+		},
+		{
+			"path": "pages/MJGL/shangmudan/table",
+			"style": {
+				"navigationBarTitleText": "涓婃ā鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/shangmudan/form",
+			"style": {
+				"navigationBarTitleText": "涓婃ā鍗�"
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/detail",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/CacheList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path" : "pages/shengchanlingliaoshengdan/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇棰嗘枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/shengchanlingliaoshengdan/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇棰嗘枡鍗�"
+			}
+		},
+		{
+			"path" : "pages/weiwailingliao/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "濮斿棰嗘枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/weiwailingliao/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "濮斿棰嗘枡鍗�"
+			}
+		},
+		{
+			"path" : "pages/shengchanrukushengdan/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/shengchanrukushengdan/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path" : "pages/shengchanbuliao/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇琛ユ枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/shengchanbuliao/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇琛ユ枡鍗�"
+			}
+		},
+		{
+			"path" : "pages/qitaruku_v2/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍏朵粬鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/qitaruku_v2/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍏朵粬鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path" : "pages/qitachuku_v2/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍏朵粬鍑哄簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/qitachuku_v2/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鍏朵粬鍑哄簱鍗�"
+			}
+		},
+		{
+			"path" : "pages/zhijiediaobo/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐩存帴璋冩嫧",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/zhijiediaobo/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐩存帴璋冩嫧鍗�"
+			}
+		},
+		{
+			"path" : "pages/xiugaimima/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "淇敼瀵嗙爜"
+			}
+		}
 	],
 	"tabBar": {
-		 "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		 "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		 "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-		 "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		 "list": [{
-			 "pagePath": "pages/index/index",
-			 "iconPath":"static/tabBar/home.png",
-			 "selectedIconPath":"static/tabBar/home-default.png",
-			 "text": "棣栭〉"
-		 },
-		 {
-			 "pagePath": "pages/index/tab1",
-			 "iconPath":"static/tabBar/icon1.png",
-			 "selectedIconPath":"static/tabBar/icon1-default.png",
-			 "text": "妯″潡鍔熻兘"
-		 },
-		 {
-			 "pagePath": "pages/index/tab2",
-			 "iconPath":"static/tabBar/icon2.png",
-			 "selectedIconPath":"static/tabBar/icon2-default.png",
-			 "text": "鎶ヨ〃涓績"
-		 },
-		 {
-			"pagePath": "pages/index/mine",
-			"iconPath":"static/tabBar/user.png",
-			"selectedIconPath":"static/tabBar/user-default.png",
-			"text": "鎴戠殑"
-		 }]
-	 },
+		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "static/tabBar/home-default.png",
+				"text": "浠撳偍绠$悊"
+			},
+			{
+				"pagePath": "pages/index/tab1",
+				"iconPath": "static/tabBar/icon1.png",
+				"selectedIconPath": "static/tabBar/icon1-default.png",
+				"text": "杞﹂棿宸ュ簭"
+			},
+			{
+				"pagePath": "pages/index/tab2",
+				"iconPath": "static/tabBar/icon2.png",
+				"selectedIconPath": "static/tabBar/icon2-default.png",
+				"text": "鍗曟嵁鍒楄〃"
+			},
+			{
+				"pagePath": "pages/index/mine",
+				"iconPath": "static/tabBar/user.png",
+				"selectedIconPath": "static/tabBar/user-default.png",
+				"text": "鎴戠殑"
+			}
+		]
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "璁惧绠$悊",
@@ -502,4 +773,4 @@
 		"pageOrientation": "default"
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1