From 0044c01ed020ccb91d9c901be8198eddf7c8c067 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 28 Aug 2026 15:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=90=88=E6=89=98=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B1=95=E7=A4=BA=E5=92=8C=E5=8F=96=E6=B6=88=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/overseas-warehouse/lastMilePresentation.ts      | 4 +++-
 src/modules/overseas-warehouse/pages/LastMileOrdersView.vue | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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<LastMileOrderListItem[]>([])
+const cancellableMergeCount = computed(() => selectedRows.value.filter((row) => row.palletMergeFlag === 'REQUIRED').length)
 const actionLoading = ref(false)
 const actionError = ref<ApiErrorDetails | null>(null)
 const transferOpen = ref(false)
@@ -260,7 +261,7 @@ onMounted(() => { void load() })
       </LoadErrorState>
     </template>
     <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-last-mile-orders" row-key="id" empty-text="暂无尾程订单" :row-class-name="({ row }: { row: LastMileOrderListItem }) => row.detained ? 'is-detained-row' : ''" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
-      <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" type="primary" plain :disabled="!selectedRows.length || actionLoading" @click="batchPalletMerge">合托标记</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" type="warning" plain :disabled="!selectedRows.length || actionLoading" @click="cancelBatchPalletMerge">取消合托</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || actionLoading" @click="convertInboundPlan">生成入库计划</el-button></template>
+      <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" type="primary" plain :disabled="!selectedRows.length || actionLoading" @click="batchPalletMerge">合托标记</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" type="warning" plain :disabled="!cancellableMergeCount || actionLoading" @click="cancelBatchPalletMerge">取消合托</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || actionLoading" @click="convertInboundPlan">生成入库计划</el-button></template>
       <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" size="small" plain :type="(row as LastMileOrderListItem).detained ? 'success' : 'danger'" :disabled="actionLoading" @click="openDetained(row as LastMileOrderListItem)">{{ (row as LastMileOrderListItem).detained ? '解除暂扣' : '暂扣' }}</el-button></template>
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>