- 派送单号
- {{ show(detail.order.deliveryNo) }}
- 状态
- {{ statusLabels[detail.order.status] || detail.order.status }}
- - 仓库
- {{ show(detail.order.overseasWarehouseName) }}
- 运单号
- {{ show(detail.order.waybillNo) }}
- - 派送人
- {{ show(detail.order.carrierName) }}
- 派送时间
- {{ formatOverseasDateTime(detail.order.dispatchedAt || detail.order.plannedDeliveryAt) }}
- - 提货方式
- {{ pickupLabels[detail.order.pickupMethod || ''] || show(detail.order.pickupMethod) }}
- 装车类型
- {{ loadingLabels[detail.order.loadingType || ''] || show(detail.order.loadingType) }}
- - 派送方式
- {{ methodLabels[detail.order.deliveryMethod || ''] || show(detail.order.deliveryMethod) }}
- 司机/车队
- {{ show(detail.order.driverName) }}
+ - 仓库
- {{ show(detail.order.overseasWarehouseName) }}
- 目的 FBA 仓
- {{ show(detail.order.destinationWarehouseCode || detail.order.destinationWarehouseName) }}
+ - 运单号
- {{ show(detail.order.waybillNo) }}
- 派送人
- {{ show(detail.order.carrierName) }}
+ - 派送时间
- {{ formatOverseasDateTime(detail.order.dispatchedAt || detail.order.plannedDeliveryAt) }}
- 提货方式
- {{ pickupLabels[detail.order.pickupMethod || ''] || show(detail.order.pickupMethod) }}
+ - 装车类型
- {{ loadingLabels[detail.order.loadingType || ''] || show(detail.order.loadingType) }}
- 派送方式
- {{ methodLabels[detail.order.deliveryMethod || ''] || show(detail.order.deliveryMethod) }}
+ - 司机/车队
- {{ show(detail.order.driverName) }}
- 车牌号
- {{ show(detail.order.vehiclePlate) }}
- 总箱数
- {{ quantity(detail.order.packageCount, '箱') }}
- 总重量
- {{ quantity(detail.order.totalWeightKg, 'kg') }}
- 总体积
- {{ quantity(detail.order.totalVolumeCbm, 'm³') }}
- 预计到达时间
- {{ formatOverseasDateTime(detail.order.expectedArrivalAt) }}
- 客户确认
- {{ customerConfirmation() }}
diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrdersView.test.ts b/src/modules/overseas-warehouse/pages/DeliveryOrdersView.test.ts
index d71e4e3e..df6205b1 100644
--- a/src/modules/overseas-warehouse/pages/DeliveryOrdersView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DeliveryOrdersView.test.ts
@@ -1,6 +1,6 @@
import ElementPlus from 'element-plus'
import { defineComponent, h, type PropType } from 'vue'
-import { DOMWrapper, flushPromises, mount } from '@vue/test-utils'
+import { flushPromises, mount } from '@vue/test-utils'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { getDeliveryOrder, listDeliveryOrders, listDeliveryReturnInboundOptions, markDeliveryReturn } from '../api/deliveryOrders'
import { updateDeliveryOrderStatus } from '../api/customerVisits'
@@ -54,10 +54,10 @@ describe('DeliveryOrdersView permissions and commands', () => {
await wrapper.findAll('button').find(button => button.text().includes('编辑状态'))!.trigger('click')
await flushPromises()
- await wrapper.find('[data-dialog="编辑派送状态"] select').setValue('DELIVERED')
+ await wrapper.find('[data-dialog="编辑派送状态"] select').setValue('DELIVERING')
await wrapper.find('[data-dialog="编辑派送状态"] .dialog-confirm').trigger('click')
await flushPromises()
- expect(updateDeliveryOrderStatus).toHaveBeenCalledWith('DEL/1', '100', { status: 'DELIVERED', expectedVersion: 7, remark: undefined })
+ expect(updateDeliveryOrderStatus).toHaveBeenCalledWith('DEL/1', '100', { status: 'DELIVERING', expectedVersion: 7, remark: undefined })
await wrapper.findAll('button').find(button => button.text().includes('标记退货'))!.trigger('click')
await flushPromises()
@@ -86,7 +86,7 @@ describe('DeliveryOrdersView permissions and commands', () => {
wrapper.unmount()
})
- it('maps delivering separately from completion and blocks duplicate or conflicted submission', async () => {
+ it('excludes manual completion and blocks duplicate or conflicted status submission', async () => {
canPermission.mockReturnValue(true)
const wrapper = mountView()
await flushPromises()
@@ -94,7 +94,7 @@ describe('DeliveryOrdersView permissions and commands', () => {
await flushPromises()
const select = wrapper.find('[data-dialog="编辑派送状态"] select')
expect(select.find('option[value="DELIVERING"]').text()).toBe('派送中')
- expect(select.find('option[value="DELIVERED"]').text()).toBe('派送完成')
+ expect(select.find('option[value="DELIVERED"]').exists()).toBe(false)
expect(select.find('option[value="WAIT_DELIVERY"]').exists()).toBe(false)
await select.setValue('DELIVERING')
await wrapper.find('[data-dialog="编辑派送状态"] textarea').setValue('123')
@@ -114,7 +114,7 @@ describe('DeliveryOrdersView permissions and commands', () => {
expect(updateDeliveryOrderStatus).toHaveBeenCalledTimes(1)
vi.mocked(getDeliveryOrder).mockResolvedValue({ order: { ...row, version: 8, allowedActions: ['COMPLETE_DELIVERY'] }, skus: [], fees: [], operations: [] })
await state.refreshStatus(); await flushPromises()
- expect(select.findAll('option').map(option => option.attributes('value'))).toEqual(['DELIVERED'])
+ expect(select.findAll('option')).toHaveLength(0)
wrapper.unmount()
})
@@ -192,37 +192,27 @@ describe('DeliveryOrdersView permissions and commands', () => {
wrapper.unmount()
})
- it('selects completion through the real dialog and select, then retries a conflict with the refreshed version', async () => {
+ it('hides status editing when completion is the only server action', async () => {
canPermission.mockImplementation(code => code.endsWith(':status'))
vi.mocked(getDeliveryOrder).mockResolvedValue({ order: { ...row, version: 7, status: 'DELIVERING', allowedActions: ['COMPLETE_DELIVERY'] }, skus: [], fees: [], operations: [] })
- vi.mocked(updateDeliveryOrderStatus).mockRejectedValueOnce({ isAxiosError: true, response: { status: 409, data: { code: 'A0409', message: '版本冲突' } } })
- const wrapper = mount(DeliveryOrdersView, { attachTo: document.body, global: { plugins: [ElementPlus], stubs: { ...commonPhase5Stubs, AppDialog: false, ElInput: false, ElSelect: false, ElOption: false } } })
- const body = new DOMWrapper(document.body)
- try {
- await flushPromises()
- await wrapper.findAll('button').find(button => button.text().includes('编辑状态'))!.trigger('click')
- await flushPromises()
- const dialog = body.find('[role="dialog"][aria-label="编辑派送状态"]')
- const save = () => dialog.findAll('button').find(button => button.text() === '保存状态')!
- expect(save().attributes('disabled')).toBeDefined()
- await dialog.find('.el-select__wrapper').trigger('click')
- await flushPromises()
- const options = body.findAll('.el-select-dropdown__item')
- expect(options.map(option => option.text())).toEqual(['派送完成'])
- await options[0]!.trigger('click')
- await dialog.find('textarea').setValue('已交付')
- await save().trigger('click'); await flushPromises()
- expect(updateDeliveryOrderStatus).toHaveBeenLastCalledWith('DEL/1', '100', { status: 'DELIVERED', expectedVersion: 7, remark: '已交付' })
- expect(save().attributes('disabled')).toBeDefined()
- expect(dialog.text()).toContain('请刷新最新状态并重新确认')
- vi.mocked(getDeliveryOrder).mockResolvedValue({ order: { ...row, version: 8, status: 'DELIVERING', allowedActions: ['COMPLETE_DELIVERY'] }, skus: [], fees: [], operations: [] })
- await dialog.findAll('button').find(button => button.text().includes('重新加载'))!.trigger('click')
- await flushPromises()
- expect((dialog.find('textarea').element as HTMLTextAreaElement).value).toBe('已交付')
- await save().trigger('click'); await flushPromises()
- expect(updateDeliveryOrderStatus).toHaveBeenLastCalledWith('DEL/1', '100', { status: 'DELIVERED', expectedVersion: 8, remark: '已交付' })
- expect(listDeliveryOrders).toHaveBeenCalledTimes(2)
- } finally { wrapper.unmount() }
+ vi.mocked(listDeliveryOrders).mockResolvedValue({ records: [{ ...row, status: 'DELIVERING', allowedActions: ['COMPLETE_DELIVERY'] }], page: 1, size: 10, total: 1, pages: 1 })
+ const wrapper = mountView(); await flushPromises()
+ expect(wrapper.find('[data-testid="data-table"]').text()).not.toContain('编辑状态')
+ expect(getDeliveryOrder).not.toHaveBeenCalled()
+ expect(updateDeliveryOrderStatus).not.toHaveBeenCalled()
+ wrapper.unmount()
+ })
+
+ it('shows the destination FBA warehouse that identifies each split delivery', async () => {
+ vi.mocked(listDeliveryOrders).mockResolvedValue({ records: [{ ...row, destinationWarehouseCode: 'ACY2', destinationWarehouseName: 'Amazon ACY2' }], page: 1, size: 10, total: 1, pages: 1 })
+ const table = defineComponent({
+ props: { data: Array as PropType, columns: Array as PropType string }>> },
+ setup(props) { return () => h('div', props.columns?.find(column => column.key === 'destinationWarehouse')?.formatter?.(props.data?.[0] || {}) || '') },
+ })
+ const wrapper = mount(DeliveryOrdersView, { global: { plugins: [ElementPlus], stubs: { ...commonPhase5Stubs, DataTable: table } } })
+ await flushPromises()
+ expect(wrapper.text()).toContain('ACY2 · Amazon ACY2')
+ wrapper.unmount()
})
it('renders category counts from the list without per-row document requests', async () => {
diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue b/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue
index c3a82d53..3e7a618b 100644
--- a/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue
@@ -48,6 +48,7 @@ const columns: DataTableColumn[] = [
{ key: 'documents', label: '所需资料', minWidth: 380, slotName: 'documents' },
{ key: 'bolNo', prop: 'bolNo', label: 'BOL号', minWidth: 170 },
{ key: 'customerName', prop: 'customerName', label: '客户', minWidth: 160 },
+ { key: 'destinationWarehouse', label: '目的 FBA 仓', minWidth: 180, formatter: (row: DeliveryOrderRow) => destinationWarehouseLabel(row) },
{ key: 'overseasWarehouseName', prop: 'overseasWarehouseName', label: '仓库', minWidth: 150 },
{ key: 'dispatchNo', prop: 'dispatchNo', label: '排车单号', minWidth: 170 },
{ key: 'waybillNo', prop: 'waybillNo', label: '运单号', minWidth: 150 },
@@ -71,6 +72,11 @@ const statusLabels: Record = { WAIT_DELIVERY: '待派送', DELIV
function deliveryMethodLabel(value?: string | null) { return ({ FBA_PICKUP: 'FBA自提', CUSTOMER_PICKUP: '客户自提', TRUCK_PALLET: '卡派打托', TRUCK_FLOOR: '卡派地板', EXPRESS: '快递', OUTSOURCED: '外配', DEDICATED_TRUCK: '专车直送', LTL: '零担派送', SELF_DELIVERY: '自送', THIRD_PARTY: '第三方配送' } as Record)[String(value)] || value || '—' }
function pickupMethodLabel(value?: string | null) { return ({ ONE_PICKUP_ONE_DROP: '一提一卸', ONE_PICKUP_MULTI_DROP: '一提多卸', MULTI_PICKUP_ONE_DROP: '多提一卸', MULTI_PICKUP_MULTI_DROP: '多提多卸', WAREHOUSE_PICKUP: '仓库自提', DOOR_PICKUP: '上门提货', SELF_PICKUP: '自提' } as Record)[String(value)] || value || '—' }
function loadingTypeLabel(value?: string | null) { return ({ PALLET: '托盘', FLOOR: '地板', MIXED: '混装', CARTON: '散箱' } as Record)[String(value)] || value || '—' }
+function destinationWarehouseLabel(row: DeliveryOrderRow) {
+ const code = row.destinationWarehouseCode?.trim()
+ const name = row.destinationWarehouseName?.trim()
+ return code && name && code !== name ? `${code} · ${name}` : code || name || '—'
+}
async function load(model: QueryModel = filters.value) { Object.assign(filters.value, model); loading.value = true; error.value = null; try { const range = Array.isArray(filters.value.plannedAt) ? filters.value.plannedAt.map(String) : []; const result = await listDeliveryOrders({ page: page.value, size: pageSize.value, documentNo: text('documentNo'), dispatchNo: text('dispatchNo'), waybillNo: text('waybillNo'), warehouseId: text('warehouseId'), status: text('status'), vehiclePlate: text('vehiclePlate'), driverName: text('driverName'), deliveryMethod: text('deliveryMethod'), plannedFrom: range[0] ? `${range[0]}T00:00:00` : undefined, plannedTo: range[1] ? `${range[1]}T23:59:59` : undefined }); rows.value = result.records; total.value = result.total } catch (cause) { rows.value = []; total.value = 0; error.value = getApiErrorDetails(cause, '派送单列表加载失败') } finally { loading.value = false } }
function text(key: string) { return String(filters.value[key] || '').trim() || undefined }
function open(row: DeliveryOrderRow) { void router.push({ name: 'overseas-delivery-order-detail', params: { deliveryNo: row.deliveryNo }, query: { customerId: row.customerId } }) }
@@ -123,7 +129,6 @@ const statusForm = reactive({ status: '', remark: '' })
let statusSequence = 0
const statusTargets = [
{ action: 'START_DELIVERY', value: 'DELIVERING', label: '派送中' },
- { action: 'COMPLETE_DELIVERY', value: 'DELIVERED', label: '派送完成' },
{ action: 'REJECT_DELIVERY', value: 'REJECTED', label: '已拒签' },
{ action: 'CANCEL_DELIVERY', value: 'CANCELLED', label: '已取消' },
]
@@ -153,9 +158,9 @@ async function submitStatus() {
if (!statusOpen.value || !statusRow.value || statusLoading.value || statusSaving.value || statusConflict.value || !access.can(permission.deliveryStatus) || !statusOptions.value.some(option => option.value === statusForm.status)) return
statusSaving.value = true; statusError.value = null
try {
- const result = await updateDeliveryOrderStatus(statusRow.value.deliveryNo, statusRow.value.customerId, { status: statusForm.status, expectedVersion: statusRow.value.version, remark: statusForm.remark.trim() || undefined })
+ await updateDeliveryOrderStatus(statusRow.value.deliveryNo, statusRow.value.customerId, { status: statusForm.status, expectedVersion: statusRow.value.version, remark: statusForm.remark.trim() || undefined })
statusOpen.value = false
- ElMessage.success(result.deliveryStatus === 'DELIVERED' ? '派送已完成，待回访记录已生成' : '派送状态已更新')
+ ElMessage.success('派送状态已更新')
await load()
} catch (cause) {
const details = getApiErrorDetails(cause, '派送状态更新失败')
@@ -168,6 +173,6 @@ function reset(model: QueryModel) { page.value = 1; void load(model) }
async function loadWarehouses() { if (!access.can(permission.warehouseList)) return; warehousesLoading.value = true; try { warehouses.value = (await listReceivingOverseasWarehouses()).records } catch { warehouses.value = [] } finally { warehousesLoading.value = false } }
onMounted(() => { void load(); void loadWarehouses() })
-详情编辑状态标记退货
{{ row.documentSummary ? `${row.documentSummary.uploadedCategoryCount}/3 已上传` : '资料摘要暂无' }}管理资料
{{ category.label }} · {{ row.documentSummary?.categories.find((item: { category: string }) => item.category === category.category)?.status === 'UPLOADED' ? '已上传' : '未上传' }}
暂无可退原出库明细
{{ item.palletNo || '—' }} · {{ item.skuCode || '—' }}（最多 {{ item.maxReturnPackages }} 箱）
详情编辑状态标记退货
{{ row.documentSummary ? `${row.documentSummary.uploadedCategoryCount}/3 已上传` : '资料摘要暂无' }}管理资料
{{ category.label }} · {{ row.documentSummary?.categories.find((item: { category: string }) => item.category === category.category)?.status === 'UPLOADED' ? '已上传' : '未上传' }}
暂无可退原出库明细
{{ item.palletNo || '—' }} · {{ item.skuCode || '—' }}（最多 {{ item.maxReturnPackages }} 箱）
返回出库单详情
出库单号 {{ outboundNo }}
- 出库信息
{{ show(detail.outbound.outboundNo) }}{{ outboundTypeLabel(detail.outbound.outboundType) }}{{ show(detail.outbound.dispatchNo) }}{{ statusLabel(detail.outbound.status) }}{{ warehouseLabel }}{{ detail.outbound.palletCount ?? '—' }}{{ detail.outbound.packageCount ?? '—' }}{{ formatOverseasDateTime(detail.outbound.createdAt) }}关联派送
{{ show(detail.delivery.deliveryNo) }}{{ show(detail.delivery.status) }}{{ show(detail.delivery.waybillNo) }}{{ show(detail.delivery.carrierName) }}{{ show(detail.delivery.driverName) }}{{ show(detail.delivery.vehiclePlate) }}{{ formatOverseasDateTime(detail.delivery.plannedDeliveryAt) }}{{ show(detail.delivery.remark) }}
+ 出库信息
{{ show(detail.outbound.outboundNo) }}{{ outboundTypeLabel(detail.outbound.outboundType) }}{{ show(detail.outbound.dispatchNo) }}{{ statusLabel(detail.outbound.status) }}{{ warehouseLabel }}{{ detail.outbound.palletCount ?? '—' }}{{ detail.outbound.packageCount ?? '—' }}{{ formatOverseasDateTime(detail.outbound.createdAt) }}关联派送
{{ show(delivery.destinationWarehouseCode || delivery.destinationWarehouseName) }}{{ show(delivery.deliveryNo) }}{{ statusLabel(delivery.status) }}{{ show(delivery.waybillNo) }}{{ show(delivery.carrierName) }}{{ show(delivery.driverName) }}{{ show(delivery.vehiclePlate) }}{{ formatOverseasDateTime(delivery.plannedDeliveryAt) }}{{ delivery.palletCount }}{{ delivery.packageCount }}{{ show(delivery.remark) }}
-