修改任务提交后跳转

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)
 			}
 		}
 

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)
 			},
 		}
 	}

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({
+					navigateBack(1)
-						url: './returnJob'
-					})
 				})
 			},
 		}

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({
+					navigateBack(1)
-						url: './deliverJob'
-					})
 				})
 			},
 
@@ -384,9 +383,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
 
 			afterCloseMessage() {
 				this.scanPopupGetFocus();

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({
+					navigateBack(1)
-						url: './inventoryMoveJob'
-					})
 				})
 			},
 

pages/issue-按批次推荐/job/issueDetail.vue

@@ -628,10 +628,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
 			},

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({
+					navigateBack(1)
-						url: './issueJob'
-					})
 				})
 			},
 
@@ -403,10 +402,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},

pages/issue/job/issueReceiptJob.vue

@@ -33,7 +33,7 @@
 
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
 	} from '@/common/basic.js';
 
 	import {

pages/productDismantle/job/productDismantleDetail.vue

@@ -54,6 +54,7 @@
 	import {
 		goHome,
 		getCurrDateTime,
+		navigateBack,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
 	} from '@/common/basic.js';
@@ -483,14 +484,9 @@
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
-					})
-					uni.navigateTo({
-						url: './putawayJob'
 				})
-				}, 3000)
 			},
 		}
 	}

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({
+					navigateBack(1);
-						url: './putawayJob'
-					})
 				})
 			},
 		}

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({
+					navigateBack(1)
-						url: './productReceiptJob'
-					})
 				})
 			},
 		}

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -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.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 												this.calcHandleQty();
 											} else {
 												this.scanPopupGetFocus();
@@ -372,11 +373,11 @@
 					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()
@@ -406,16 +407,16 @@
 							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.batch);
 							detail.toPackingNumber = info.packingNumber;
-								detail.toBatch =info.batch;
+							detail.toBatch = info.batch;
 							detail.toContainerNumber = "";
-								detail.toLocationCode =this.toLocationCode;
+							detail.toLocationCode = this.toLocationCode;
 
 							subList.push(detail)
 						}
 					})
 				})
 				this.jobContent.subList = subList
-				this.jobContent.creator =creator;
+				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
 
@@ -476,14 +477,9 @@
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
+					navigateBack(1)
-					})
-					uni.navigateTo({
-						url: './putawayJob'
 				})
-				}, 3000)
 			},
 		}
 	}

pages/productionReturn/coms/comReturn.vue

@@ -434,16 +434,6 @@
 
 			},
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			/**
 			 * BlobUrl转blob数据  
 			 * @param {Object} url blob URL

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({
+					navigateBack(1)
-						url: './returnJob'
-					})
 				})
 			},
 		}

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({
+					navigateBack(1)
-						url: './repleinshJob'
-					})
 				})
 			},
 
@@ -380,10 +379,6 @@
 				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			closeCommitMessage() {
-				this.openScanPopup();
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},

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({
+					navigateBack(1)
-						url: './scrapJob'
-					})
 				})
 			},
 		}

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({
+					navigateBack(1)
-						url: './issueJob'
-					})
 				})
 			},
 

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({
+					navigateBack(1)
-						url: './receiptJob'
-					})
 				})
 			},
 

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)
 			},
 
 		}

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({
+					navigateBack(1)
-						url: './issueJob'
-					})
 				})
 			},
 		}

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)
 			},
 		}
 	}