From cd9a8a2f81ea0ff4e32c89f6d3bebe40646345f8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 26 Jun 2024 09:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comScanDeliverPack.vue | 10 ++++++++--
 src/pages/deliver/job/deliverJob.vue          | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index d8f19b12..4f71cda1 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -375,11 +375,17 @@
 
 			createBatchInfo(data, balance, packageInfo) {
 				let batch = {
-					batch: data.lot,
+					batch: data.lot||data.batch,
 					qty: 0,
 					uom: data.uom,
 					handleQty: Number(data.qty),
-					Records: []
+					Records: [],
+					detail:{
+						handleQty: Number(data.qty),
+						packingNumber:data.packingNumber,
+						qty: 0,
+						uom:data.uom,
+					}
 				}
 				let record = this.creatRecord(data, balance, packageInfo);
 				batch.Records.push(record);
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 861519da..f5927528 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -138,11 +138,11 @@
 					})
 				}
 				
-				filters.push({
-					column: "accept_user_id",
-					action: "==",
-					value: this.$store.state.user.id
-				})
+				// filters.push({
+				// 	column: "accept_user_id",
+				// 	action: "==",
+				// 	value: this.$store.state.user.id
+				// })
 				filters.push({
 					column: "status",
 					action: "in",