@@ -247,7 +248,7 @@ watch([warehouseTab, () => query.orderType], () => {
{{ container.vehicleLabel }}托数 {{ container.palletIds.length }}/{{ container.capacity }} · 重量 {{ number(containerWeightLb(container), 0) }}LB/{{ container.maxWeightLb }}LB 超限10%
-
{{ text(palletSnapshot(id)?.palletNo || id) }}{{ text(palletSnapshot(id)?.orderNo) }}移除
+
{{ text(palletSnapshot(id)?.palletNo || '托盘号待补充') }}移除
拖入托盘，移入后立即锁定
@@ -277,6 +278,7 @@ watch([warehouseTab, () => query.orderType], () => {
.dispatch-workbench { display: grid; grid-template-columns: minmax(550px, 1.5fr) minmax(330px, .85fr) minmax(390px, 1fr); gap: 16px; margin-top: 16px; }
.order-pane, .detail-pane, .container-pane { min-width: 0; }
.order-pane header, .detail-pane header, .container-pane header { display: flex; min-height: 74px; align-items: center; justify-content: space-between; gap: 10px; }
+.detail-order-reference { display: flex; min-width: 0; max-width: 240px; align-items: baseline; gap: 3px; }
h3, p { margin: 0; } h3 { font-size: 16px; } h3 span, header > span, p { color: var(--cc-muted); font-size: 12px; font-weight: 400; }
.order-type-tabs { display: flex; gap: 6px; margin-top: 10px; overflow-x: auto; }
.order-type-tabs button { flex: 0 0 auto; padding: 5px 12px; border-radius: 16px; font-size: 12px; }
@@ -298,7 +300,7 @@ h3, p { margin: 0; } h3 { font-size: 16px; } h3 span, header > span, p { color:
.container-head span { color: var(--cc-muted); font-size: 12px; }.container-head b { color: var(--el-color-primary); }
.container-body { min-height: 76px; padding: 8px; }.drop-hint { display: grid; min-height: 60px; place-items: center; color: var(--cc-muted); font-size: 12px; }
.loaded-pallet { display: flex; min-height: 52px; align-items: center; justify-content: space-between; gap: 8px; border-bottom: 1px solid var(--cc-border); }
-.loaded-pallet > span { display: flex; min-width: 0; flex-direction: column; color: var(--cc-muted); font-size: 12px; }.loaded-pallet strong { color: var(--cc-text); font-size: 13px; }
+.loaded-pallet > span { display: flex; min-width: 0; flex: 1; flex-direction: column; color: var(--cc-muted); font-size: 12px; }.loaded-pallet strong { color: var(--cc-text); font-size: 13px; }
.dialog-footer { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin: 16px -20px -20px; padding: 14px 20px; border-top: 1px solid var(--cc-border); background: #fafbfc; }
.dialog-footer > span { color: var(--cc-muted); font-size: 12px; }
.vehicle-options { display: grid; gap: 14px; }
diff --git a/src/modules/overseas-warehouse/inventoryPresentation.test.ts b/src/modules/overseas-warehouse/inventoryPresentation.test.ts
index 25a47a1f..f2051bc4 100644
--- a/src/modules/overseas-warehouse/inventoryPresentation.test.ts
+++ b/src/modules/overseas-warehouse/inventoryPresentation.test.ts
@@ -29,6 +29,8 @@ describe('overseas inventory presentation adapter', () => {
expect(row).toMatchObject({
id: '2089652067743272963',
customerId: '990018',
+ owner: 'Acceptance Customer',
+ warehouse: 'Acceptance US Warehouse',
sku: 'SKU-ACCEPT-1',
productName: '验收商品',
location: '—',
@@ -40,6 +42,30 @@ describe('overseas inventory presentation adapter', () => {
})
})
+ it('shows an unknown owner as a dash and never substitutes customerId', () => {
+ const row = toInventoryListItem({
+ id: '1', customerId: '2092618717861048321', customerName: null,
+ overseasWarehouseId: '3', inboundOrderId: '4', inboundCode: 'IN-1',
+ totalPackages: 1, availablePackages: 1, holdPackages: 0, allocatedPackages: 0,
+ pickedPackages: 0, inTransitPackages: 0, receivingPackages: 0, procurementPackages: 0,
+ })
+ expect(row.owner).toBe('—')
+ expect(row.owner).not.toBe(row.customerId)
+ })
+
+ it('uses only the formal overseas warehouse name snapshot', () => {
+ const row = toInventoryListItem({
+ id: '1', customerId: '2', customerName: '客户甲', overseasWarehouseId: '3',
+ overseasWarehouseCode: 'LAX', overseasWarehouseName: null, destinationWarehouseName: 'ONT8目的仓',
+ inboundOrderId: '4', inboundCode: 'IN-1', totalPackages: 1, availablePackages: 1,
+ holdPackages: 0, allocatedPackages: 0, pickedPackages: 0, inTransitPackages: 0,
+ receivingPackages: 0, procurementPackages: 0,
+ })
+ expect(row.warehouse).toBe('—')
+ expect(row.warehouse).not.toBe('LAX')
+ expect(row.warehouse).not.toBe('ONT8目的仓')
+ })
+
it('falls back to the English product name only when the Chinese name is absent', () => {
expect(inventoryProductName({
id: '1', customerId: '2', overseasWarehouseId: '3', inboundOrderId: '4', inboundCode: 'IN-1',
diff --git a/src/modules/overseas-warehouse/inventoryPresentation.ts b/src/modules/overseas-warehouse/inventoryPresentation.ts
index 3b8c839c..434b1166 100644
--- a/src/modules/overseas-warehouse/inventoryPresentation.ts
+++ b/src/modules/overseas-warehouse/inventoryPresentation.ts
@@ -30,7 +30,7 @@ export function toInventoryListItem(dto: InventoryBalanceDto): InventoryListItem
inboundOrderNo: text(dto.inboundOrderNo) === '—' ? '' : String(dto.inboundOrderNo),
inboundCode: text(dto.inboundCode) === '—' ? '' : String(dto.inboundCode),
owner: text(dto.customerName),
- warehouse: text(dto.overseasWarehouseName || dto.overseasWarehouseCode),
+ warehouse: text(dto.overseasWarehouseName),
sku: text(dto.skuCode),
productName: inventoryProductName(dto),
location: '—',
diff --git a/src/modules/overseas-warehouse/lastMilePresentation.test.ts b/src/modules/overseas-warehouse/lastMilePresentation.test.ts
index 3e951cc3..0338613b 100644
--- a/src/modules/overseas-warehouse/lastMilePresentation.test.ts
+++ b/src/modules/overseas-warehouse/lastMilePresentation.test.ts
@@ -23,6 +23,28 @@ describe('last-mile order presentation adapter', () => {
expect(row.rejectedAt).toBe('—')
})
+ it('shows the backend customerName and never guesses the owner from customerId', () => {
+ expect(toLastMileOrderListItem({
+ id: '1', customerId: '190000000000000001', customerName: '华远贸易', orderNo: 'LMO-260827-0001',
+ }).owner).toBe('华远贸易')
+ expect(toLastMileOrderListItem({
+ id: '2', customerId: '190000000000000002', customerName: null, orderNo: 'LMO-260827-0002',
+ }).owner).toBe('—')
+ })
+
+ it('preserves real metrics and distinguishes zero from unknown fields and times', () => {
+ const estimatedArrivalAt = '2026-08-27T12:30:00Z'
+ const row = toLastMileOrderListItem({
+ id: '3', customerId: '190000000000000003', orderNo: 'LMO-260827-0003',
+ palletCount: 3, packageCount: 0, volumeCbm: 12.75, productQuantity: null, volumeWeightKg: 88.6,
+ estimatedArrivalAt, actualArrivalAt: null, estimatedWarehouseAt: null,
+ })
+ expect(row).toMatchObject({
+ pallets: 3, cartons: 0, volume: 12.75, quantity: '—', volumeWeight: 88.6,
+ portEta: formatOverseasDateTime(estimatedArrivalAt), portAta: '—', warehouseEta: '—',
+ })
+ })
+
it.each([
['RELABEL_APPLICATION', '换标下单'],
['WAREHOUSE_TRANSFER', '仓储转运'],
diff --git a/src/modules/overseas-warehouse/lastMilePresentation.ts b/src/modules/overseas-warehouse/lastMilePresentation.ts
index 0f05e6f2..5c0513ec 100644
--- a/src/modules/overseas-warehouse/lastMilePresentation.ts
+++ b/src/modules/overseas-warehouse/lastMilePresentation.ts
@@ -27,8 +27,8 @@ function text(value: unknown) {
return normalized || '—'
}
-function count(value: number | null | undefined) {
- return Number.isFinite(value) ? Number(value) : 0
+function metric(value: number | null | undefined): number | '—' {
+ return value != null && Number.isFinite(value) ? Number(value) : '—'
}
function yesNo(value: boolean | null | undefined) {
@@ -70,6 +70,7 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
return {
id: String(dto.id),
customerId: String(dto.customerId),
+ sourceContainerBookingId: String(dto.sourceContainerBookingId ?? '').trim(),
orderNo: text(dto.orderNo),
warning: dto.abnormal ? '异常' : '—',
orderType: text(dto.orderTypeName || lastMileOrderTypeLabel(dto.orderType)),
@@ -83,12 +84,11 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
containerStatus: text(dto.containerStatus),
abnormal: yesNo(dto.abnormal),
held: yesNo(dto.detained),
- detained: dto.detained === true,
- pallets: count(dto.palletCount),
- cartons: count(dto.packageCount),
- volume: count(dto.volumeCbm),
- quantity: count(dto.productQuantity),
- volumeWeight: count(dto.volumeWeightKg),
+ pallets: metric(dto.palletCount),
+ cartons: metric(dto.packageCount),
+ volume: metric(dto.volumeCbm),
+ quantity: metric(dto.productQuantity),
+ volumeWeight: metric(dto.volumeWeightKg),
portEta: formatOverseasDateTime(dto.estimatedArrivalAt),
portAta: formatOverseasDateTime(dto.actualArrivalAt),
warehouseEta: formatOverseasDateTime(dto.estimatedWarehouseAt),
diff --git a/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue b/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue
index 6858ce23..ccac3c1a 100644
--- a/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue
+++ b/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue
@@ -23,6 +23,7 @@ import {
type CustomerVisitRow,
} from '../api/customerVisits'
import { overseasWarehousePermissions as permission } from '../permissions'
+import OrderReferenceText from '../components/OrderReferenceText.vue'
const access = useAccessPreviewStore()
const rows = ref
([])
@@ -188,7 +189,7 @@ onMounted(load)
@@ -216,6 +217,7 @@ onMounted(load)
.visit-order-summary div { display: grid; gap: 5px; } .visit-order-summary span { color: var(--cc-text-secondary); } .visit-order-summary strong { color: var(--cc-text-primary); }
.inbound-options { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; width: 100%; }
.inbound-option { display: grid; gap: 6px; padding: 12px; border: 1px solid var(--cc-border-color); border-radius: 8px; cursor: pointer; color: var(--cc-text-secondary); }
+.visit-order-reference { display: flex; min-width: 0; align-items: baseline; gap: 3px; }
.inbound-option.selected { border-color: var(--el-color-primary); background: var(--el-color-primary-light-9); }
.file-picker { display: inline-flex; align-items: center; gap: 6px; padding: 8px 12px; color: var(--el-color-primary); border: 1px solid var(--el-color-primary); border-radius: 6px; cursor: pointer; }
.file-picker input { display: none; } .file-picker.disabled { opacity: .6; cursor: not-allowed; } .file-tip { margin-left: 12px; color: var(--cc-text-secondary); }
diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue b/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue
index 978726c1..e1d18919 100644
--- a/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue
@@ -1,5 +1,5 @@
详情编辑状态标记退货共 {{ total }} 条派送单
diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
index ac67429d..c4573990 100644
--- a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
@@ -1,12 +1,11 @@
@@ -181,20 +139,6 @@ onMounted(load)
单据信息
- {{ field.label }}
- {{ field.value }}