diff --git a/src/modules/overseas-warehouse/lastMilePresentation.ts b/src/modules/overseas-warehouse/lastMilePresentation.ts index 591158f8..7f7877fb 100644 --- a/src/modules/overseas-warehouse/lastMilePresentation.ts +++ b/src/modules/overseas-warehouse/lastMilePresentation.ts @@ -101,7 +101,9 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO palletMergeFlag: String(dto.palletMergeFlag ?? '').trim(), palletMergeRelation: Array.isArray(dto.palletMergeOrderNos) && dto.palletMergeOrderNos.length ? dto.palletMergeOrderNos.map((value) => text(value)).join('、') - : dto.palletMergeBatchId ? `批次 ${text(dto.palletMergeBatchId)}` : '—', + : dto.palletMergeBatchId ? `批次 ${text(dto.palletMergeBatchId)}` + : dto.palletMergeFlag === 'MERGED' ? '已完成合托(关联明细待服务端返回)' + : dto.palletMergeFlag === 'REQUIRED' ? '待PDA合托(关联明细待服务端返回)' : '—', status: lastMileStatusLabel(dto.currentStatus), internalRemark: text(dto.privateRemark), customerRemark: text(dto.customerRemark), diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue index d1a28fe8..2f4e7d58 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue +++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue @@ -27,6 +27,7 @@ const page = ref(1) const pageSize = ref(10) const total = ref(0) const selectedRows = ref([]) +const cancellableMergeCount = computed(() => selectedRows.value.filter((row) => row.palletMergeFlag === 'REQUIRED').length) const actionLoading = ref(false) const actionError = ref(null) const transferOpen = ref(false) @@ -260,7 +261,7 @@ onMounted(() => { void load() })
- +