From 0bf66b0690b7ac31840190d495a8969b381d7cec Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 18 Nov 2024 13:59:21 +0800
Subject: [PATCH] =?UTF-8?q?YT-999pda=E5=8F=91=E6=96=99=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=86=E7=A1=AE=EF=BC=8C=E6=9C=89=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=89=B9=E6=AC=A1=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=BA=94?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/job/issueDetailBatch.vue        | 4 ++++
 src/pages/purchaseReceipt/job/receiptDetail.vue | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index cd4a2765..33b73820 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -632,6 +632,8 @@
 							totalQty =calc.add(totalQty,item.handleQty)
 							if(parseFloat(item.handleQty)<parseFloat(item.qty)){
 								str +=	`批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不允许小于任务数量【${item.qty}】`
+							}
+							if(parseFloat(item.handleQty)!=parseFloat(item.qty)){
 								str3 +=	`批次【${item.batch}】扫描数量【${parseFloat(item.handleQty)}】和任务数量【${item.qty}】不一致`
 							}
 							if (parseFloat(	item.handleQty )> 	parseFloat(item.qty)){
@@ -671,6 +673,7 @@
 					str3 = str3+",是否提交"
 					this.$refs.comMessage.showQuestionMessage1(str3, 'red', res => {
 						if (res) {
+							return
 							//防止重复点击
 							this.$throttle(this.submit, 2000, this)()
 						} else {
@@ -678,6 +681,7 @@
 						}
 					});
 				}else {
+					return
 					//防止重复点击
 					this.$throttle(this.submit, 2000, this)()
 				}
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 6e80ce4e..d42d2a5b 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -691,12 +691,10 @@
 					//扫描数量和任务数量相等，直接提交
 					let str = ''
 					let str1 = ''
-					var scanCount=0;
 					this.jobContent.allowBiggerQty = "FALSE"
 					this.detailSource.forEach((item) => {
 						item.subList.forEach(cur=>{
 							if(cur.scaned){
-								scanCount++;
 								if(parseFloat(cur.qty)>parseFloat(cur.handleQty)){
 									str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】，\n请修改后再提交`
 								}
@@ -718,6 +716,8 @@
 					// 		return;
 					// 	}
 					// }
+					console.log(this.scanCount)
+					console.log( this.subList.length)
 					if(this.scanCount  < this.subList.length){
 						//扫描数量小于任务数量，判断是否允许部分提交
 						if (this.jobContent.allowPartialComplete == "TRUE") {
@@ -736,6 +736,7 @@
 							});
 						}
 					}else{
+						return
 						this.submitJob();
 					}
 			},