修正合托关联展示和取消条件

2026-08-28 15:32:18 +08:00
parent d4fc74e601
commit 0044c01ed0
2 changed files with 5 additions and 2 deletions
@@ -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),