diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts index c66388cc..d8a44f82 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts +++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts @@ -13,7 +13,7 @@ vi.mock('../api/warehouseTransfers', () => ({ getWarehouseTransfer: vi.fn() })) enableAutoUnmount(afterEach) describe('LastMileOrderDetailView domestic detail alignment', () => { - it.each(['PENDING_REVIEW', 'PARTIALLY_RECEIVED'])('shows SKU forecast before receipt completion (%s) without forecast box counts', async status => { + it.each(['PENDING_REVIEW', 'PARTIALLY_RECEIVED', 'COMPLETED'])('shows only customer SKU forecast regardless of receipt status (%s)', async status => { vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: status, packageCount: 30 }, cargo: [], fees: [], statusHistory: [], operationHistory: [], returnReceipt: { order: { returnNo: 'RT-1', status, expectedQuantity: 30, receivedQuantity: 5 }, receipts: [], @@ -28,15 +28,16 @@ describe('LastMileOrderDetailView domestic detail alignment', () => { expect(panel.text()).toContain('30') expect(panel.text()).not.toContain('箱数') }) - it('uses actual cargo after return receipt completion', async () => { + it('keeps customer forecast after completion instead of using actual signed cargo', async () => { vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: 'INBOUND_COMPLETED' }, cargo: [{ id: 'actual', skuCode: 'SKU-ACTUAL', productNameZh: '实收商品', productQuantity: 25, packageCount: 2 }], fees: [], statusHistory: [], operationHistory: [], returnReceipt: { order: { returnNo: 'RT-1', status: 'COMPLETED', expectedQuantity: 30, receivedQuantity: 25 }, receipts: [], items: [{ skuCode: 'SKU-FORECAST', expectedQuantity: 30, receivedQuantity: 25 }] } }) const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises() await wrapper.findAll('[role="tab"]').find(tab => tab.text().includes('货物信息'))!.trigger('click'); await flushPromises() - expect(wrapper.get('.table-panel').text()).toContain('SKU-ACTUAL') - expect(wrapper.get('.table-panel').text()).not.toContain('SKU-FORECAST') - expect(wrapper.get('.table-panel').text()).toContain('25') + expect(wrapper.get('.table-panel').text()).not.toContain('SKU-ACTUAL') + expect(wrapper.get('.table-panel').text()).toContain('SKU-FORECAST') + expect(wrapper.get('.table-panel').text()).toContain('30') + expect(wrapper.get('.table-panel').text()).not.toContain('箱数') }) it('shows signed box contents and actual quantities on return orders', async () => { vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'tail-return', customerId: 'customer-1', orderNo: 'RETU-1', orderType: 'RETURN_RELABEL', currentStatus: 'INBOUND_COMPLETED' }, cargo: [], fees: [], statusHistory: [], operationHistory: [], diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue index 31a9c22f..3d4d34ee 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue +++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue @@ -135,8 +135,8 @@ const documents = computed(() => { .filter((item) => item[1]).map(([type, number]) => ({ type: String(type), number: String(number), createdAt: '—', quote: '—' } as DocumentRow)) .concat((order.relabelApplications || []).map(application => ({ type: '换标单', number: application.relabelNo, createdAt: formatOverseasDateTime(application.createdAt), quote: '—', status: relabelApplicationStatusLabel(application.status), quantity: application.quantity }))) }) -const cargo = computed(() => showReturnForecast.value && detail.value?.returnReceipt?.items?.length - ? detail.value.returnReceipt.items.map(item => ({ id: item.skuCode, sku: item.skuCode, productName: text(item.productNameZh), +const cargo = computed(() => isReturnOrder.value + ? (detail.value?.returnReceipt?.items || []).map(item => ({ id: item.skuCode, sku: item.skuCode, productName: text(item.productNameZh), quantity: item.expectedQuantity, pallets: 0, cartons: 0, weight: 0, volume: 0 })) : (detail.value?.cargo || []).map((item) => ({ id: String(item.id), sku: text(item.skuCode), productName: text(item.productNameZh), pallets: Number(item.palletCount || 0), @@ -157,7 +157,7 @@ const logs = computed(() => { return [...statusRows, ...operationRows].sort((left, right) => right.sortAt.localeCompare(left.sortAt)) }) -const cargoColumns = computed(() => showReturnForecast.value ? [ +const cargoColumns = computed(() => isReturnOrder.value ? [ { key: 'sku', prop: 'sku', label: 'SKU', minWidth: 150 }, { key: 'productName', prop: 'productName', label: '中文品名', minWidth: 180 }, { key: 'quantity', prop: 'quantity', label: '预报件数', width: 120, align: 'right' }, @@ -238,7 +238,7 @@ onMounted(load)
{{ field.label }}
{{ field.value }}
-
+

{{ detail.returnReceipt.order.returnNo }} · 实收 {{ detail.returnReceipt.order.receivedQuantity }} / 预报 {{ detail.returnReceipt.order.expectedQuantity }} 件