From 00c71543fe1bf68490f9846cd6823c92866222fa Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 12 一月 2026 11:38:19 +0800
Subject: [PATCH] 增加异常反馈待处理列表,以及调整功能,模块调整

---
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue |  128 ++++++
 pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue            |  376 ++++++------------
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue   |  163 +++++++
 pages/index/tab3.vue                                                         |  187 ++++-----
 pages/index/tab2.vue                                                         |  143 ++++---
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue     |  141 ++++++
 6 files changed, 679 insertions(+), 459 deletions(-)

diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
index 79231c3..977fc23 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
@@ -93,14 +93,14 @@
 				<view class="form-item">
 					<view class="title">鐩稿叧璁惧:</view>
 					<view class="right">
-						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
+						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
 							@input="HEquipNameChange"></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧妯″叿:</view>
 					<view class="right">
-						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
+						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
 							@input="HMouldIDNameChange"></uni-combox>
 					</view>
 				</view>
@@ -330,12 +330,19 @@
 				this.OperationType = e.OperationType
 			}
 
+			// 鏂板锛氳幏鍙栬矾鐢卞弬鏁�
+			this.linterid = e.linterid || ''
+			this.HEntryID = e.HEntryID || '0'
+			this.HSouceBillType = e.HSouceBillType || ''
+
 			if (this.OperationType == 1) {
 				// 鏂板
 				this.getMaxNum()
 			} else if (this.OperationType == 2) {
 				// 鏈夋簮鍗�
 				this.getMaxNum()
+				// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+				this.getSourceData(this.linterid, this.HEntryID, this.HSouceBillType)
 			} else if (this.OperationType == 3) {
 				// 缂栬緫
 				this.getEditData(e.hmainid)
@@ -465,17 +472,17 @@
 				});
 			},
 			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
-			async getListData() {
+			getListData() {
 				// 鑾峰彇閮ㄩ棬鍒楄〃
-				await this.getDepartmentList();
+				this.getDepartmentList();
 				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
-				await this.getHErrMesTypeList();
+				this.getHErrMesTypeList();
 				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆侀獙鏀朵汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
-				await this.getPersonList();
+				this.getPersonList();
 				// 鑾峰彇璁惧鍒楄〃
-				await this.getEquipList();
+				this.getEquipList();
 				// 鑾峰彇妯″叿鍒楄〃
-				await this.getModList();
+				this.getModList();
 			},
 
 			// 鑾峰彇閮ㄩ棬鍒楄〃
@@ -664,7 +671,135 @@
 					},
 				});
 			},
+			// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+			getSourceData(HInterID, HEntryID, HSouceBillType) {
+				let num = 1
+				if (HSouceBillType == '4502') {
+					num = 1; //寮傚父鍙嶉鍗�
+				} else if (HSouceBillType == '4529') {
+					num = 2; //寮傚父鍙嶉鎺ユ敹鍗�
+				} else if (HSouceBillType == '4531') {
+					num = 3; //寮傚父鍙嶉澶勭悊鍗�
+				}
 
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList',
+					method: 'GET',
+					data: {
+						"HInterID": HInterID,
+						"HEntryID": HEntryID,
+						"user": uni.getStorageSync('HUserName'),
+						"num": num
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							const LoadData = res.data.data[0]
+
+							if (num == 1) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.HInterID
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.HInterID
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								
+							} else if (num == 2) {
+								// 寮傚父鍙嶉鎺ユ敹鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HReceiveID == undefined ? 0 : LoadData
+									.HReceiveID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎺ユ敹浜�
+								this.hform.HCopyMan = LoadData.鎶勯�佷汉
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.浜у搧鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HEquipID = LoadData.HEquipID
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.HMouldID
+								this.hform.HMouldName = LoadData.妯℃不鍏峰悕绉�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID == undefined ? "0" : LoadData
+									.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+							
+							}else if (num == 2) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.hmainid
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								
+							}
+
+							// 寮哄埗鏇存柊瑙嗗浘
+							this.$forceUpdate()
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						})
+					},
+				})
+			},
+			//缂栬緫
 			getEditData(HInterID) {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -709,12 +844,12 @@
 								HEquipID: data["HEquipID"] || '0',
 								HEquipName: data["璁惧鍚嶇О"] || '',
 
-								HMouldID: data["HMouldID"] || '0', 
+								HMouldID: data["HMouldID"] || '0',
 								HMouldName: data["妯℃不鍏峰悕绉�"] || '',
 
 								HCheckEmpID: data["HCheckEmpID"] || '0',
 								HCheckEmp: data["楠屾敹浜�"] || '',
-								HCheckNote: data["楠屾敹鍐呭"] || '', 
+								HCheckNote: data["楠屾敹鍐呭"] || '',
 								HCheckResult: data["楠屾敹缁撴灉"] || '',
 								HHCheckDate: data["楠屾敹鏃堕棿"] ? dayjs(data["楠屾敹鏃堕棿"]).format(
 									"YYYY-MM-DD HH:mm:ss") : dayjs(new Date()).format("YYYY-MM-DD"),
@@ -725,9 +860,9 @@
 								HMainSourceBillNo: data["婧愬崟鍗曞彿"] || '',
 								HMainSourceBillType: data["婧愬崟绫诲瀷"] || '',
 
-								HErrMsgBackBillNo: data["寮傚父鍙嶉鍗曞彿"] || '', 
-								HErrMsgBackInterID: data["寮傚父鍙嶉鍗曚富鍐呯爜"] || '0', 
-								HErrMsgBackEntryID: data["寮傚父鍙嶉鍗曞瓙鍐呯爜"] || '0', 
+								HErrMsgBackBillNo: data["寮傚父鍙嶉鍗曞彿"] || '',
+								HErrMsgBackInterID: data["寮傚父鍙嶉鍗曚富鍐呯爜"] || '0',
+								HErrMsgBackEntryID: data["寮傚父鍙嶉鍗曞瓙鍐呯爜"] || '0',
 
 								HRemark: data["琛ㄥご澶囨敞"] || '',
 								HMaker: data["鍒跺崟浜�"] || this.userInfo.Czymc || '',
@@ -765,7 +900,7 @@
 					}
 				});
 			},
-
+			//淇濆瓨
 			submit() {
 				if (!this.hform.HReceiveMan) {
 					uni.showToast({
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
index af2286d..dc0a762 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
@@ -93,21 +93,21 @@
 				<view class="form-item">
 					<view class="title">澶勭悊鍘熷洜:</view>
 					<view class="right">
-						<uni-combox :candidates="arrayHBadReasonName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HBadReasonName"
+						<uni-combox :candidates="arrayHBadReasonName" placeholder="璇烽�夋嫨澶勭悊鍘熷洜" v-model="hform.HBadReasonName"
 							@input="HBadReasonNameChange"></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧璁惧:</view>
 					<view class="right">
-						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
+						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
 							@input="HEquipNameChange"></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧妯″叿:</view>
 					<view class="right">
-						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
+						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
 							@input="HMouldIDNameChange"></uni-combox>
 					</view>
 				</view>
@@ -340,13 +340,20 @@
 			} else {
 				this.OperationType = e.OperationType
 			}
-
+			
+			// 鏂板锛氳幏鍙栬矾鐢卞弬鏁�
+			this.linterid = e.linterid || ''
+			this.HEntryID = e.HEntryID || '0'
+			this.HSouceBillType = e.HSouceBillType || ''
+			
 			if (this.OperationType == 1) {
 				// 鏂板
 				this.getMaxNum()
 			} else if (this.OperationType == 2) {
 				// 鏈夋簮鍗�
 				this.getMaxNum()
+				// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+				this.getSourceData(this.linterid, this.HEntryID, this.HSouceBillType)
 			} else if (this.OperationType == 3) {
 				// 缂栬緫
 				this.getEditData(e.hmainid)
@@ -485,19 +492,19 @@
 				});
 			},
 			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
-			async getListData() {
+			getListData() {
 				// 鑾峰彇閮ㄩ棬鍒楄〃
-				await this.getDepartmentList();
+				this.getDepartmentList();
 				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
-				await this.getHErrMesTypeList();
+				this.getHErrMesTypeList();
 				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
-				await this.getPersonList();
+				this.getPersonList();
 				// 鑾峰彇璁惧鍒楄〃
-				await this.getEquipList();
+				this.getEquipList();
 				// 鑾峰彇妯″叿鍒楄〃
-				await this.getModList();
+				this.getModList();
 				// 鑾峰彇澶勭悊鍘熷洜鍒楄〃
-				await this.getBadReasonList();
+				this.getBadReasonList();
 			},
 
 			// 鑾峰彇閮ㄩ棬鍒楄〃
@@ -718,7 +725,104 @@
 					},
 				});
 			},
+			// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+			getSourceData(HInterID, HEntryID, HSouceBillType) {
+				let num = 1
+				if (HSouceBillType == '4502') {
+					num = 1 // 寮傚父鍙嶉鍗�
+				} else if (HSouceBillType == '4529') {
+					num = 2 // 寮傚父鍙嶉鎺ユ敹鍗�
+				}
 
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList',
+					method: 'GET',
+					data: {
+						"HInterID": HInterID,
+						"HEntryID": HEntryID,
+						"user": uni.getStorageSync('HUserName'),
+						"num": num
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							const LoadData = res.data.data[0]
+
+							if (num == 1) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.HInterID
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.HInterID
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								this.hform.HHandleEmpID = LoadData.HHandleEmpID
+								this.hform.HHandleEmpName = LoadData.鎸囨淳澶勭悊浜�
+							} else if (num == 2) {
+								// 寮傚父鍙嶉鎺ユ敹鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HReceiveID == undefined ? 0 : LoadData
+									.HReceiveID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎺ユ敹浜�
+								this.hform.HCopyMan = LoadData.鎶勯�佷汉
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.浜у搧鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HEquipID = LoadData.HEquipID
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.HMouldID
+								this.hform.HMouldName = LoadData.妯℃不鍏峰悕绉�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID == undefined ? "0" : LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HHandleEmpID = LoadData.HHandleEmpID
+								this.hform.HHandleEmpName = LoadData.鎸囨淳澶勭悊浜�
+							}
+
+							// 寮哄埗鏇存柊瑙嗗浘
+							this.$forceUpdate()
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						})
+					},
+				})
+			},
+			//缂栬緫
 			getEditData(HInterID) {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -820,7 +924,7 @@
 					}
 				});
 			},
-
+			//淇濆瓨
 			submit() {
 				if (!this.hform.HReceiveMan) {
 					uni.showToast({
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
index 6442448..d9c5c84 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
@@ -254,7 +254,7 @@
 				HEquipNameList: [],
 				arrayHMouldName: [], //妯″叿
 				HMouldNameList: [],
-		
+
 				isEdit: false,
 
 				hform: {
@@ -273,14 +273,14 @@
 					HDeptID: getUserInfo().HDeptID,
 					HReceiveName: getUserInfo().HDeptName,
 					HReceiveID: getUserInfo().HDeptID,
-					
-					HSendMan: getUserInfo().Czymc,  //鍙戦�佷汉
+
+					HSendMan: getUserInfo().Czymc, //鍙戦�佷汉
 					HReceiveMan: getUserInfo().HEmpName, //鎺ユ敹浜�
-					HSignEmpName: getUserInfo().HEmpName,  //绛惧埌
+					HSignEmpName: getUserInfo().HEmpName, //绛惧埌
 					HSignEmpID: getUserInfo().HEmpID,
 					HCopyMan: '',
 
-					
+
 
 					HLevel: '鏅��',
 					HBillTypeName: '',
@@ -324,6 +324,10 @@
 			} else {
 				this.OperationType = e.OperationType
 			}
+			// 鏂板锛氳幏鍙栬矾鐢卞弬鏁�
+			this.linterid = e.linterid || ''
+			this.HEntryID = e.HEntryID || '0'
+			this.HSouceBillType = e.HSouceBillType || ''
 
 			if (this.OperationType == 1) {
 				// 鏂板
@@ -331,6 +335,8 @@
 			} else if (this.OperationType == 2) {
 				// 鏈夋簮鍗�
 				this.getMaxNum()
+				// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+				this.getSourceData(this.linterid, this.HEntryID, this.HSouceBillType)
 			} else if (this.OperationType == 3) {
 				// 缂栬緫
 				this.getEditData(e.hmainid)
@@ -460,17 +466,17 @@
 				});
 			},
 			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
-			async getListData() {
+			getListData() {
 				// 鑾峰彇閮ㄩ棬鍒楄〃
-				await this.getDepartmentList();
+				this.getDepartmentList();
 				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
-				await this.getHErrMesTypeList();
+				this.getHErrMesTypeList();
 				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
-				await this.getPersonList();
+				this.getPersonList();
 				// 鑾峰彇璁惧鍒楄〃
-				await this.getEquipList();
+				this.getEquipList();
 				// 鑾峰彇妯″叿鍒楄〃
-				await this.getModList();
+				this.getModList();
 			},
 
 			// 鑾峰彇閮ㄩ棬鍒楄〃
@@ -659,7 +665,105 @@
 					},
 				});
 			},
+			// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+			getSourceData(HInterID, HEntryID, HSouceBillType) {
+				let num = 1
+				if (HSouceBillType == '4502') {
+					num = 1 // 寮傚父鍙嶉鍗�
+				} else if (HSouceBillType == '4529') {
+					num = 2 // 寮傚父鍙嶉鎺ユ敹鍗�
+				}
 
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList',
+					method: 'GET',
+					data: {
+						"HInterID": HInterID,
+						"HEntryID": HEntryID,
+						"user": uni.getStorageSync('HUserName'),
+						"num": num
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							const LoadData = res.data.data[0]
+
+							if (num == 1) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.HInterID
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.HInterID
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								this.hform.HSignEmpID = LoadData.HHandleEmpID
+								this.hform.HSignEmpName = LoadData.鎸囨淳澶勭悊浜�
+							} else if (num == 2) {
+								// 寮傚父鍙嶉鎺ユ敹鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HReceiveID == undefined ? 0 : LoadData
+									.HReceiveID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎺ユ敹浜�
+								this.hform.HCopyMan = LoadData.鎶勯�佷汉
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.浜у搧鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HEquipID = LoadData.HEquipID
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.HMouldID
+								this.hform.HMouldName = LoadData.妯℃不鍏峰悕绉�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID == undefined ? "0" : LoadData
+									.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HSignEmpID = LoadData.HHandleEmpID
+								this.hform.HSignEmpName = LoadData.鎸囨淳澶勭悊浜�
+							}
+
+							// 寮哄埗鏇存柊瑙嗗浘
+							this.$forceUpdate()
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						})
+					},
+				})
+			},
+			//缂栬緫
 			getEditData(HInterID) {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -725,18 +829,21 @@
 
 								HRemark: data["琛ㄥご澶囨敞"] || '',
 								HMaker: data["鍒跺崟浜�"] || this.userInfo.Czymc || '',
-								HMakeDate: data["鍒跺崟鏃ユ湡"] ? dayjs(data["鍒跺崟鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+								HMakeDate: data["鍒跺崟鏃ユ湡"] ? dayjs(data["鍒跺崟鏃ユ湡"]).format(
+									"YYYY-MM-DD") : dayjs(
 									new Date()).format("YYYY-MM-DD"),
 
 								HUpDater: data["淇敼浜�"] || this.userInfo.Czymc || '',
-								HUpDateDate: data["淇敼鏃ユ湡"] ? dayjs(data["淇敼鏃ユ湡"]).format("YYYY-MM-DD") :
-									dayjs(new Date()).format("YYYY-MM-DD"),
+								HUpDateDate: data["淇敼鏃ユ湡"] ? dayjs(data["淇敼鏃ユ湡"]).format(
+									"YYYY-MM-DD") : dayjs(new Date()).format("YYYY-MM-DD"),
 
 								HChecker: data["瀹℃牳浜�"] || '',
-								HCheckDate: data["瀹℃牳鏃ユ湡"] ? dayjs(data["瀹℃牳鏃ユ湡"]).format("YYYY-MM-DD") : '',
+								HCheckDate: data["瀹℃牳鏃ユ湡"] ? dayjs(data["瀹℃牳鏃ユ湡"]).format(
+									"YYYY-MM-DD") : '',
 
 								HDeleteMan: data["浣滃簾浜�"] || '',
-								HDeleteDate: data["浣滃簾鏃ユ湡"] ? dayjs(data["浣滃簾鏃ユ湡"]).format("YYYY-MM-DD") : '',
+								HDeleteDate: data["浣滃簾鏃ユ湡"] ? dayjs(data["浣滃簾鏃ユ湡"]).format(
+									"YYYY-MM-DD") : '',
 
 								HLevel: data["绱ф�ョ▼搴�"] || '鏅��'
 							};
@@ -780,7 +887,7 @@
 						this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
 					}
 					var sMainStr = JSON.stringify(this.hform);
-					var sMainSub = sMainStr + ';' + this.refSav + ';' +  uni.getStorageSync('HUserName')
+					var sMainSub = sMainStr + ';' + this.refSav + ';' + uni.getStorageSync('HUserName')
 					uni.request({
 						url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackSignBill_APP',
 						method: 'POST',
diff --git a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
index 9bc91f3..6d8455a 100644
--- a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
@@ -34,47 +34,29 @@
 					</uni-datetime-picker>
 				</view>
 			</view>
-			<view class="search-item">
-				<view class="left">鍗曟嵁鍙�</view>
-				<view class="right">
-					<input type="text" auto-focus v-model="HBillNo" />
-				</view>
-			</view>
 
 			<view class="button-groups">
-				<button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button>
 				<button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
 				<button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
 			</view>
 		</view>
-		
+
 		<!-- 椤电鍖哄煙 -->
 		<view class="tab-container">
 			<view class="tab-list">
-				<view 
-					v-for="(tab, index) in tabs" 
-					:key="index"
-					:class="['tab-item', { 'active': activeTab === index }]"
-					@tap="switchTab(index)"
-				>
+				<view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
+					@tap="switchTab(index)">
 					<text>{{ tab.label }}</text>
 					<text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
+
 		<!-- 椤电鍐呭鍖哄煙 -->
-		<scroll-view 
-			v-for="(tab, tabIndex) in tabs" 
-			:key="tabIndex"
-			v-show="activeTab === tabIndex"
-			id="pageContent" 
-			scroll-y 
-			class="page-content" 
-			:style="{height: pageContentHeight + 'px'}"
-		>
+		<scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+			scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
 			<view class="list" v-for="(item,index) in tab.listData" :key="index">
 				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
 					@tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
@@ -170,50 +152,17 @@
 
 					<view class="op" v-if="operations == item.hmainid">
 						<!-- 鏍规嵁褰撳墠椤电鏄剧ず涓嶅悓鐨勪笅鎺ㄦ寜閽� -->
-						<button 
-							v-if="activeTab === 0 && item.鍗曟嵁鐘舵�� === '宸插弽棣�'" 
-							class="op1" 
-							size="mini" 
-							plain 
-							@tap.stop="pushSignBill(item)"
-						>
+						<button v-if="activeTab === 0 && item.鍗曟嵁鐘舵�� === '宸插弽棣�'" class="op1" size="mini" plain
+							@tap.stop="pushSignBill(item)">
 							涓嬫帹绛惧埌鍗�
 						</button>
-						<button 
-							v-else-if="activeTab === 1 && item.鍗曟嵁鐘舵�� === '宸茬鍒�'" 
-							class="op2" 
-							size="mini" 
-							plain 
-							@tap.stop="pushHandleBill(item)"
-						>
+						<button v-else-if="activeTab === 1 && item.鍗曟嵁鐘舵�� === '宸茬鍒�'" class="op2" size="mini" plain
+							@tap.stop="pushHandleBill(item)">
 							涓嬫帹澶勭悊鍗�
 						</button>
-						<button 
-							v-else-if="activeTab === 2 && item.鍗曟嵁鐘舵�� === '宸插鐞�'" 
-							class="op3" 
-							size="mini" 
-							plain 
-							@tap.stop="pushCheckBill(item)"
-						>
+						<button v-else-if="activeTab === 2 && item.鍗曟嵁鐘舵�� === '宸插鐞�'" class="op3" size="mini" plain
+							@tap.stop="pushCheckBill(item)">
 							涓嬫帹楠屾敹鍗�
-						</button>
-						<button 
-							v-else-if="activeTab === 3" 
-							class="op3" 
-							size="mini" 
-							plain 
-							@tap.stop="pushAllTab(item)"
-						>
-							涓嬫帹鍗曟嵁
-						</button>
-						<button 
-							v-else 
-							class="op5" 
-							size="mini" 
-							plain 
-							disabled
-						>
-							鏃犳硶涓嬫帹
 						</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
 					</view>
@@ -221,17 +170,12 @@
 			</view>
 			<view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
 		</scroll-view>
-		
+
 		<!-- 鍒嗛〉鍣� -->
 		<view class="page-footer">
-			<uni-pagination 
-				id="pagination" 
-				title="鏍囬鏂囧瓧" 
-				v-model="tabs[activeTab].pageMeta.curPage" 
-				:pageSize="tabs[activeTab].pageMeta.size"
-				:total="tabs[activeTab].pageMeta.total" 
-				@change="onPageChangeHandler"
-			></uni-pagination>
+			<uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
+				:pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
+				@change="onPageChangeHandler"></uni-pagination>
 		</view>
 	</view>
 </template>
@@ -250,42 +194,56 @@
 				// 璁$畻鍗$墖鍒楄〃楂樺害
 				pagination_top: 0,
 				pageContent_top: 0,
-				
+
 				// 褰撳墠婵�娲荤殑椤电
 				activeTab: 0,
-				
-				// 椤电鏁版嵁
-				tabs: [
-					{
+
+				tabs: [{
 						label: '寰呯鍒�',
 						type: 0,
-						listData: [],
-						pageMeta: { curPage: 1, size: 50, total: 0 },
-						count: 0
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
 					},
 					{
 						label: '寰呭鐞�',
 						type: 1,
-						listData: [],
-						pageMeta: { curPage: 1, size: 50, total: 0 },
-						count: 0
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
 					},
 					{
 						label: '寰呴獙鏀�',
 						type: 2,
-						listData: [],
-						pageMeta: { curPage: 1, size: 50, total: 0 },
-						count: 0
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
 					},
 					{
 						label: '鍏ㄩ儴鍗曟嵁',
 						type: 3,
-						listData: [],
-						pageMeta: { curPage: 1, size: 50, total: 0 },
-						count: 0
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
 					}
 				],
-				
+
 				// 婊氬姩鎺у埗
 				scrollTop: 0,
 				old: {
@@ -347,18 +305,14 @@
 					this.scrollTop = 0
 				});
 			},
-			
+
 			// 鍒囨崲椤电
 			switchTab(index) {
 				this.activeTab = index
 				this.showDetail = -1
 				this.operations = -1
-				// 濡傛灉褰撳墠椤电娌℃湁鏁版嵁锛屽垯鏌ヨ
-				if (this.tabs[index].listData.length === 0) {
-					this.onSearchClickHandler()
-				}
 			},
-			
+
 			onDateRangePickerChangeHandler({
 				detail
 			}) {
@@ -398,38 +352,18 @@
 					this.enableCustomDateRange = true
 				}
 			},
-			
+
 			onSearchClickHandler() {
 				let sWhere = ""
-				if (this.startDate) {
-					sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
-				}
-				if (this.endDate) {
-					sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.endDate + "'";
-				}
-				if (this.HBillNo) {
-					sWhere += " and 鍗曟嵁鍙� like '%" + this.HBillNo + "%'";
-				}
-				
-				// 鏍规嵁褰撳墠椤电绫诲瀷娣诲姞鐘舵�佹潯浠�
+				// 鑾峰彇褰撳墠婵�娲荤殑椤电
 				const currentTab = this.tabs[this.activeTab]
-				switch (currentTab.type) {
-					case 0: // 寰呯鍒�
-						sWhere += " and 鍗曟嵁鐘舵�� = '宸插弽棣�'"
-						break
-					case 1: // 寰呭鐞�
-						sWhere += " and 鍗曟嵁鐘舵�� = '宸茬鍒�'"
-						break
-					case 2: // 寰呴獙鏀�
-						sWhere += " and 鍗曟嵁鐘舵�� = '宸插鐞�'"
-						break
-					case 3: // 鍏ㄩ儴鍗曟嵁 - 涓嶉渶瑕佹坊鍔犵姸鎬佹潯浠�
-						break
+				sWhere = {
+					HBeginDate: this.startDate,
+					HEndDate: this.endDate
 				}
-				
-				this.get_DisplayPage(sWhere, currentTab.type)
+				this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
 			},
-			
+
 			clear() {
 				this.curDateGap = "杩戜竷澶�"
 				this.enableCustomDateRange = false
@@ -437,23 +371,19 @@
 				this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
 				this.HBillNo = ''
 			},
-			
+
 			async onResetClickHandler() {
 				this.clear()
 				await this.$nextTick()
 				this.onSearchClickHandler()
 			},
-			
+
 			get_DisplayPage(sWhere, tabType) {
-				const currentTab = this.tabs.find(tab => tab.type === tabType)
-				
 				CommonUtils.doRequest2({
-					url: '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackReceiveBillListPage',
+					url: '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery_APP',
 					data: {
 						"sWhere": sWhere,
 						"user": getUserInfo()["Czymc"],
-						"page": currentTab.pageMeta.curPage,
-						"size": currentTab.pageMeta.size
 					},
 					resFunction: (res) => {
 						let {
@@ -461,47 +391,73 @@
 							Message,
 							count
 						} = res.data
-						console.log('res.data: ', res.data);
-						
-						// 鏇存柊褰撳墠椤电鐨勬暟鎹�
-						currentTab.listData = data
-						currentTab.pageMeta.total = count
-						currentTab.count = data.length
-						
+						console.log('res.data: ', res.data)
+
+						// 灏嗘暟鎹垎鍒祴鍊肩粰瀵瑰簲鐨勯〉绛�
+						// h_p_OA_ErrMsgBackSelfQuery_APP: 寰呯鍒�
+						// h_p_OA_ErrMsgBackSelfQuery_APP1: 寰呭鐞�
+						// h_p_OA_ErrMsgBackSelfQuery_APP2: 寰呴獙鏀�
+						// h_p_OA_ErrMsgBackSelfQuery_APP3: 鍏ㄩ儴鍗曟嵁
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP) {
+							// 鏇存柊寰呯鍒伴〉绛�
+							this.tabs[0].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP
+							this.tabs[0].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP.length
+							this.tabs[0].count = data.h_p_OA_ErrMsgBackSelfQuery_APP.length
+						}
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP1) {
+							// 鏇存柊寰呭鐞嗛〉绛�
+							this.tabs[1].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP1
+							this.tabs[1].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP1.length
+							this.tabs[1].count = data.h_p_OA_ErrMsgBackSelfQuery_APP1.length
+						}
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP2) {
+							// 鏇存柊寰呴獙鏀堕〉绛�
+							this.tabs[2].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP2
+							this.tabs[2].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+							this.tabs[2].count = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+						}
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP3) {
+							// 鏇存柊鍏ㄩ儴鍗曟嵁椤电
+							this.tabs[3].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP3
+							this.tabs[3].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP3.length
+							this.tabs[3].count = data.h_p_OA_ErrMsgBackSelfQuery_APP3.length
+						}
+
 						uni.stopPullDownRefresh()
 					}
 				})
 			},
-			
+
 			onPageChangeHandler() {
 				this.onSearchClickHandler()
 				this.goTop()
 			},
-			
-			// 鏂板寮傚父鍙嶉鍗�
-			onAddClickHandler() {
-				uni.navigateTo({
-					url: "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill?OperationType=1"
-				})
-			},
-			
+
 			// 涓嬫帹寮傚父鍙嶉绛惧埌鍗� (椤电1锛氬緟绛惧埌)
 			pushSignBill(item) {
 				if (item.鍗曟嵁鐘舵�� !== '宸插弽棣�') {
 					uni.showToast({
-						title: '褰撳墠鍗曟嵁鐘舵�佷笉鍏佽涓嬫帹绛惧埌鍗�',
+						title: '褰撳墠鍗曟嵁鐘舵�佷笉鍏佽涓嬫帹寮傚父鍙嶉绛惧埌鍗�',
 						icon: 'none'
 					})
 					return
 				}
-				
+
 				console.log('涓嬫帹绛惧埌鍗�:', item)
 				uni.navigateTo({
-					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=2&linterid=' + 
-						item.hmainid + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502'
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=2&linterid=' +
+						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
+					}
 				})
 			},
-			
+
 			// 涓嬫帹寮傚父鍙嶉澶勭悊鍗� (椤电2锛氬緟澶勭悊)
 			pushHandleBill(item) {
 				if (item.鍗曟嵁鐘舵�� !== '宸茬鍒�') {
@@ -511,14 +467,18 @@
 					})
 					return
 				}
-				
+
 				console.log('涓嬫帹澶勭悊鍗�:', item)
 				uni.navigateTo({
-					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=2&linterid=' + 
-						item.hmainid + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502'
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=2&linterid=' +
+						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
+					}
 				})
 			},
-			
+
 			// 涓嬫帹寮傚父鍙嶉楠屾敹鍗� (椤电3锛氬緟楠屾敹)
 			pushCheckBill(item) {
 				if (item.鍗曟嵁鐘舵�� !== '宸插鐞�') {
@@ -528,90 +488,16 @@
 					})
 					return
 				}
-				
+
 				console.log('涓嬫帹楠屾敹鍗�:', item)
 				uni.navigateTo({
-					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=2&linterid=' + 
-						item.hmainid + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502'
-				})
-			},
-			
-			// 鍏ㄩ儴鍗曟嵁椤电鐨勪笅鎺ㄦ搷浣�
-			pushAllTab(item) {
-				let url = ''
-				
-				// 鏍规嵁鍗曟嵁鐘舵�佸喅瀹氫笅鎺ㄥ摢绉嶅崟鎹�
-				switch (item.鍗曟嵁鐘舵��) {
-					case '宸插弽棣�':
-						url = '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=2&linterid=' + 
-							item.hmainid + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502'
-						break
-					case '宸茬鍒�':
-						url = '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=2&linterid=' + 
-							item.hmainid + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502'
-						break
-					case '宸插鐞�':
-						url = '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=2&linterid=' + 
-							item.hmainid + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502'
-						break
-					default:
-						uni.showToast({
-							title: '褰撳墠鍗曟嵁鐘舵�佷笉鍏佽涓嬫帹',
-							icon: 'none'
-						})
-						return
-				}
-				
-				console.log('涓嬫帹鍗曟嵁:', item)
-				uni.navigateTo({
-					url: url
-				})
-			},
-			
-			// 鍒犻櫎寮傚父鍙嶉绛惧埌鍗�
-			del(item) {
-				uni.showModal({
-					title: '鍒犻櫎纭',
-					content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							CommonUtils.doRequest2({
-								url: '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackReceiveBill',
-								data: {
-									HInterID: item['hmainid'],
-									user: getUserInfo()['Czymc']
-								},
-								resFunction: (res) => {
-									let {
-										data,
-										count,
-										Message
-									} = res.data
-									if (count == 1) {
-										uni.showToast({
-											icon: count === 1 ? 'success' : 'error',
-											title: Message,
-											duration: 2000
-										});
-
-										// 绛夊緟鎻愮ず鏄剧ず瀹屾垚鍐嶅埛鏂�
-										setTimeout(() => {
-											this.onSearchClickHandler();
-										}, 2000);
-									} else {
-										uni.showToast({
-											icon: 'none',
-											title: Message
-										})
-									}
-								}
-							})
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=2&linterid=' +
+						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
 					}
-				});
+				})
 			}
 		},
 	}
@@ -704,18 +590,18 @@
 			color: #fff;
 		}
 	}
-	
+
 	/* 椤电鏍峰紡 */
 	.tab-container {
 		background-color: #fff;
 	}
-	
+
 	.tab-list {
 		display: flex;
 		flex-direction: row;
 		border-bottom: 1px solid #e5e5e5;
 	}
-	
+
 	.tab-item {
 		flex: 1;
 		padding: 20rpx 0;
@@ -723,11 +609,11 @@
 		font-size: 28rpx;
 		color: #666;
 		position: relative;
-		
+
 		&.active {
 			color: #3a78ff;
 			font-weight: bold;
-			
+
 			&::after {
 				content: '';
 				position: absolute;
@@ -739,7 +625,7 @@
 				background-color: #3a78ff;
 			}
 		}
-		
+
 		.tab-count {
 			display: inline-block;
 			margin-left: 10rpx;
@@ -799,7 +685,7 @@
 				padding: 0;
 				width: 150rpx;
 				font-size: 25rpx;
-				
+
 				&:disabled {
 					opacity: 0.5;
 				}
@@ -831,7 +717,7 @@
 			}
 		}
 	}
-	
+
 	.over {
 		text-align: center;
 		padding: 40rpx;
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 4bcb3a1..06c5dde 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -6,15 +6,15 @@
 			</view>
 		</view>
 		<view class="mains">
-			<view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData" :key="index"
-				@tap="toUrl(item)">
+			<view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
+				:key="index" @tap="toUrl(item)">
 				<image :src="item.img" mode=""></image>
 				<view class="texts">
 					{{item.text}}
 				</view>
 			</view>
-			<view :enable-hidden="item.hidden" :hidden="!item.id" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
-				:key="index" @tap="switchHidden(index)">
+			<view :enable-hidden="item.hidden" :hidden="!item.id" v-if="canEdit" class="box edit"
+				v-for="(item,index) in itemData" :key="index" @tap="switchHidden(index)">
 				<uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
 				<image :src="item.img" mode=""></image>
 				<view class="texts">
@@ -230,7 +230,7 @@
 						url: '/pages/gongxuIn/Cj_StationInBillList',
 						id: 25,
 						hidden: false,
-					}, 
+					},
 					{
 						img: '../../static/icon/icon10.png',
 						text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
@@ -238,7 +238,7 @@
 						url: '/pages/gongxuOut/Cj_StationOutBillList',
 						id: 26,
 						hidden: false,
-					}, 
+					},
 					{
 						img: '../../static/icon/icon11.png',
 						text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
@@ -246,7 +246,7 @@
 						url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
 						id: 27,
 						hidden: false,
-					}, 
+					},
 					{
 						img: '../../static/icon/icon12.png',
 						text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
@@ -254,7 +254,7 @@
 						url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
 						id: 28,
 						hidden: false,
-					}, 
+					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
@@ -311,101 +311,127 @@
 						"id": 36,
 						"hidden": false
 					},
-					
-					{
-						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
-						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
-						"id": 37,
-						"hidden": false
-					},
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿鏁呴殰鐧昏鍒楄〃",
 						"url": "/pages/qijvguzhangdengji/mouldMistake",
+						"id": 37,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨娲惧伐鍗曞垪琛�",
+						"url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
 						"id": 38,
+						"hidden": false
+					},
+
+					{
+						"img": "../../static/icon/icon13.png",
+						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
+						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
+						"id": 39,
+						"hidden": false
+					},
+
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨楠屾敹鍗曞垪琛�",
+						"url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
+						"id": 40,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "棣栦欢妫�楠屽崟鍒楄〃",
 						"url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
-						"id": 39,
+						"id": 41,
 						"hidden": false
 					},
 					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "宸℃妫�楠屽崟鍒楄〃",
-					    "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
-					    "id": 40,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "宸℃妫�楠屽崟鍒楄〃",
+						"url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+						"id": 42,
+						"hidden": false
 					},
 					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "鏈欢妫�楠屽崟鍒楄〃",
-					    "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
-					    "id": 41,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "鏈欢妫�楠屽崟鍒楄〃",
+						"url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+						"id": 43,
+						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鏉ユ枡妫�楠屽垪琛�",
 						"url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
-						"id": 42,
+						"id": 44,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍏ㄦ妫�楠屽崟鍒楄〃",
 						"url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
-						"id": 43,
+						"id": 45,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "杞﹂棿鑷鍗曞垪琛�",
 						"url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
-						"id": 44,
+						"id": 46,
 						"hidden": false
 					},
-					// 鏍囩鏉$爜鐩稿叧
-					
-
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
+						"url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+						"id": 47,
+						"hidden": false
+					},
 					// 璁惧鐩稿叧
 					{
 						"img": "../../static/icon/icon3.png",
 						"text": "璁惧鐐规璁板綍鍗曞垪琛�",
 						"url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
-						"id": 45,
+						"id": 48,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon3.png",
 						"text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
 						"url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
-						"id": 46,
+						"id": 49,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon6.png",
 						"text": "璁惧鏁呴殰鐧昏琛ㄥ垪琛�",
 						"url": "/pages/guzhangdengji/EqpConkBookBillList",
-						"id":47,
+						"id": 50,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨娲惧伐鍗曞垪琛�",
+						"url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
+						"id": 51,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon7.png",
 						"text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
 						"url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
-						"id": 48,
+						"id": 52,
 						"hidden": false
 					},
 					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "璁惧缁翠慨楠屾敹鍗曞垪琛�",
-					    "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
-					    "id": 49,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨楠屾敹鍗曞垪琛�",
+						"url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
+						"id": 53,
+						"hidden": false
 					},
 
 					// 瀹夌伅鐩稿叧
@@ -413,59 +439,59 @@
 						"img": "../../static/icon/icon15.png",
 						"text": "寮傚父鍙嶉鍗曞垪琛�",
 						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
-						"id": 50,
+						"id": 54,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
 						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
-						"id": 51,
+						"id": 55,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
 						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
-						"id": 52,
+						"id": 56,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
 						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
-						"id": 53,
+						"id": 57,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
 						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
-						"id": 54,
+						"id": 58,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
 						"url": "/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
-						"id": 55,
+						"id": 59,
 						"hidden": false
 					},
-					
+
 
 					// 鍙栨牱杩樻牱鐩稿叧
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍙栨牱鍗曞垪琛�",
 						"url": "/pages/quyangdan/TakeSampleCheckBillList",
-						"id": 56,
+						"id": 60,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "杩樻牱鍗曞垪琛�",
 						"url": "/pages/huanyangdan/BackSampleCheckBillList",
-						"id": 57,
+						"id": 61,
 						"hidden": false
 					},
 
@@ -473,18 +499,9 @@
 						"img": "../../static/icon/icon8.png",
 						"text": "瑁呯鍗曟殏瀛樺垪琛�",
 						"url": "/pages/zhuangxiangdan/table",
-						"id": 58,
+						"id": 62,
 						"hidden": false
 					},
-					
-					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
-					    "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
-					    "id": 59,
-					    "hidden": false
-					}
-                    
 				]
 			}
 		},
@@ -501,13 +518,13 @@
 				})
 				Array.from(data).forEach(e => {
 					this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
-					this.itemData[e["HIndex"]].id = e["HEntryID"];//id涓�0寮哄埗闅愯棌
+					this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
 				})
 			},
 			switchHidden(index) {
 				this.updateCount++;
 				this.itemData[index].hidden = !this.itemData[index].hidden
-				
+
 			},
 			switchIconsModeHandler() {
 				this.canEdit = !this.canEdit
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 88c3515..3bfaf07 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -6,15 +6,15 @@
 			</view>
 		</view>
 		<view class="mains">
-			<view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData" :key="index"
-				@tap="toUrl(item)">
+			<view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
+				:key="index" @tap="toUrl(item)">
 				<image :src="item.img" mode=""></image>
 				<view class="texts">
 					{{item.text}}
 				</view>
 			</view>
-			<view :enable-hidden="item.hidden" :hidden="!item.id" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
-				:key="index" @tap="switchHidden(index)">
+			<view :enable-hidden="item.hidden" :hidden="!item.id" v-if="canEdit" class="box edit"
+				v-for="(item,index) in itemData" :key="index" @tap="switchHidden(index)">
 				<uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
 				<image :src="item.img" mode=""></image>
 				<view class="texts">
@@ -43,15 +43,14 @@
 				menuListName: 'tab3',
 				canEdit: false,
 				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				itemData: [
-					{
+				itemData: [{
 						img: '../../static/icon/icon6.png',
 						text: '妯″叿鐘舵�佸垎鏋�',
 						tip: '鏌ョ湅璇︽儏',
 						url: '/pages/mujvzhuangtai/mujvzhuangtai',
 						id: 1,
 						hidden: false,
-					
+
 					},
 					{
 						img: '../../static/icon/icon8.png',
@@ -75,155 +74,127 @@
 						"hidden": false
 					},
 					{
-						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿缁翠慨璁板綍鍗�",
-						"url": "/pages/weixiujilu/mouldRepairRecordBill",
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨娲惧伐鍗�",
+						"url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
 						"id": 5,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿缁翠慨楠屾敹鍗�",
+						"text": "妯″叿缁翠慨璁板綍鍗�",
 						"url": "/pages/weixiujilu/mouldRepairRecordBill",
 						"id": 6,
 						"hidden": false
 					},
 					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "妯″叿鐐规璁板綍鍗�",
-					    "url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
-					    "id": 7,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨楠屾敹鍗�",
+						"url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
+						"id": 7,
+						"hidden": false
 					},
 					{
-					    "img":"../../static/icon/icon8.png",
-					    "text": "妯″叿淇濆吇璁板綍鍗�",
-					    "url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
-					    "id": 8,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿鐐规璁板綍鍗�",
+						"url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
+						"id": 8,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿淇濆吇璁板綍鍗�",
+						"url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
+						"id": 9,
+						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿棰嗙敤鍑哄簱鍗�",
 						"url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-						"id": 9,
+						"id": 10,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿棰嗙敤閫�搴撳崟",
 						"url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
-						"id": 10,
+						"id": 11,
 						"hidden": false
 					},
 					{
 						img: '../../static/icon/icon8.png',
 						text: '涓婃ā鍗�',
 						url: `/pages/MJGL/shangmudan/MouldUpperBill`,
-						id: 11,
+						id: 12,
 						hidden: false,
 					},
 					{
 						img: '../../static/icon/icon8.png',
 						text: '涓嬫ā鍗�',
 						url: `/pages/MJGL/xiamodan/MouldLowerBill`,
-						id: 12,
+						id: 13,
 						hidden: false,
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿鎶ュ簾鍑哄簱鍗�",
 						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
-						"id": 13,
+						"id": 14,
 						"hidden": false
 					},
-                    {
-                    	img: '../../static/icon/icon1.png',
-                    	text: '璁惧妗f鏌ヨ',
-                    	tip: '鏌ョ湅璇︽儏',
-                    	url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
-                    	id: 14,
-                    	hidden: true,
-                    }, 
 					{
-                    	img: '../../static/icon/icon8.png',
-                    	text: '璁惧灞ュ巻鏌ヨ',
-                    	tip: '鏌ョ湅璇︽儏',
-                    	url: '/pages/shebeilvli/EquipFileBillResume',
-                    	id: 15,
-                    	hidden: true,
-                    }, 
+						img: '../../static/icon/icon1.png',
+						text: '璁惧妗f鏌ヨ',
+						tip: '鏌ョ湅璇︽儏',
+						url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
+						id: 15,
+						hidden: true,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '璁惧灞ュ巻鏌ヨ',
+						tip: '鏌ョ湅璇︽儏',
+						url: '/pages/shebeilvli/EquipFileBillResume',
+						id: 16,
+						hidden: true,
+					},
 					{
 						img: '../../static/icon/icon32.png',
 						text: '璁惧杩愯鐘舵��',
 						tip: '鏌ョ湅璇︽儏',
 						url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-						id: 16,
+						id: 17,
 						hidden: true,
-					}, 
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧淇濆吇璁板綍鍗�",
-                        "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
-                        "id": 17,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧鐐规璁板綍鍗�",
-                        "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
-                        "id": 18,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧缁翠慨楠屾敹鍗�",
-                        "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
-                        "id": 57,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧缁翠慨娲惧伐鍗曞垪琛�",
-                        "url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
-                        "id": 58,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧缁翠慨娲惧伐鍗�",
-                        "url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
-                        "id": 59,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨楠屾敹鍗曞垪琛�",
-                        "url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
-                        "id": 60,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨楠屾敹鍗�",
-                        "url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
-                        "id": 61,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨娲惧伐鍗曞垪琛�",
-                        "url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
-                        "id": 62,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨娲惧伐鍗�",
-                        "url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
-                        "id": 63,
-                        "hidden": false
-                    }
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧鐐规璁板綍鍗�",
+						"url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+						"id": 18,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧淇濆吇璁板綍鍗�",
+						"url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+						"id": 19,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨娲惧伐鍗�",
+						"url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
+						"id": 21,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨楠屾敹鍗�",
+						"url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
+						"id": 23,
+						"hidden": false
+					},
 				]
 			}
 		},
@@ -240,13 +211,13 @@
 				})
 				Array.from(data).forEach(e => {
 					this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
-					this.itemData[e["HIndex"]].id = e["HEntryID"];//id涓�0寮哄埗闅愯棌
+					this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
 				})
 			},
 			switchHidden(index) {
 				this.updateCount++;
 				this.itemData[index].hidden = !this.itemData[index].hidden
-				
+
 			},
 			switchIconsModeHandler() {
 				this.canEdit = !this.canEdit

--
Gitblit v1.9.1