fix(delivery): version status commands and manage three document categories

src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts

@@ -13,6 +13,7 @@ describe('DeliveryOrderDetailView', () => {
     routeState.query = { customerId: '100' }
     vi.mocked(getDeliveryOrder).mockReset().mockResolvedValue({
       order: {
+        version: 3, allowedActions: ['COMPLETE_DELIVERY'],
         id: '1', customerId: '100', deliveryNo: 'DEL/1', outboundNo: 'OUT-1', dispatchNo: 'PC-1',
         status: 'DELIVERING', overseasWarehouseName: '洛杉矶仓', palletCount: 1, packageCount: 2,
         createdAt: '2026-09-01T10:00:00',

src/modules/overseas-warehouse/pages/DeliveryOrdersView.test.ts

@@ -1,19 +1,23 @@
 import ElementPlus from 'element-plus'
+import { defineComponent, h, type PropType } from 'vue'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { listDeliveryOrders, listDeliveryReturnInboundOptions, markDeliveryReturn } from '../api/deliveryOrders'
+import { getDeliveryOrder, listDeliveryOrders, listDeliveryReturnInboundOptions, markDeliveryReturn } from '../api/deliveryOrders'
 import { updateDeliveryOrderStatus } from '../api/customerVisits'
 import DeliveryOrdersView from './DeliveryOrdersView.vue'
 import { commonPhase5Stubs } from './phase5TestStubs'
+import { getDeliveryDocuments, deliveryDocumentCategories } from '../api/deliveryDocuments'
 
 const canPermission = vi.hoisted(() => vi.fn((_code: string) => false))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canPermission }) }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
-vi.mock('../api/deliveryOrders', () => ({ listDeliveryOrders: vi.fn(), listDeliveryReturnInboundOptions: vi.fn(), markDeliveryReturn: vi.fn() }))
+vi.mock('../api/deliveryOrders', () => ({ getDeliveryOrder: vi.fn(), listDeliveryOrders: vi.fn(), listDeliveryReturnInboundOptions: vi.fn(), markDeliveryReturn: vi.fn() }))
 vi.mock('../api/customerVisits', () => ({ updateDeliveryOrderStatus: vi.fn() }))
 vi.mock('../api/pallets', () => ({ listReceivingOverseasWarehouses: vi.fn() }))
+vi.mock('../api/deliveryDocuments', async importOriginal => ({ ...await importOriginal<typeof import('../api/deliveryDocuments')>(), getDeliveryDocuments: vi.fn() }))
 
 const row = {
+  version: 2, allowedActions: ['START_DELIVERY', 'COMPLETE_DELIVERY', 'REJECT_DELIVERY', 'CANCEL_DELIVERY'],
   id: '1', customerId: '100', deliveryNo: 'DEL/1', outboundNo: 'OUT-1', dispatchNo: 'PC-1',
   status: 'WAIT_DELIVERY', palletCount: 1, packageCount: 2, createdAt: '2026-09-01T10:00:00',
 }
@@ -25,6 +29,8 @@ function mountView() {
 describe('DeliveryOrdersView permissions and commands', () => {
   beforeEach(() => {
     canPermission.mockReset().mockReturnValue(false)
+    vi.mocked(getDeliveryDocuments).mockReset()
+    vi.mocked(getDeliveryOrder).mockReset().mockResolvedValue({ order: { ...row, version: 7 }, skus: [], fees: [], operations: [] })
     vi.mocked(listDeliveryOrders).mockReset().mockResolvedValue({ records: [row], page: 1, size: 10, total: 1, pages: 1 })
     vi.mocked(listDeliveryReturnInboundOptions).mockReset().mockResolvedValue([{ inboundOrderId: '9', inboundCode: 'IN-1', lastMileOrderNo: 'LM-1', customerId: '100' }])
     vi.mocked(markDeliveryReturn).mockReset().mockResolvedValue({ id: '19', exceptionNo: 'EXC-1', status: 'PENDING' })
@@ -47,9 +53,11 @@ describe('DeliveryOrdersView permissions and commands', () => {
     await flushPromises()
 
     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="编辑派送状态"] .dialog-confirm').trigger('click')
     await flushPromises()
-    expect(updateDeliveryOrderStatus).toHaveBeenCalledWith('DEL/1', '100', { status: 'WAIT_DELIVERY', remark: undefined })
+    expect(updateDeliveryOrderStatus).toHaveBeenCalledWith('DEL/1', '100', { status: 'DELIVERED', expectedVersion: 7, remark: undefined })
 
     await wrapper.findAll('button').find(button => button.text().includes('标记退货'))!.trigger('click')
     await flushPromises()
@@ -75,4 +83,64 @@ describe('DeliveryOrdersView permissions and commands', () => {
     expect(markDeliveryReturn).not.toHaveBeenCalled()
     wrapper.unmount()
   })
+
+  it('maps delivering separately from completion and blocks duplicate or conflicted submission', async () => {
+    canPermission.mockReturnValue(true)
+    const wrapper = mountView()
+    await flushPromises()
+    await wrapper.findAll('button').find(button => button.text().includes('编辑状态'))!.trigger('click')
+    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="WAIT_DELIVERY"]').exists()).toBe(false)
+    await select.setValue('DELIVERING')
+    await wrapper.find('[data-dialog="编辑派送状态"] textarea').setValue('123')
+    let reject!: (error: unknown) => void
+    vi.mocked(updateDeliveryOrderStatus).mockReturnValueOnce(new Promise((_resolve, rejectRequest) => { reject = rejectRequest }))
+    const button = wrapper.find('[data-dialog="编辑派送状态"] .dialog-confirm')
+    await button.trigger('click'); await button.trigger('click')
+    expect(updateDeliveryOrderStatus).toHaveBeenCalledTimes(1)
+    expect(updateDeliveryOrderStatus).toHaveBeenCalledWith('DEL/1', '100', { status: 'DELIVERING', expectedVersion: 7, remark: '123' })
+    reject({ isAxiosError: true, response: { status: 409, data: { code: 'A0409', message: '版本冲突', requestId: 'req-conflict', traceId: 'trace-conflict' } } })
+    await flushPromises()
+    const state = wrapper.vm as unknown as { statusConflict: boolean; statusOpen: boolean; statusForm: { remark: string }; refreshStatus: () => Promise<void> }
+    expect(state.statusConflict).toBe(true)
+    expect(state.statusOpen).toBe(true)
+    expect(state.statusForm.remark).toBe('123')
+    await button.trigger('click')
+    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'])
+    wrapper.unmount()
+  })
+
+  it('hides status editing when the server supplies no actions', async () => {
+    canPermission.mockReturnValue(true)
+    vi.mocked(listDeliveryOrders).mockResolvedValue({ records: [{ ...row, status: 'DELIVERED', allowedActions: [] }], 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()
+    wrapper.unmount()
+  })
+
+  it('renders category counts from the list without per-row document requests', async () => {
+    canPermission.mockReturnValue(true)
+    const documentSummary = { uploadedCategoryCount: 1, totalCategoryCount: 3, categories: deliveryDocumentCategories.map(item => ({ category: item.category, status: item.category === 'RECEIPT' ? 'UPLOADED' as const : 'MISSING' as const, fileCount: item.category === 'RECEIPT' ? 3 : 0 })) }
+    vi.mocked(listDeliveryOrders).mockResolvedValue({ records: [{ ...row, documentSummary }], page: 1, size: 10, total: 1, pages: 1 })
+    const table = defineComponent({ props: { data: Array as PropType<object[]> }, setup(props, { slots }) { return () => h('div', props.data?.flatMap(item => slots.documents?.({ row: item }) || [])) } })
+    const wrapper = mount(DeliveryOrdersView, { global: { plugins: [ElementPlus], stubs: { ...commonPhase5Stubs, DataTable: table, DeliveryDocumentsDialog: true } } })
+    await flushPromises()
+    expect(wrapper.text()).toContain('1/3 已上传')
+    expect(wrapper.text()).toContain('签收文件（POD签收/快递签收） · 已上传')
+    expect(getDeliveryDocuments).not.toHaveBeenCalled()
+    await wrapper.findAll('button').find(button => button.text().includes('管理资料'))!.trigger('click')
+    const dialog = wrapper.findComponent({ name: 'DeliveryDocumentsDialog' })
+    expect(dialog.props()).toMatchObject({ deliveryNo: 'DEL/1', customerId: '100', modelValue: true })
+    const calls = vi.mocked(listDeliveryOrders).mock.calls.length
+    dialog.vm.$emit('saved'); await flushPromises()
+    expect(listDeliveryOrders).toHaveBeenCalledTimes(calls + 1)
+    wrapper.unmount()
+  })
 })

src/modules/overseas-warehouse/pages/OutboundDetailView.test.ts

@@ -15,7 +15,7 @@ describe('OutboundDetailView', () => {
     vi.mocked(getOutbound).mockReset().mockResolvedValue({
       outbound: { id: '1', outboundNo: 'OUT/1', dispatchNo: 'PC-1', status: 'PICKED', palletCount: 2, packageCount: 20, createdAt: '2026-09-01T10:00:00' },
       pallets: [{ palletNo: 'IP-ACY2-20260907-597057-P001', inboundCode: 'NYEXX2609060063', destinationWarehouseCode: 'ONT8', destinationWarehouseName: 'Amazon ONT8', skuCode: 'SKU-001', packageCount: 20 }],
-      delivery: { id: '2', customerId: 'customer-1', deliveryNo: 'DEL-1', outboundNo: 'OUT/1', dispatchNo: 'PC-1', status: 'WAIT_DELIVERY', palletCount: 2, packageCount: 20, createdAt: '2026-09-01T10:00:00' },
+      delivery: { version: 2, allowedActions: ['START_DELIVERY'], id: '2', customerId: 'customer-1', deliveryNo: 'DEL-1', outboundNo: 'OUT/1', dispatchNo: 'PC-1', status: 'WAIT_DELIVERY', palletCount: 2, packageCount: 20, createdAt: '2026-09-01T10:00:00' },
     })
   })