From 04bd9fa1060d711e0e90492c103699f50b49ba17 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期日, 30 十一月 2025 11:14:50 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue"
index 4487276..e4918ee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue"
@@ -83,7 +83,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="materielCode" label="鐗╂枡缂栫爜" width="120"></el-table-column>
<el-table-column prop="pickedQty" label="宸叉嫞鏁伴噺" width="100"></el-table-column>
- <el-table-column prop="locationCode" label="璐т綅" width="100"></el-table-column>
+ <!-- <el-table-column prop="locationCode" label="璐т綅" width="100"></el-table-column> -->
<el-table-column prop="currentBarcode" label="鏉＄爜"></el-table-column>
</el-table>
</el-card>
@@ -983,7 +983,8 @@
palletCode: this.scanData.palletCode
});
if (res.status) {
- this.unpickedList = res.data || [];
+ //this.unpickedList = res.data || [];
+ this.unpickedList = (res.data || []).filter(item => item.canPick === true);
this.summary.unpickedCount = this.unpickedList.length;
this.summary.unpickedQuantity = this.unpickedList.reduce((sum, item) => sum + (item.remainQuantity || 0), 0);
}
@@ -1000,6 +1001,15 @@
});
if (res.status) {
this.pickedList = res.data || [];
+
+ this.pickedList = res.data.map(item => {
+ // 鏂瑰紡1锛氫繚鐣欏師barcode瀛楁锛屾柊澧瀋urrentBarcode
+ return {
+ ...item,
+ currentBarcode: item.barcode
+ };
+});
+
this.summary.pickedCount = this.pickedList.length;
}
} catch (error) {
--
Gitblit v1.9.3