From af4f3734f9d73b0c1ec598ee321fc751f8aa5572 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 23 Mar 2024 10:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 2ea26568..b582c183 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -1348,7 +1348,8 @@ export default {
 		pConsumeSelection(selection) {
 		   const allRows = this.pConsumeRows.concat(selection)
 		   this.pConsumeRows = allRows.reduce((acc, cur) => {
-				const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode);
+				const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode 
+				&& item.workorderCode === cur.workorderCode);
 				if (!hasDuplicate) {
 					acc.push(cur);
 				}
@@ -1359,6 +1360,7 @@ export default {
 		  this.sConsumeRows = selection;
 		},
 		submitConsume() {
+			this.loading = true;
             this.consumeRows = this.pConsumeRows;
 
 			if ( this.consumeRows==0) {
@@ -1371,6 +1373,7 @@ export default {
 				this.openConsume = false;
 				this.reset();
 				this.getList();
+				this.loading = false;
 			});
 		},
 		/** 导出按钮操作 */