From c84a964e4c2e9f793db09a3d9c97c578d6f5e555 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 26 Nov 2024 11:59:51 +0800
Subject: [PATCH] =?UTF-8?q?YT-1270=E3=80=90=E6=89=AB=E6=8F=8F=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E3=80=91=E5=90=88=E8=AE=A1=E5=B0=8F=E4=BA=8E=E3=80=90?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E6=95=B0=E9=87=8F=E3=80=91=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6PDA=E7=AB=AF=E6=8F=90=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseReceipt/job/receiptDetail.vue     | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 686b3659..18f2b652 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -712,14 +712,12 @@
 						item.subList.forEach(cur=>{
 							if(cur.scaned){
 								if(parseFloat(cur.qty)>parseFloat(cur.handleQty)){
-									str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】，\n请修改后再提交`
+									str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】，\n请修改后再提交`	
+									str2 += `物料号【${item.itemCode}】批次【${cur.batch}】实际收货数量【${cur.handleQty}】小于收货任务的收货数量【${cur.qty}】，\n`
 								}
 								if(parseFloat(cur.qty)<parseFloat(cur.handleQty)){
 									str1 += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】大于任务推荐数量【${cur.qty}】，\n请修改后再提交`
 								}
-								if(parseFloat(cur.qty)!=parseFloat(cur.handleQty)){
-									str2 += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】与任务推荐数量【${cur.qty}】不一致，\n`
-								}
 							}
 						})
 					})
@@ -735,24 +733,13 @@
 					// 		return;
 					// 	}
 					// }
-					if(this.scanCount  < this.subList.length){
+					if(str2){
 						//扫描数量小于任务数量，判断是否允许部分提交
 						if (this.jobContent.allowPartialComplete == "TRUE") {
 							//提交
-							this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							this.$refs.comMessage.showQuestionMessage1(str2+'对于未收货部分将创建一个新的收货任务', 'red', res => {
 								if (res) {
-									if(str2){
-										setTimeout(()=>{
-											this.$refs.comMessage.showQuestionMessage1(str2 + "是否提交?", 'red', res => {
-												if (res) {
-													this.submitJob()
-												}
-											});
-										},100)
-									}else{
-										this.submitJob()
-									}
-									
+									this.submitJob()
 								}
 							});
 						} else {