From 95bdecb4b73270f48bd46c628e9d6cf3ddccc92b Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 21 一月 2026 20:34:24 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages.json |  275 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 198 insertions(+), 77 deletions(-)

diff --git a/pages.json b/pages.json
index bc8e1d4..f3d8295 100644
--- a/pages.json
+++ b/pages.json
@@ -231,7 +231,7 @@
 			}
 		},
 		{
-			"path": "pages/baogong/abnormal",
+			"path": "pages/baogong/OA_ErrMsgBackBill",
 			"style": {
 				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
 				"enablePullDownRefresh": false
@@ -334,16 +334,7 @@
 			"style": {
 				"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
 				"enablePullDownRefresh": true
-            }
-        },
-        {
-            "path" : "pages/ZLGL/QualityReportStep/QualityReportStepBill",
-            "style" : 
-            {
-                "navigationBarTitleText" : "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)",
-				"pageOrientation": "auto"
-				
-            }
+			}
 		},
 		{
 			"path": "pages/caigoutuiliao/POStockInBackBill",
@@ -458,14 +449,14 @@
 		{
 			"path": "pages/mujvzhuangtai/mujvzhuangtai",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+				"navigationBarTitleText": "鍣ㄥ叿鐘舵�佸垎甯�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/mujvzhuangtai/detail",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+				"navigationBarTitleText": "鍣ㄥ叿鐘舵�佽鎯�"
 			}
 		},
 		{
@@ -617,39 +608,51 @@
 		{
 			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗曞垪琛�",
+				"navigationBarTitleText": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿鐐规璁板綍鍗�"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐐规瑙勭▼"
+				"navigationBarTitleText": "鍣ㄥ叿鐐规瑙勭▼"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
+			"style": {
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇浠诲姟"
+			}
+		},
+		{
+			"path": "pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇浠诲姟"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇瑙勭▼"
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇瑙勭▼"
 			}
 		},
 		{
@@ -1014,26 +1017,26 @@
 			}
 		},
 		{
-			"path": "pages/quyangdan/TakeSampleCheckBillList",
+			"path": "pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList",
 			"style": {
 				"navigationBarTitleText": "鍙栨牱鍗�"
 			}
 		},
 		{
-			"path": "pages/quyangdan/TakeSampleCheckBill",
+			"path": "pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
 			"style": {
 				"navigationBarTitleText": "鍙栨牱鍗�"
 			}
 		},
 		{
-			"path": "pages/huanyangdan/BackSampleCheckBillList",
+			"path": "pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBillList",
 			"style": {
 				"navigationBarTitleText": "杩樻牱鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/huanyangdan/BackSampleCheckBill",
+			"path": "pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill",
 			"style": {
 				"navigationBarTitleText": "杩樻牱鍗�",
 				"enablePullDownRefresh": true
@@ -1049,6 +1052,12 @@
 			"path": "pages/white/white",
 			"style": {
 				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/baogong/AddLineBind",
+			"style": {
+				"navigationBarTitleText": "娣诲姞鐢熶骇璧勬簮"
 			}
 		},
 		{
@@ -1110,21 +1119,21 @@
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1178,54 +1187,54 @@
 		{
 			"path": "pages/shoujishouming/table",
 			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿瀵垮懡璋冩暣鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/shoujishouming/form",
 			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿瀵垮懡璋冩暣鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟"
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟"
 			}
 		},
 		{
 			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1251,29 +1260,29 @@
 			}
 		},
 		{
-			"path": "pages/weixiujilu/mouldRepairRecordBillList",
+			"path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍",
+				"navigationBarTitleText": "鍣ㄥ叿缁翠慨璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/weixiujilu/mouldRepairRecordBill",
+			"path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿缁翠慨璁板綍鍗�"
 			}
 		},
 		{
-			"path": "pages/qijvguzhangdengji/mouldMistake",
+			"path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
+				"navigationBarTitleText": "鍣ㄥ叿鏁呴殰鐧昏鍗�"
 
 			}
 		},
 		{
-			"path": "pages/qijvguzhangdengji/mouldMistakeBill",
+			"path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿鏁呴殰鐧昏鍗曞垪琛�"
 			}
 		},
 		{
@@ -1319,7 +1328,7 @@
 			}
 		},
 		{
-			"path": "pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+			"path": "pages/ZLGL/mojianjianyan/ProcessCheckBillList",
 			"style": {
 				"navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
 			}
@@ -1337,7 +1346,7 @@
 			}
 		},
 		{
-			"path": "pages/ZLGL/mojianjianyan/lastPieceCheckBill",
+			"path": "pages/ZLGL/mojianjianyan/ProcessCheckBill",
 			"style": {
 				"navigationBarTitleText": "鏈欢妫�楠屽崟"
 			}
@@ -1425,7 +1434,7 @@
 		{
 			"path": "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
 			"style": {
-				"navigationBarTitleText": "妯″叿妗f鏌ヨ",
+				"navigationBarTitleText": "鍣ㄥ叿妗f鏌ヨ",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1445,13 +1454,13 @@
 		{
 			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�"
+				"navigationBarTitleText": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�"
 			}
 		},
 		{
 			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1518,46 +1527,157 @@
         },
         {
             "path" : "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
-            "style" : 
-            {
+			"style": {
                 "navigationBarTitleText" : "璁惧缁翠慨娲惧伐鍗�"
             }
         },
         {
             "path" : "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
-            "style" : 
-            {
+
+			"style": {
                 "navigationBarTitleText" : "璁惧缁翠慨娲惧伐鍗曠紦瀛�"
             }
         },
         {
             "path" : "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
-            "style" : 
-            {
+
+			"style": {
                 "navigationBarTitleText" : "鍣ㄥ叿缁翠慨娲惧伐鍗�"
             }
         },
         {
             "path" : "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
-            "style" : 
-            {
+
+			"style": {
                 "navigationBarTitleText" : "鍣ㄥ叿缁翠慨娲惧伐鍗曠紦瀛�"
             }
         },
         {
             "path" : "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
-            "style" : 
-            {
+
+			"style": {
                 "navigationBarTitleText" : "鍣ㄥ叿缁翠慨楠屾敹鍗�"
             }
         },
         {
             "path" : "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
-            "style" : 
-            {
+
+			"style": {
                 "navigationBarTitleText" : "鍣ㄥ叿缁翠慨楠屾敹鍗曠紦瀛�"
             }
+		},
+		{
+		    "path" : "pages/ZLGL/OA_WorkLink/OA_WorkLinkBill",
+
+			"style": {
+		        "navigationBarTitleText" : "宸ヤ綔鑱旂郴鍗�"
+		    }
+		},
+		{
+		    "path" : "pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
+
+			"style": {
+		        "navigationBarTitleText" : "宸ヤ綔鑱旂郴鍗曞垪琛�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport",
+
+			"style": {
+		        "navigationBarTitleText" : "璁惧缁翠慨浠诲姟"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
+
+			"style": {
+		        "navigationBarTitleText" : "鍣ㄥ叿缁翠慨浠诲姟"
+		    }
+		},
+		{
+		    "path" : "pages/EmployeeRecords/EmployeeRecordsBill",
+
+			"style": {
+		        "navigationBarTitleText" : "鍛樺伐绛惧埌璁板綍琛�"
+		    }
+		},
+		{
+		    "path" : "pages/EmployeeRecords/EmployeeRecordsBillList",
+
+			"style": {
+		        "navigationBarTitleText" : "鍛樺伐绛惧埌璁板綍琛ㄥ垪琛�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill",
+
+			"style": {
+		        "navigationBarTitleText" : "璁惧鏁呴殰鐧昏鍗�"
+		    }
+		},{
+		    "path" : "pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
+
+			"style": {
+		        "navigationBarTitleText" : "璁惧鏁呴殰鐧昏鍗曞垪琛�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧寮�鏈哄崟"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EquipStop/Sb_EquipStopBill",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧鍋滄満鍗�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "鐐规娓呭崟"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧灞ュ巻"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧宸ヨ壓璺嚎"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧缁翠慨璁板綍鍗�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧鐘舵��"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "璁惧缁翠慨璁板綍鍗曞垪琛�"
+		    }
 		}
+		
 
 	],
 	"tabBar": {
@@ -1587,7 +1707,7 @@
 				"pagePath": "pages/index/tab4",
 				"iconPath": "static/tabBar/icon3.png",
 				"selectedIconPath": "static/tabBar/icon3-default.png",
-				"text": "璐ㄩ噺绠$悊" 
+				"text": "璐ㄩ噺绠$悊"
 			},
 			{
 				"pagePath": "pages/index/tab2",
@@ -1601,21 +1721,22 @@
 				"selectedIconPath": "static/tabBar/user-default.png",
 				"text": "鎴戠殑"
 			}
-        ]
-    },
-    "globalStyle": {
-        "navigationBarTextStyle": "white",
-        "navigationBarTitleText": "璁惧绠$悊",
-        "navigationBarBackgroundColor": "#3A78FF",
-        "backgroundColor": "#F8F8F8"
-    },
-    "uniIdRouter": {},
-    "condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
-        "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
-        "list": [{
-            "name": "", //妯″紡鍚嶇О
-            "path": "", //鍚姩椤甸潰锛屽繀閫�
-            "query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
-        }]
-    }
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "璁惧绠$悊",
+		"navigationBarBackgroundColor": "#3A78FF",
+		"backgroundColor": "#F8F8F8",
+		"pageOrientation": "default"
+	},
+	"uniIdRouter": {},
+	"condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
+		"current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
+		"list": [{
+			"name": "", //妯″紡鍚嶇О
+			"path": "", //鍚姩椤甸潰锛屽繀閫�
+			"query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
+		}]
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1