From 2f61b30b4bfc154ee8c214a47a24082623531be0 Mon Sep 17 00:00:00 2001
From: Niext <85552560@qq.com>
Date: Mon, 29 Apr 2024 00:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comScanDeliverPack.vue | 16 +++++++++-------
 src/pages/deliver/job/deliverDetail.vue       | 15 ++++++++-------
 src/pages/deliver/job/deliverJob.vue          |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index eecd97d4..30305545 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -7,13 +7,13 @@
 						<view class="" style="font-size: 35rpx;">
 							扫描箱码
 						</view>
-					
+
 						<view class="">
 							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
 								@click="closeScanPopup()"></image>
 						</view>
 					</view>
-					
+
 					<!-- <view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
@@ -343,7 +343,7 @@
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance);
+											let batch = that.createBatchInfo(label, balance,packageInfo);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
@@ -370,7 +370,7 @@
 				}
 			},
 
-			createBatchInfo(data, balance) {
+			createBatchInfo(data, balance, packageInfo) {
 				let batch = {
 					batch: data.lot,
 					qty: 0,
@@ -378,7 +378,7 @@
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance);
+				let record = this.creatRecord(data, balance, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;
@@ -396,7 +396,9 @@
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
 					toLocationCode: this.toLocationCode,
-					supplierCode: label.supplierCode
+					supplierCode: label.supplierCode,
+					packUnit: packageInfo.packUnit,
+					packQty: packageInfo.packQty
 				}
 				return record;
 			},
@@ -404,7 +406,7 @@
 			calcBatchHandleQty(batch) {
 				let handleQty = 0;
 				batch.Records.forEach(res => {
-					handleQty = calc.add(handleQty,res.qty)
+					handleQty = calc.add(handleQty, res.qty)
 				})
 				batch.handleQty = handleQty;
 			},
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index eb654637..39d4a47e 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -250,7 +250,7 @@
 				deliverJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成发货记录<br>" + res.data)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -288,11 +288,12 @@
 												.packingNumber;
 											record.toBatch = r.batch;
 										} else {
-											var info = getPackingNumberAndBatch(
-												this.managementList, r
-												.itemCode,
-												r.packingNumber, r
-												.batch);
+											var info =
+												getPackingNumberAndBatch(
+													this.managementList, r
+													.itemCode,
+													r.packingNumber, r
+													.batch);
 											record.toPackingNumber = info
 												.packingNumber;
 											record.toBatch = info.batch;
@@ -464,4 +465,4 @@
 	// 	border-bottom-width: 1px;
 	// 	border-bottom-color: #ebeef5;
 	// }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index a51dd3c6..38f09253 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -160,7 +160,7 @@
 						this.loadingType = "nomore";
 						return;
 					}
-					this.jobList = type === "refresh" ? list : this.receiptList.concat(list);
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
 
 				}).catch(error => {