From 0ccfa31daa1f9614d76f087a5c96b15366187622 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 1 Nov 2024 14:51:50 +0800
Subject: [PATCH] =?UTF-8?q?YT-634=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=BA=94=E4=B8=8D=E8=83=BD=E5=A4=A7?=
 =?UTF-8?q?=E4=BA=8E=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/job/issueDetailBatch.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index df6ab80f..346ed891 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -473,13 +473,15 @@
 				const isTrue = params.subList.some(item=>{
 					return item.recordList.some(cur=>cur.scaned) == true
 				})
+			
 				if(!isTrue){
 						uni.hideLoading()
 						this.showErrorMessage("请扫描您需要提交的发料任务")
 						return
 				}
-				// return
+				
 				console.log("提交参数", params);
+				return
 				issueJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
@@ -588,6 +590,7 @@
 				let str1=""
 				var totalQty =0;
 				var taskQty =0;
+				console.log(877,this.detailSource)
 				this.detailSource.forEach(detail => {
 					detail.subList.forEach(item => {
 						if(item.scaned){
@@ -603,15 +606,18 @@
 					
 					})
 				})
-				if(str){
-					str = '任务明细未全部完成,是否提交?\n' + str
-				}
 				if(str1){
-					this.$refs.comMessage.showQuestionMessage1(str1, 'red', res => {
-						
-					})
+					this.$refs.comMessage.showMessage(str1, res => {
+							if (res) {
+								this.afterCloseMessage()
+							}
+						});
 					return
 				}
+				if(str){
+					str = '任务明细未全部完成,是否提交?\n' + str
+				}
+			
 				if(totalQty!=taskQty){
 					str ="扫描数量["+totalQty+"]与任务数量不一致["+taskQty+"],是否提交"
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {