From 1edeaff726ff18b25ad77598d9bff611952ff33b Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 7 Dec 2023 10:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=90=8E=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/count/job/countDetail.vue               | 17 +-----
 pages/count/record/countRecord.vue            | 20 +------
 pages/customerReturn/job/returnDetail.vue     |  6 +-
 pages/deliver/job/deliverDetail.vue           |  8 +--
 .../inventoryMove/job/inventoryMoveDetail.vue | 16 +-----
 .../issue-按批次推荐/job/issueDetail.vue |  4 --
 pages/issue/job/issueDetail.vue               |  9 +--
 pages/issue/job/issueReceiptJob.vue           |  2 +-
 .../job/productDismantleDetail.vue            | 16 ++----
 .../job/productPutawayDetail.vue              |  5 +-
 .../job/productReceiptDetail.vue              |  7 +--
 .../job/productionReceiptDetail.vue           | 56 +++++++++----------
 pages/productionReturn/coms/comReturn.vue     | 10 ----
 pages/productionReturn/job/returnDetail.vue   |  6 +-
 pages/repleinsh/job/repleinshDetail.vue       |  9 +--
 pages/scrap/job/scrapJobDetail.vue            | 16 +-----
 pages/transfer/job/issueDetail.vue            | 16 +-----
 pages/transfer/job/receiptDetail.vue          | 16 +-----
 pages/transfer/job/transferDetail.vue         | 18 +-----
 pages/unPlanned/job/issueJobDetail.vue        | 16 +-----
 pages/unPlanned/job/receiptJobDetail.vue      | 19 +------
 21 files changed, 66 insertions(+), 226 deletions(-)

diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index aae27b25..7b38c44f 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -47,6 +47,7 @@
 
 	import {
 		goHome,
+		navigateBack,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 
@@ -562,15 +563,6 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
 			editItem(item) {
 				var detail = this.detailSource.find(r => r.itemCode == item.record.itemCode);
 				this.$refs.CountQtyEdit.openEditPopup(item.record,
@@ -579,13 +571,8 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1);
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			}
 		}
 
diff --git a/pages/count/record/countRecord.vue b/pages/count/record/countRecord.vue
index 29f99d2e..9e6dac39 100644
--- a/pages/count/record/countRecord.vue
+++ b/pages/count/record/countRecord.vue
@@ -47,7 +47,8 @@
 <script>
 	import {
 		goHome,
-		getDataSource
+		getDataSource,
+		navigateBack
 	} from '@/common/basic.js';
 	
 	import {
@@ -497,25 +498,10 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			},
 		}
 	}
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 8affa224..9ddd64d4 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -50,7 +50,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 		getDirectoryItemArray
@@ -478,9 +478,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './returnJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index 9417f7d4..eb804fbb 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -57,6 +57,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
 		getDirectoryItemArray,
@@ -374,9 +375,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './deliverJob'
-					})
+					navigateBack(1)
 				})
 			},
 
@@ -384,9 +383,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
 
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
index 52498132..b1a24cbf 100644
--- a/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -50,6 +50,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
@@ -414,22 +415,9 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './inventoryMoveJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inventoryMoveJob'
-					})
+					navigateBack(1)
 				})
 			},
 
diff --git a/pages/issue-按批次推荐/job/issueDetail.vue b/pages/issue-按批次推荐/job/issueDetail.vue
index 64951b0a..5d5578af 100644
--- a/pages/issue-按批次推荐/job/issueDetail.vue
+++ b/pages/issue-按批次推荐/job/issueDetail.vue
@@ -628,10 +628,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
 			},
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 5bdd2585..0e62f073 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -40,6 +40,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getRemoveOption,
 		getISODateTime,
 		getCurrDateTime,
@@ -393,9 +394,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
+					navigateBack(1)
 				})
 			},
 
@@ -403,10 +402,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
diff --git a/pages/issue/job/issueReceiptJob.vue b/pages/issue/job/issueReceiptJob.vue
index 6c4887e5..cf23b6a8 100644
--- a/pages/issue/job/issueReceiptJob.vue
+++ b/pages/issue/job/issueReceiptJob.vue
@@ -33,7 +33,7 @@
 
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
 	} from '@/common/basic.js';
 
 	import {
diff --git a/pages/productDismantle/job/productDismantleDetail.vue b/pages/productDismantle/job/productDismantleDetail.vue
index 5641a2c4..7ef66caf 100644
--- a/pages/productDismantle/job/productDismantleDetail.vue
+++ b/pages/productDismantle/job/productDismantleDetail.vue
@@ -14,7 +14,7 @@
 			</scroll-view>
 		</view>
 
-		
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
@@ -54,6 +54,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 	} from '@/common/basic.js';
@@ -369,7 +370,7 @@
 					}
 				});
 			},
-			
+
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
@@ -483,14 +484,9 @@
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
-					this.$refs.comMessage.showSuccessMessage(hint, res => {
-
-					})
-					uni.navigateTo({
-						url: './putawayJob'
-					})
-				}, 3000)
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
 			},
 		}
 	}
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index 538b27bb..7b7fa0cc 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -53,6 +53,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 	} from '@/common/basic.js';
@@ -469,9 +470,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './putawayJob'
-					})
+					navigateBack(1);
 				})
 			},
 		}
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 8bb89015..1ea8efa7 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -14,8 +14,6 @@
 			</scroll-view>
 		</view>
 
-		
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
@@ -50,6 +48,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
 	
@@ -403,9 +402,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './productReceiptJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index 3bc87dc6..5e07d2c9 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -14,7 +14,7 @@
 			</scroll-view>
 		</view>
 
-		
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
@@ -53,6 +53,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
@@ -234,7 +235,7 @@
 
 			getScanResult(result) {
 				try {
-					var supplierCode =result.package.supplierCode
+					var supplierCode = result.package.supplierCode
 					var packingNumber = result.balance.packingNumber;
 					var batch = result.balance.batch;
 					var qty = result.balance.qty;
@@ -266,14 +267,14 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.supplierCode =supplierCode
+												itemDetail.supplierCode = supplierCode
 												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
 													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty =result.package.stdPackQty
-												itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+												itemDetail.balance.stdPackQty = result.package.stdPackQty
+												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 												this.calcHandleQty();
 											} else {
 												this.scanPopupGetFocus();
@@ -320,7 +321,7 @@
 				if (!this.checkLocation()) {
 					return
 				}
-			
+
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
@@ -341,19 +342,19 @@
 					}
 				}
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描目库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
 			},
-			
+
 			showMessageHint(hint, callback) {
 				this.$refs.comMessage.showErrorMessage(hint, res => {
 					if (res) {
@@ -362,7 +363,7 @@
 				});
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -371,13 +372,13 @@
 				this.detailSource.forEach(item => {
 					itemCodes.push(item.itemCode)
 				})
-				
-				getManagementPrecisions(itemCodes,this.toLocationCode, res => {
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
 						var params = this.setParams()
-						console.log("提交参数",JSON.stringify(params));
-												
+						console.log("提交参数", JSON.stringify(params));
+
 						productionReceiptJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
@@ -395,27 +396,27 @@
 					}
 				});
 			},
-			
+
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-				
+
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.batch);
-								detail.toPackingNumber = info.packingNumber;
-								detail.toBatch =info.batch;
-								detail.toContainerNumber = "";
-								detail.toLocationCode =this.toLocationCode;
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = "";
+							detail.toLocationCode = this.toLocationCode;
 
 							subList.push(detail)
 						}
 					})
 				})
 				this.jobContent.subList = subList
-				this.jobContent.creator =creator;
+				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
 
@@ -463,7 +464,7 @@
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
-			
+
 			scanLocationCode(location, code) {
 				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
@@ -476,14 +477,9 @@
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
-					this.$refs.comMessage.showSuccessMessage(hint, res => {
-
-					})
-					uni.navigateTo({
-						url: './putawayJob'
-					})
-				}, 3000)
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
 			},
 		}
 	}
diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue
index 19399fdb..0d0852f9 100644
--- a/pages/productionReturn/coms/comReturn.vue
+++ b/pages/productionReturn/coms/comReturn.vue
@@ -434,16 +434,6 @@
 
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			/**
 			 * BlobUrl转blob数据  
 			 * @param {Object} url blob URL
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 915013ad..23fe99d2 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -45,7 +45,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 	import {
@@ -462,9 +462,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './returnJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 48e32a23..6cd8882c 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -41,6 +41,7 @@
 	import {
 		goHome,
 		updateTitle,
+		navigateBack,
 		getRemoveOption,
 		getCurrDateTime,
 		getDirectoryItemArray,
@@ -370,9 +371,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './repleinshJob'
-					})
+					navigateBack(1)
 				})
 			},
 
@@ -380,10 +379,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
index a8b5c49c..d48ea17c 100644
--- a/pages/scrap/job/scrapJobDetail.vue
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -39,7 +39,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray,
 		getInventoryStatusName,
@@ -378,21 +378,9 @@
 				this.$refs.scanPopup.losefocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './scrapJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './scrapJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index ff37bd16..d18cd3c8 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -48,7 +48,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 		getDirectoryItemArray
@@ -504,21 +504,9 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
+					navigateBack(1)
 				})
 			},
 
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index 43414045..69bb6c42 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -45,7 +45,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 		getDirectoryItemArray
@@ -480,21 +480,9 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
+					navigateBack(1)
 				})
 			},
 
diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue
index 34898383..5d681b23 100644
--- a/pages/transfer/job/transferDetail.vue
+++ b/pages/transfer/job/transferDetail.vue
@@ -42,6 +42,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
 	} from '@/common/basic.js';
@@ -523,16 +524,6 @@
 				this.scanPopupGetFocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			/**
 			 * BlobUrl转blob数据  
 			 * @param {Object} url blob URL
@@ -553,13 +544,8 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			},
 
 		}
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
index db933ccd..72c9d06a 100644
--- a/pages/unPlanned/job/issueJobDetail.vue
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -44,7 +44,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray,
 		getInventoryStatusName,
@@ -380,21 +380,9 @@
 
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index f6773f8f..be821db4 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -46,7 +46,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray
 	} from '@/common/basic.js';
@@ -379,25 +379,10 @@
 				this.$refs.scanPopup.losefocus();
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
 				})
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
-				}, 3000)
 			},
 		}
 	}