From b142b1176c51efac069e33a8cd9bd33ecb2a0fcc Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 22 Nov 2024 17:16:32 +0800
Subject: [PATCH] =?UTF-8?q?YT-1192=20=E4=BF=AE=E6=94=B9=E5=8F=B7=E5=93=81?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/productReceiptDetail.vue              | 12 ++++++++--
 .../productReceipt/job/productReceiptJob.vue  | 22 +++++++++----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 389f8a33..44636dc0 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -487,12 +487,20 @@
 				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = this.setParams();
+						let params = this.setParams();
 						console.log("提交参数", JSON.stringify(params));
 						productReceiptJobsubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功\n生成预生产收货记录\n" + res.data, )
+								var hint = ""
+								if(params.type=='predict'){
+									hint="提交成功\n生成补给品收货记录\n" +res.data
+								}else if(params.type=='assemble'){
+									hint="提交成功\n生成号口品收货记录\n" +res.data
+								}else {
+									hint="提交成功\n生成收货记录\n" 
+								}
+								this.showCommitSuccessMessage(hint)
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 989029a2..fb26b22e 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -137,19 +137,19 @@
 			
 			timerRefresh() {
 				this.getList('refresh');
-				this.stopRefresh();
-				var that = this;
-				this.timer = setInterval(function() {
-					that.getList('refresh');
-					console.log('装配刷新');
-				}, planRefreshTime)
+				// this.stopRefresh();
+				// var that = this;
+				// this.timer = setInterval(function() {
+				// 	that.getList('refresh');
+				// 	console.log('装配刷新');
+				// }, planRefreshTime)
 			},
 			stopRefresh() {
 				console.log('stopRefresh装配刷新');
-				if (this.timer) {
-					clearInterval(this.timer);
-					this.timer = null;
-				}
+				// if (this.timer) {
+				// 	clearInterval(this.timer);
+				// 	this.timer = null;
+				// }
 			},
 			getList(type) {
 				let that = this;
@@ -450,7 +450,7 @@
 							
 							return;
 						}
-						if (this.type == 'predict') {
+						if (this.type == 'predict'||this.type == 'assemble') {
 							uni.navigateTo({
 								url: './productReceiptDetail?id=' + result.masterId + '&status=' + result.status +
 									'&scanMessage=' + scanMessage + '&title=' + this.title