{{ section.note }}
-暂无对应统计
-{{ series.label }}（{{ series.unit }}）
-
{{ point.label }}{{ point.value }}
-
+
+ {{ workStatus(detail.item) }}
+
+
+ {{ detail.item.nextAction.label }}
@@ -133,15 +157,43 @@ onBeforeUnmount(() => { ++request; controller?.abort() })
{{ candidate.label }}
-
-
-
+
+
+
+
+
+
diff --git a/src/modules/appointment-calendar/WorkDispatchForm.test.ts b/src/modules/appointment-calendar/WorkDispatchForm.test.ts
index 35886319..a36bb194 100644
--- a/src/modules/appointment-calendar/WorkDispatchForm.test.ts
+++ b/src/modules/appointment-calendar/WorkDispatchForm.test.ts
@@ -1,146 +1,162 @@
import { flushPromises, mount } from '@vue/test-utils'
import { beforeEach, expect, it, vi } from 'vitest'
import WorkDispatchForm from './WorkDispatchForm.vue'
-import { getDispatch, getBatchDispatchCandidates, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, preArrangeDraftDispatch, releaseDispatchDraft, type BatchDispatchCandidate } from '@/modules/overseas-warehouse'
+import { getDispatch, getBatchDispatchCandidates, listDispatchCandidates, createDispatchDraft, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, convertDispatchDraft, releaseDispatchDraft, type BatchDispatchCandidate, type Candidate, type CommandResult, type DispatchDetail, type DispatchDraft } from '@/modules/overseas-warehouse'
+import { ApiResponseError, http } from '@/shared/api/http'
+import { parseApiJsonResponse } from '@chongchong/shared'
import { getReceivingContext, type ReceivingContext } from './receivingApi'
import { batchContext } from './batch.test-support'
import type { LeaveGuard } from './useWorkDraft'
-const access = vi.hoisted(() => ({ allowed: true }))
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => access.allowed }) }))
+const access = vi.hoisted(() => ({ allowed: true, denied: [] as string[] }))
+const identity = vi.hoisted(() => ({ id: '' }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => access.allowed && !access.denied.includes(permission) }) }))
+vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
-vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original(), getDispatch: vi.fn(), getBatchDispatchCandidates: vi.fn(), createDispatchDraftContainer: vi.fn(), listDispatchDrafts: vi.fn(), lockDispatchDraftPallet: vi.fn(), preArrangeDraftDispatch: vi.fn(), releaseDispatchDraft: vi.fn() }))
+vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original(), getDispatch: vi.fn(), getBatchDispatchCandidates: vi.fn(), listDispatchCandidates: vi.fn(), createDispatchDraft: vi.fn(), createDispatchDraftContainer: vi.fn(), listDispatchDrafts: vi.fn(), lockDispatchDraftPallet: vi.fn(), convertDispatchDraft: vi.fn(), releaseDispatchDraft: vi.fn() }))
vi.mock('./receivingApi', async original => ({ ...await original(), getReceivingContext: vi.fn() }))
-function receiving(batchKey: string, vehicles: ReceivingContext['transport']['vehicles'] = []): ReceivingContext { return { batch: batchContext('AP-1', batchKey).appointment, plans: [], agreements: [], pendingChanges: [], transport: { version: 'v1', vehicles, blockReasons: [] }, executionScope: { version: 'e1', members: [] }, allowedActions: [], blockReasons: [] } }
-const candidate: BatchDispatchCandidate = { planPalletId: '9007199254740993', palletNo: 'PL-TEST', planId: 'plan-1', planNo: 'IP-001', customerId: 'customer-a', sourceStage: 'RECEIVED', packageCount: 12, allocations: [{ planPalletId: '9007199254740993', batchKey: 'FBA_APPOINTMENT:1', customerId: 'customer-a', sourceKey: 'BOOKING:9', destinationKey: 'FBA:ONT8', packageCount: 12 }], blockReasons: [] }
-let guard: LeaveGuard
-function render() { return mount(WorkDispatchForm, { props: { batchKeys: ['FBA_APPOINTMENT:1'], canWrite: true }, global: { provide: { 'appointment-work-leave-guard': (value: LeaveGuard) => { guard = value; return () => undefined } }, stubs: { WorkSharedTripForm: { name: 'WorkSharedTripForm', props: ['dispatchNo', 'canWrite'], template: '' }, ElButton: { props: ['disabled'], template: '' }, LoadErrorState: { props: ['message'], template: ', text: string) { return wrapper.findAll('button').find(button => button.text() === text)! }
+const clone = (value: T): T => JSON.parse(JSON.stringify(value)) as T
+const batch = 'FBA_APPOINTMENT:1'
+function receiving(key = batch, vehicles: ReceivingContext['transport']['vehicles'] = []): ReceivingContext { return { batch: batchContext('AP-1', key).appointment, plans: [], agreements: [], pendingChanges: [], transport: { version: 'transport', vehicles, blockReasons: [] }, executionScope: { version: 'execution', members: [] }, allowedActions: [], blockReasons: [] } }
+function row(id = '9007199254740993', customerId = 'customer-a', key = batch): BatchDispatchCandidate { return { planPalletId: id, palletNo: `PALLET-${id.slice(-2)}`, planId: `plan-${id}`, planNo: 'IP-001', customerId, sourceStage: 'RECEIVED', packageCount: 12, allocations: [{ planPalletId: id, batchKey: key, customerId, sourceKey: customerId === 'customer-a' ? 'ORDER:1' : 'BOOKING:2', destinationKey: 'FBA:ONT8', packageCount: 12, recordVersion: 4 }], blockReasons: [] } }
+function candidate(value = row()): Candidate { return { selection: { sourceType: 'INBOUND_PLAN', planPalletId: value.planPalletId, returnReceiptId: null, relabelNo: null, warehousePalletId: `pallet-${value.planPalletId}`, sourceVersion: `source-${value.planPalletId}` }, sourceKey: `cargo-${value.planPalletId}`, sourceVersion: `source-${value.planPalletId}`, customerId: value.customerId, customerName: value.customerId === 'customer-a' ? '客户甲' : '客户乙', warehouseId: 'origin-1', warehouseCode: 'LAX', warehouseName: '真实起运仓', orderNo: 'LM-1', inboundCode: 'IN-A', planNo: value.planNo, palletNo: value.palletNo, containerNo: null, destination: { key: 'CODE:ONT8', type: 'FBA', warehouseId: null, warehouseCode: 'ONT8', warehouseName: 'ONT8', address: null, postalCode: null, contactName: null, contactPhone: null }, availablePackages: 12, suggestedWeightKg: null, suggestedVolumeCbm: null, measurementSource: null, appointmentBatches: [], blockReasons: [] } }
+function detail(no = 'DS/001', version = 1): DispatchDetail {
+ const review = { status: 'NOT_SUBMITTED' as const, reason: null, reviewerId: null, reviewedAt: null, reviewRound: 0, basisHash: null, invalidatedReason: null }
+ return { dispatchNo: no, status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: version, reviewState: 'DRAFT', reviews: { dispatchReview: review, loadingReview: review }, counts: { itemCount: 1, palletCount: 1, packageCount: 12, pickedPackageCount: 0, shippedPackageCount: 0 }, pickingReconciled: false, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null }, ADD_CARGO: { allowed: true, blockCode: null, blockReason: null } }, vehicleInfo: { vehicle: null, driver: null }, dispatchInfo: { route: null, plannedDepartureAt: null, departedAt: null, estimatedArrivalAt: null, fbaAppointments: [], vehicleAppointment: null, appointmentBatches: [{ batchKey: batch, batchNo: 'AP-1', recordVersion: 4, customerId: 'customer-a', sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 12 }] }] }, documents: { dispatchNo: no, outbounds: [], deliveries: [], createdAt: '', updatedAt: '', remark: null }, orderDetails: [] }
+}
+function proof(key: string): CommandResult { return { dispatchNo: 'DS/001', action: 'CREATE', idempotencyKey: key, recordVersion: 1, status: 'ACTIVE', stage: 'BEFORE_LOADING', occurredAt: '2026-10-19T00:00:00Z', effect: 'APPLIED', counts: detail().counts, result: { dispatchNo: 'DS/001', changedItemIds: [] }, replayed: false, alreadyArranged: false } }
+let guard: LeaveGuard, natives: Candidate[], draft: DispatchDraft
+function render(props: { batchKeys?: string[]; canWrite?: boolean } = {}) { return mount(WorkDispatchForm, { props: { batchKeys: [batch], canWrite: true, ...props }, global: { provide: { 'appointment-work-leave-guard': (value: LeaveGuard) => { guard = value; return () => undefined } }, stubs: { WorkSharedTripForm: { name: 'WorkSharedTripForm', props: ['dispatchNo', 'canWrite'], template: '' }, ElButton: { props: ['disabled'], template: '' }, LoadErrorState: { props: ['message'], template: ', label: string) => wrapper.findAll('button').find(value => value.text() === label)!
+it.each([0, '0', '9007199254740993'])('preserves authoritative allocation version %s from the existing batch provider', async recordVersion => {
+ const value = row(); value.allocations[0]!.recordVersion = recordVersion
+ vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: batch, version: 4, candidates: [value], blockReasons: [] })
+ const wrapper = render()
+ try {
+ await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
+ expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations[0]!.recordVersion).toBe(recordVersion)
+ } finally { wrapper.unmount() }
+})
+it.each([undefined, null, 'bad', 9007199254740992])('blocks an existing-batch candidate lacking a valid authoritative version: %s', async recordVersion => {
+ const value = row(); value.allocations[0]!.recordVersion = recordVersion as unknown as number
+ vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: batch, version: 0, candidates: [value], blockReasons: [] })
+ const wrapper = render()
+ try { await flushPromises(); expect(wrapper.text()).toContain('预约批次版本缺失或无效，请重新读取候选'); expect(createDispatchDraft).not.toHaveBeenCalled() }
+ finally { wrapper.unmount() }
+})
beforeEach(() => {
- vi.clearAllMocks(); access.allowed = true
- vi.mocked(getReceivingContext).mockImplementation(async batchKey => receiving(batchKey))
- vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: 'FBA_APPOINTMENT:1', version: 4, candidates: [structuredClone(candidate)], blockReasons: [] })
- vi.mocked(listDispatchDrafts).mockResolvedValue([])
- vi.mocked(createDispatchDraftContainer).mockResolvedValue({ id: 'container-1', capacity: 30, palletIds: [] })
- vi.mocked(lockDispatchDraftPallet).mockResolvedValue(null)
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue([{ draftContainerId: 'container-1', dispatch: { id: 'internal-dispatch', dispatchNo: 'DS-001', appointmentBatches: [], overseasWarehouseId: 'origin-1', overseasWarehouseName: '测试起运仓' } }])
+ vi.resetAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID(); access.allowed = true; access.denied = []
+ natives = [candidate()]; draft = { draftToken: 'server-owned-token', recordVersion: 0, status: 'ACTIVE', warehouseId: 'origin-1', containers: [], sources: [], expiresAt: '2026-10-20T00:00:00Z' }
+ vi.mocked(getReceivingContext).mockImplementation(async key => receiving(key))
+ vi.mocked(getBatchDispatchCandidates).mockImplementation(async key => ({ batchKey: key, version: 4, candidates: [row('9007199254740993', 'customer-a', key)], blockReasons: [] }))
+ vi.mocked(listDispatchCandidates).mockImplementation(async () => ({ candidates: clone(natives), complete: true, snapshotAt: '2026-10-19T00:00:00Z' }))
+ vi.mocked(createDispatchDraft).mockImplementation(async () => clone(draft))
+ vi.mocked(createDispatchDraftContainer).mockImplementation(async body => { draft.recordVersion = 1; draft.containers = [{ draftContainerId: 'container-1', sequenceNo: 1, capacity: body.capacity, sourceKeys: [] }]; return clone(draft) })
+ vi.mocked(lockDispatchDraftPallet).mockImplementation(async body => { const source = natives.find(value => value.selection.planPalletId === body.source.planPalletId)!; draft.recordVersion = Number(draft.recordVersion) + 1; draft.sources.push(clone(source)); draft.containers[0]!.sourceKeys.push(source.sourceKey); return clone(draft) })
+ vi.mocked(convertDispatchDraft).mockImplementation(async body => ({ draftToken: body.draftToken, replayed: false, vehicles: [{ draftContainerId: 'container-1', dispatch: proof(body.groups[0]!.dispatch.idempotencyKey) }] }))
+ vi.mocked(getDispatch).mockImplementation(async no => detail(no)); vi.mocked(listDispatchDrafts).mockImplementation(async () => [clone(draft)])
+ vi.mocked(releaseDispatchDraft).mockImplementation(async () => ({ ...clone(draft), status: 'RELEASED', containers: [], sources: [] }))
})
-it('restores the original FBA dispatch after remount and opens trip preparation without any draft or creation', async () => {
- vi.mocked(getReceivingContext).mockResolvedValue(receiving('FBA_APPOINTMENT:1', [{ dispatchNo: 'DS-EXISTING', batchKey: 'FBA_APPOINTMENT:1', customerId: 'customer-a', tripNo: null, version: null, status: 'PENDING_DEPARTURE', packageCount: 4 }]))
- vi.mocked(getDispatch).mockResolvedValue({ id: 'dispatch-1', dispatchNo: 'DS-EXISTING', status: 'PENDING_DEPARTURE', overseasWarehouseId: 'origin-1', packageCount: 4, appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'customer-a', sources: [] }] })
- for (let mountNumber = 0; mountNumber < 2; mountNumber++) {
- const wrapper = render(); await flushPromises()
- expect(wrapper.text()).toContain('DS-EXISTING')
- expect(wrapper.text()).not.toContain('创建本客户排车单')
- await button(wrapper, '继续安排本批车辆').trigger('click'); await flushPromises()
- expect(wrapper.getComponent({ name: 'TripPreparationDialog' }).props()).toMatchObject({ warehouseId: 'origin-1', dispatchNos: ['DS-EXISTING'] })
- await button(wrapper, '查看原排车单').trigger('click')
- expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches?dispatchNo=DS-EXISTING']])
- wrapper.unmount()
+it('creates the whole dispatch when native Long candidate quantities arrive as strings and batch quantities are Integers', async () => {
+ const actual = await vi.importActual('../overseas-warehouse/api/dispatches')
+ const get = vi.spyOn(http, 'get').mockResolvedValue(parseApiJsonResponse(JSON.stringify({ code: '200', data: { candidates: [{ ...candidate(), availablePackages: '12' }], complete: true, snapshotAt: '' } })))
+ vi.mocked(listDispatchCandidates).mockImplementation(actual.listDispatchCandidates)
+ const wrapper = render()
+ try {
+ await flushPromises(); expect(wrapper.get('input').attributes('disabled')).toBeUndefined()
+ await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
+ expect(convertDispatchDraft).toHaveBeenCalledOnce(); expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual(row().allocations)
+ expect(vi.mocked(lockDispatchDraftPallet).mock.calls[0]![0].source.planPalletId).toBe('9007199254740993'); expect(wrapper.emitted('updated')).toHaveLength(1)
+ } finally { wrapper.unmount(); get.mockRestore() }
+})
+it('restores existing batch dispatches after remount and navigates to the same whole dispatch without any creation', async () => {
+ vi.mocked(getReceivingContext).mockImplementation(async key => receiving(key, [{ dispatchNo: 'DS/EXISTING', batchKey: key, customerId: 'customer-a', tripNo: null, version: null, status: 'ACTIVE', packageCount: 12 }]))
+ for (let index = 0; index < 2; index++) {
+ const wrapper = render(); await flushPromises(); expect(wrapper.text()).toContain('DS/EXISTING')
+ await button(wrapper, '继续维护本车').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS%2FEXISTING']]); expect(wrapper.text()).not.toContain('创建整车排车单'); wrapper.unmount()
}
- expect(getBatchDispatchCandidates).not.toHaveBeenCalled()
- expect(createDispatchDraftContainer).not.toHaveBeenCalled()
- expect(lockDispatchDraftPallet).not.toHaveBeenCalled()
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
+ expect(getBatchDispatchCandidates).not.toHaveBeenCalled(); expect(createDispatchDraft).not.toHaveBeenCalled(); expect(convertDispatchDraft).not.toHaveBeenCalled()
})
-it('fails closed when transport relations cannot be read', async () => {
- vi.mocked(getReceivingContext).mockRejectedValue(new Error('unavailable'))
- const wrapper = render(); await flushPromises()
- expect(wrapper.text()).not.toContain('创建本客户排车单')
- expect(getBatchDispatchCandidates).not.toHaveBeenCalled()
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- wrapper.unmount()
+it('does not fall back to new creation when transport relations fail or their nested batch ownership differs', async () => {
+ vi.mocked(getReceivingContext).mockRejectedValueOnce(new Error('unavailable')); const failed = render(); await flushPromises(); expect(failed.text()).toContain('批次可排实物读取失败'); expect(getBatchDispatchCandidates).not.toHaveBeenCalled(); failed.unmount()
+ vi.mocked(getReceivingContext).mockResolvedValueOnce(receiving(batch, [{ dispatchNo: 'DS-OLD', batchKey: batch, customerId: 'customer-b', tripNo: null, version: null, status: 'ACTIVE', packageCount: 12 }]))
+ const mismatch = render(); await flushPromises(); expect(mismatch.text()).toContain('排车单与工作批次关联不一致'); expect(mismatch.text()).not.toContain('核对本批剩余可排实物'); expect(createDispatchDraft).not.toHaveBeenCalled(); mismatch.unmount()
})
-it('does not offer remaining-cargo creation when the original dispatch no longer owns this batch', async () => {
- vi.mocked(getReceivingContext).mockResolvedValue(receiving('FBA_APPOINTMENT:1', [{ dispatchNo: 'DS-EXISTING', batchKey: 'FBA_APPOINTMENT:1', customerId: 'customer-a', tripNo: null, version: null, status: 'PENDING_DEPARTURE', packageCount: 4 }]))
- vi.mocked(getDispatch).mockResolvedValue({ id: 'dispatch-1', dispatchNo: 'DS-EXISTING', status: 'PENDING_DEPARTURE', appointmentBatches: [] })
- const wrapper = render(); await flushPromises()
- expect(wrapper.text()).toContain('排车单与工作批次关联不一致')
- expect(wrapper.text()).not.toContain('创建本客户排车单')
- expect(wrapper.text()).not.toContain('核对本批剩余可排实物')
- expect(getBatchDispatchCandidates).not.toHaveBeenCalled()
- wrapper.unmount()
+it('reads remaining physical cargo only after an explicit choice while retaining the original dispatch', async () => {
+ vi.mocked(getReceivingContext).mockImplementation(async key => receiving(key, [{ dispatchNo: 'DS-OLD', batchKey: key, customerId: 'customer-a', tripNo: null, version: null, status: 'ACTIVE', packageCount: 12 }]))
+ const wrapper = render(); await flushPromises(); expect(getBatchDispatchCandidates).not.toHaveBeenCalled()
+ await button(wrapper, '核对本批剩余可排实物').trigger('click'); await flushPromises(); expect(getBatchDispatchCandidates).toHaveBeenCalledExactlyOnceWith(batch); expect(wrapper.text()).toContain('DS-OLD'); expect(convertDispatchDraft).not.toHaveBeenCalled(); wrapper.unmount()
})
-it('loads remaining eligible cargo only after an explicit choice while retaining the existing dispatch', async () => {
- vi.mocked(getReceivingContext).mockResolvedValue(receiving('FBA_APPOINTMENT:1', [{ dispatchNo: 'DS-EXISTING', batchKey: 'FBA_APPOINTMENT:1', customerId: 'customer-a', tripNo: null, version: null, status: 'PENDING_DEPARTURE', packageCount: 4 }]))
- vi.mocked(getDispatch).mockResolvedValue({ id: 'dispatch-1', dispatchNo: 'DS-EXISTING', status: 'PENDING_DEPARTURE', appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'customer-a', sources: [] }] })
- const wrapper = render(); await flushPromises()
- expect(getBatchDispatchCandidates).not.toHaveBeenCalled()
- await button(wrapper, '核对本批剩余可排实物').trigger('click'); await flushPromises()
- expect(getBatchDispatchCandidates).toHaveBeenCalledExactlyOnceWith('FBA_APPOINTMENT:1')
- expect(wrapper.text()).toContain('DS-EXISTING')
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- wrapper.unmount()
+it('uses a server-owned draft, explicit zero versions, native source hashes and exact allocations for one whole dispatch', async () => {
+ const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
+ expect(createDispatchDraft).toHaveBeenCalledWith({ warehouseId: 'origin-1', idempotencyKey: expect.any(String) })
+ expect(createDispatchDraftContainer).toHaveBeenCalledWith({ draftToken: 'server-owned-token', recordVersion: 0, idempotencyKey: expect.any(String), capacity: 30 })
+ expect(lockDispatchDraftPallet).toHaveBeenCalledWith({ draftToken: 'server-owned-token', draftContainerId: 'container-1', recordVersion: 1, idempotencyKey: expect.any(String), source: natives[0]!.selection })
+ const request = vi.mocked(convertDispatchDraft).mock.calls[0]![0]
+ expect(request).toMatchObject({ draftToken: 'server-owned-token', recordVersion: 2, groups: [{ draftContainerId: 'container-1', dispatch: { warehouseId: 'origin-1', cargo: [natives[0]!.selection], batchAllocations: row().allocations, vehicle: null, driver: null } }] })
+ expect(wrapper.text()).toContain('DS/001'); expect(wrapper.emitted('updated')).toHaveLength(1); expect(await guard()).toBe(true)
+ await button(wrapper, '继续维护本车').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS%2F001']]); wrapper.unmount()
})
-it('copies exact server allocations into a real draft group and continues into original trip preparation', async () => {
- const wrapper = render(); await flushPromises(); await wrapper.get('input[type=checkbox]').setValue(true)
- await button(wrapper, '创建本客户排车单').trigger('click'); await flushPromises()
- expect(preArrangeDraftDispatch).toHaveBeenCalledWith({ draftToken: expect.any(String), groups: [{ draftContainerId: 'container-1', planPalletIds: [candidate.planPalletId], returnReceiptIds: [], batchAllocations: candidate.allocations }] })
- expect(wrapper.text()).toContain('DS-001'); expect(wrapper.text()).not.toContain('internal-dispatch')
- const prepare = wrapper.getComponent({ name: 'TripPreparationDialog' })
- expect(prepare.props()).toMatchObject({ warehouseId: 'origin-1', dispatchNos: ['DS-001'] })
- prepare.vm.$emit('saved', { trip: { tripNo: 'TR-001' } }); expect(wrapper.emitted('external')).toEqual([['/overseas-master-data/trips/TR-001']])
- wrapper.unmount()
+it('combines same-warehouse real customers in one container and keeps each batch source owner', async () => {
+ const second = row('9007199254740994', 'customer-b'); natives.push(candidate(second)); vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: batch, version: 4, candidates: [row(), second], blockReasons: [] })
+ const wrapper = render(); await flushPromises(); expect(wrapper.findAll('input').map(input => (input.element as HTMLInputElement).checked)).toEqual([true, true])
+ await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const groups = vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups
+ expect(groups).toHaveLength(1); expect(groups[0]!.dispatch.cargo).toEqual(natives.map(value => value.selection)); expect(groups[0]!.dispatch.batchAllocations.map(value => value.customerId)).toEqual(['customer-a', 'customer-b']); expect(wrapper.text()).not.toContain('共车'); wrapper.unmount()
})
-it('opens quantity splitting for only the current batch without locking physical cargo or creating a new full-source appointment', async () => {
- const wrapper = render(); await flushPromises()
- await button(wrapper, '按当前批次箱数分批').trigger('click')
- expect(wrapper.emitted('batch')).toEqual([['FBA_APPOINTMENT:1']])
- expect(lockDispatchDraftPallet).not.toHaveBeenCalled(); expect(preArrangeDraftDispatch).not.toHaveBeenCalled(); wrapper.unmount()
+it('preserves exact distinct batch allocations while combining selected same-warehouse batches', async () => {
+ const otherKey = 'FBA_APPOINTMENT:2', second = row('9007199254740994', 'customer-b', otherKey); natives.push(candidate(second))
+ vi.mocked(getBatchDispatchCandidates).mockImplementation(async key => ({ batchKey: key, version: 4, candidates: [key === batch ? row() : second], blockReasons: [] }))
+ const wrapper = render({ batchKeys: [batch, otherKey] }); await flushPromises(); for (const input of wrapper.findAll('input[type="checkbox"]')) await input.setValue(true)
+ await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual([...row().allocations, ...second.allocations]); wrapper.unmount()
})
-it('preselects only eligible physical cargo of the entered batch, never unrelated allocations or unknown quantity', async () => {
- vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: 'FBA_APPOINTMENT:1', version: 4, blockReasons: [], candidates: [candidate, { ...candidate, planPalletId: 'other-batch', allocations: [{ ...candidate.allocations[0]!, batchKey: 'FBA_APPOINTMENT:999' }] }, { ...candidate, planPalletId: 'unknown', packageCount: null }] })
- const wrapper = render(); await flushPromises()
- const inputs = wrapper.findAll('input[type=checkbox]')
- expect(inputs.map(input => (input.element as HTMLInputElement).checked)).toEqual([true, false, false])
- expect(inputs[1]!.attributes('disabled')).toBeDefined()
- await button(wrapper, '创建本客户排车单').trigger('click'); await flushPromises()
- expect(vi.mocked(preArrangeDraftDispatch).mock.calls[0]![0].groups[0]!.planPalletIds).toEqual([candidate.planPalletId])
- expect(vi.mocked(preArrangeDraftDispatch).mock.calls[0]![0].groups[0]!.batchAllocations).toEqual(candidate.allocations)
- wrapper.unmount()
+it('keeps blocked, mismatched-customer, wrong-source and unknown-quantity cargo out of the payload', async () => {
+ const blocked = { ...row('2'), blockReasons: ['本托已被其他排车占用'] }, wrong = row('3'), unknown = { ...row('4'), packageCount: null }, wrongSource = row('5')
+ wrong.allocations[0]!.customerId = 'customer-b'; wrongSource.allocations[0]!.sourceKey = 'ORDER:unrelated'; natives.push(...[blocked, wrong, unknown, wrongSource].map(value => candidate(value)))
+ vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: batch, version: 4, candidates: [row(), blocked, wrong, unknown, wrongSource], blockReasons: [] })
+ const wrapper = render(); await flushPromises(); expect(wrapper.findAll('input').map(input => (input.element as HTMLInputElement).checked)).toEqual([true, false, false, false, false])
+ expect(wrapper.text()).toContain('本托已被其他排车占用'); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual(row().allocations); wrapper.unmount()
})
-it('replays a submitted draft without re-locking already dispatched pallets after an unknown response', async () => {
- vi.mocked(preArrangeDraftDispatch).mockRejectedValueOnce(new Error('lost response'))
- const wrapper = render(); await flushPromises(); await wrapper.get('input[type=checkbox]').setValue(true)
- await button(wrapper, '创建本客户排车单').trigger('click'); await flushPromises()
- const first = vi.mocked(preArrangeDraftDispatch).mock.calls[0]![0]
- expect(await guard()).toBe(false)
- await button(wrapper, '重试本次预排').trigger('click'); await flushPromises()
- expect(preArrangeDraftDispatch).toHaveBeenNthCalledWith(2, first); expect(lockDispatchDraftPallet).toHaveBeenCalledTimes(1); expect(createDispatchDraftContainer).toHaveBeenCalledTimes(1)
- wrapper.unmount()
+it('fails closed on incomplete native candidates, missing versions, and cross-warehouse batches', async () => {
+ vi.mocked(listDispatchCandidates).mockResolvedValueOnce({ candidates: natives, complete: false, snapshotAt: '' }); const incomplete = render(); await flushPromises(); expect(incomplete.text()).toContain('未完整返回'); expect(createDispatchDraft).not.toHaveBeenCalled(); incomplete.unmount()
+ natives[0]!.selection.sourceVersion = ''; const missing = render(); await flushPromises(); expect(missing.get('input').attributes('disabled')).toBeDefined(); missing.unmount()
+ vi.mocked(getReceivingContext).mockImplementation(async key => { const value = receiving(key); if (key !== batch) value.batch.originWarehouseId = 'another-warehouse'; return value })
+ const cross = render({ batchKeys: [batch, 'FBA_APPOINTMENT:2'] }); await flushPromises(); expect(cross.text()).toContain('相同的起运仓'); expect(convertDispatchDraft).not.toHaveBeenCalled(); cross.unmount()
})
-it('recovers a draft container from the same token when its creation response was lost', async () => {
- vi.mocked(createDispatchDraftContainer).mockRejectedValueOnce(new Error('lost create response'))
- const wrapper = render(); await flushPromises(); await wrapper.get('input[type=checkbox]').setValue(true)
- await button(wrapper, '创建本客户排车单').trigger('click'); await flushPromises()
- const token = vi.mocked(createDispatchDraftContainer).mock.calls[0]![0]
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: token, containers: [{ id: 'container-1', capacity: 30, palletIds: [] }] }])
- await button(wrapper, '重试本次预排').trigger('click'); await flushPromises()
- expect(createDispatchDraftContainer).toHaveBeenCalledTimes(1); expect(preArrangeDraftDispatch).toHaveBeenCalledTimes(1); wrapper.unmount()
+it('retains the entire original conversion and skips all prior locks after an unknown response, even after remount with the work closed', async () => {
+ vi.mocked(convertDispatchDraft).mockRejectedValueOnce(new Error('lost response'))
+ const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const original = clone(vi.mocked(convertDispatchDraft).mock.calls[0]![0])
+ expect(await guard()).toBe(false); wrapper.unmount()
+ const restored = render({ canWrite: false }); await flushPromises(); expect(restored.text()).toContain('原请求已保留'); await button(restored, '核对并重试原请求').trigger('click'); await flushPromises()
+ expect(convertDispatchDraft).toHaveBeenNthCalledWith(2, original); expect(lockDispatchDraftPallet).toHaveBeenCalledTimes(1); expect(createDispatchDraftContainer).toHaveBeenCalledTimes(1); expect(restored.emitted('updated')).toHaveLength(1); restored.unmount()
})
-it('shows server blockers and prevents mixing customers or selecting blocked physical cargo', async () => {
- vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: 'FBA_APPOINTMENT:1', version: 4, blockReasons: [], candidates: [candidate, { ...candidate, planPalletId: '2', customerId: 'customer-b', allocations: [{ ...candidate.allocations[0]!, customerId: 'customer-b', planPalletId: '2' }] }, { ...candidate, planPalletId: '3', blockReasons: ['本托货量超过本批剩余可排量'] }] })
- const wrapper = render(); await flushPromises(); const inputs = wrapper.findAll('input[type=checkbox]')
- expect(inputs[2]!.attributes('disabled')).toBeDefined(); expect(wrapper.text()).toContain('本托货量超过本批剩余可排量')
- await inputs[0]!.setValue(true); await inputs[1]!.setValue(true)
- expect((inputs[1]!.element as HTMLInputElement).checked).toBe(false)
- await button(wrapper, '创建本客户排车单').trigger('click'); await flushPromises()
- expect(vi.mocked(preArrangeDraftDispatch).mock.calls[0]![0].groups[0]!.planPalletIds).toEqual([candidate.planPalletId]); wrapper.unmount()
+it('retries the exact container command after a lost response instead of generating another container key', async () => {
+ vi.mocked(createDispatchDraftContainer).mockRejectedValueOnce(new Error('unknown container'))
+ const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const original = clone(vi.mocked(createDispatchDraftContainer).mock.calls[0]![0])
+ await button(wrapper, '核对并重试原请求').trigger('click'); await flushPromises(); expect(createDispatchDraftContainer).toHaveBeenNthCalledWith(2, original); expect(createDispatchDraft).toHaveBeenCalledTimes(1); expect(convertDispatchDraft).toHaveBeenCalledTimes(1); wrapper.unmount()
})
-it('does not read or write scoped cargo without all original permissions', async () => {
- access.allowed = false; const wrapper = render(); await flushPromises()
- expect(getBatchDispatchCandidates).not.toHaveBeenCalled(); expect(preArrangeDraftDispatch).not.toHaveBeenCalled(); wrapper.unmount()
+it('keeps a proven CREATE across failed current-detail GET and only repeats the read', async () => {
+ vi.mocked(getDispatch).mockRejectedValueOnce(new Error('GET unavailable'))
+ const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(convertDispatchDraft).toHaveBeenCalledTimes(1); expect(wrapper.emitted('updated')).toBeUndefined()
+ await button(wrapper, '核对并重试原请求').trigger('click'); await flushPromises(); expect(convertDispatchDraft).toHaveBeenCalledTimes(1); expect(getDispatch).toHaveBeenCalledTimes(2); expect(wrapper.emitted('updated')).toHaveLength(1); wrapper.unmount()
})
-
-it('continues the actual later 60-box dispatch through the shared-trip entry without re-creating or reallocating cargo', async () => {
- const sixty = { ...candidate, packageCount: 60, allocations: [{ ...candidate.allocations[0]!, packageCount: 60 }] }
- vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: 'FBA_APPOINTMENT:1', version: 4, candidates: [sixty], blockReasons: [] })
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue([{ draftContainerId: 'container-1', dispatch: { id: 'internal-later', dispatchNo: 'DS-60', appointmentBatches: [], overseasWarehouseId: 'origin-1', packageCount: 60 } }])
- const wrapper = render(); await flushPromises(); await button(wrapper, '创建本客户排车单').trigger('click'); await flushPromises()
- await button(wrapper, '与同仓其他排车单共车').trigger('click'); await flushPromises()
- const shared = wrapper.getComponent({ name: 'WorkSharedTripForm' })
- expect(shared.props()).toMatchObject({ dispatchNo: 'DS-60', canWrite: true })
- expect(preArrangeDraftDispatch).toHaveBeenCalledTimes(1); expect(vi.mocked(preArrangeDraftDispatch).mock.calls[0]![0].groups[0]!.batchAllocations).toEqual(sixty.allocations)
- shared.vm.$emit('busy', true); await flushPromises(); expect(button(wrapper, '继续安排其他实物').attributes('disabled')).toBeDefined()
- shared.vm.$emit('external', '/overseas-master-data/trips/TR-100'); expect(wrapper.emitted('external')).toEqual([['/overseas-master-data/trips/TR-100']])
- wrapper.unmount()
+it('never releases an unknown result for a later rejection, and releases only an explicitly rejected owned draft at its read-back version', async () => {
+ vi.mocked(lockDispatchDraftPallet).mockRejectedValueOnce(new Error('unknown')).mockRejectedValueOnce(new ApiResponseError('conflict', 'A0409', 409))
+ const unknown = render(); await flushPromises(); await button(unknown, '创建整车排车单').trigger('click'); await flushPromises(); await button(unknown, '核对并重试原请求').trigger('click'); await flushPromises(); expect(unknown.text()).not.toContain('按明确拒绝结果释放'); expect(await guard()).toBe(false); unknown.unmount()
+ sessionStorage.clear(); vi.mocked(lockDispatchDraftPallet).mockRejectedValueOnce(new ApiResponseError('conflict', 'A0409', 409)); draft = { ...draft, draftToken: 'another-owned-token', containers: [], recordVersion: 0 }
+ const rejected = render(); await flushPromises(); await button(rejected, '创建整车排车单').trigger('click'); await flushPromises(); draft.recordVersion = 9
+ await button(rejected, '按明确拒绝结果释放本草稿并重新核对').trigger('click'); await flushPromises(); expect(releaseDispatchDraft).toHaveBeenCalledWith({ draftToken: 'another-owned-token', recordVersion: 9, idempotencyKey: expect.any(String) }); rejected.unmount()
+})
+it('preserves quantity-split navigation and uses create permission rather than the removed smart-dispatch permission', async () => {
+ access.denied = ['platform:overseas-warehouse:inbound-order:smart-dispatch']; const wrapper = render(); await flushPromises()
+ await button(wrapper, '按当前批次箱数分批').trigger('click'); expect(wrapper.emitted('batch')).toEqual([[batch]]); expect(lockDispatchDraftPallet).not.toHaveBeenCalled()
+ await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(convertDispatchDraft).toHaveBeenCalledTimes(1)
+ await button(wrapper, '为本车添加同仓货物').trigger('click'); expect(wrapper.getComponent({ name: 'WorkSharedTripForm' }).props('dispatchNo')).toBe('DS/001'); wrapper.unmount()
+})
+it('does not read scoped cargo without original permissions or create while only read access remains', async () => {
+ access.allowed = false; const denied = render(); await flushPromises(); expect(getReceivingContext).not.toHaveBeenCalled(); denied.unmount()
+ access.allowed = true; access.denied = ['platform:overseas-warehouse:dispatch:create']; const readonly = render(); await flushPromises(); expect(button(readonly, '创建整车排车单').attributes('disabled')).toBeDefined(); expect(createDispatchDraft).not.toHaveBeenCalled(); readonly.unmount()
+})
+it('shows batch-level blockers even without rows and refuses duplicate physical candidates across batches', async () => {
+ vi.mocked(getBatchDispatchCandidates).mockResolvedValueOnce({ batchKey: batch, version: 4, candidates: [], blockReasons: ['原批次已替代，请进入当前批次'] })
+ const blocked = render(); await flushPromises(); expect(blocked.get('[role="alert"]').text()).toContain('原批次已替代'); expect(createDispatchDraft).not.toHaveBeenCalled(); blocked.unmount()
+ const duplicate = render({ batchKeys: [batch, 'FBA_APPOINTMENT:2'] }); await flushPromises(); expect(duplicate.findAll('input').every(input => input.attributes('disabled') !== undefined)).toBe(true); expect(duplicate.text()).toContain('同一实物'); expect(convertDispatchDraft).not.toHaveBeenCalled(); duplicate.unmount()
})
diff --git a/src/modules/appointment-calendar/WorkDispatchForm.vue b/src/modules/appointment-calendar/WorkDispatchForm.vue
index cb368d4e..8786a0a1 100644
--- a/src/modules/appointment-calendar/WorkDispatchForm.vue
+++ b/src/modules/appointment-calendar/WorkDispatchForm.vue
@@ -1,125 +1,221 @@
-
- 按当前批次箱数分批
+ 核对本批剩余可排实物
+ 核对本批剩余可排实物
- 继续安排本批车辆 与同仓其他排车单共车 查看原排车单 继续安排其他实物
-
- {{ pending ? '重试本次预排' : '创建本客户排车单' }}
+ 继续维护本车 为本车添加同仓货物 继续核对剩余实物
+
+ 按当前批次箱数分批
创建整车排车单
- 释放本次草稿并重新核对
- 按明确拒绝结果释放本草稿并重新核对
diff --git a/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts b/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts
index 37937a5d..447b1e81 100644
--- a/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts
+++ b/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts
@@ -1,43 +1,42 @@
import { flushPromises, mount } from '@vue/test-utils'
import { beforeEach, expect, it, vi } from 'vitest'
import WorkExistingDispatchForm from './WorkExistingDispatchForm.vue'
-import { getDispatch } from '@/modules/overseas-warehouse'
-const state = vi.hoisted(() => ({ allowed: true }))
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => state.allowed }) }))
+import { getDispatch, type DispatchDetail } from '@/modules/overseas-warehouse'
+import { resolveBatchWork } from './workApi'
+import { workDetail, workItem } from './work.test-support'
+const access = vi.hoisted(() => ({ allowed: true }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => access.allowed }) }))
vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original(), getDispatch: vi.fn() }))
-function render(dispatches: Array<{ batchKey: string; dispatchNo: string; customerId?: string }> = [{ batchKey: 'DISPATCH:9007199254740999', dispatchNo: 'DS-ORIGINAL' }]) { return mount(WorkExistingDispatchForm, { props: { dispatches, canWrite: true }, global: { stubs: { ElButton: { props: ['disabled'], template: '' }, LoadErrorState: { props: ['message'], template: '(), resolveBatchWork: vi.fn() }))
+function detail(no = 'DS/ORIGINAL'): DispatchDetail { return { dispatchNo: no, status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: 0, reviewState: 'DRAFT', reviews: { dispatchReview: { status: 'NOT_SUBMITTED', reason: null, reviewerId: null, reviewedAt: null, reviewRound: 0, basisHash: null, invalidatedReason: null }, loadingReview: { status: 'NOT_SUBMITTED', reason: null, reviewerId: null, reviewedAt: null, reviewRound: 0, basisHash: null, invalidatedReason: null } }, counts: { itemCount: 1, palletCount: 1, packageCount: 12, pickedPackageCount: 0, shippedPackageCount: 0 }, pickingReconciled: false, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null }, ADD_CARGO: { allowed: true, blockCode: null, blockReason: null } }, vehicleInfo: { vehicle: null, driver: null }, dispatchInfo: { route: null, plannedDepartureAt: null, departedAt: null, estimatedArrivalAt: null, fbaAppointments: [], vehicleAppointment: null, appointmentBatches: [] }, documents: { dispatchNo: no, outbounds: [], deliveries: [], createdAt: '', updatedAt: '', remark: null }, orderDetails: [] } }
+function render(dispatches: Array<{ batchKey: string; dispatchNo: string; customerId?: string }> = [{ batchKey: 'DISPATCH:9007199254740999', dispatchNo: 'DS/ORIGINAL' }]) { return mount(WorkExistingDispatchForm, { props: { dispatches, canWrite: true }, global: { stubs: { ElButton: { props: ['disabled'], template: '' }, LoadErrorState: { props: ['message'], template: ', label: string) => wrapper.findAll('button').find(row => row.text() === label)!
+beforeEach(() => { vi.clearAllMocks(); access.allowed = true; vi.mocked(getDispatch).mockResolvedValue(detail()); vi.mocked(resolveBatchWork).mockResolvedValue({ batchKey: 'DISPATCH:9007199254740999', customerId: 'customer-a', detail: workDetail({ item: workItem({ batchKey: 'DISPATCH:9007199254740999', batchNo: 'DS/ORIGINAL' }) }), candidates: [] }) })
+it.each(['customer-b', undefined])('rejects a FBA reference outside the exact batch customer: %s', async customerId => {
+ const value = detail(); value.dispatchInfo.appointmentBatches = [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'customer-a', recordVersion: 0, sources: [] }]; vi.mocked(getDispatch).mockResolvedValue(value)
+ const wrapper = render([{ batchKey: 'FBA_APPOINTMENT:1', dispatchNo: value.dispatchNo, customerId }]); await flushPromises(); expect(wrapper.text()).toContain('排车单与工作批次关联不一致'); expect(wrapper.find('table').exists()).toBe(false); wrapper.unmount()
})
-it('reads shared dispatch once and verifies every FBA batch reference', async () => {
- vi.mocked(getDispatch).mockResolvedValue({ id: '1', dispatchNo: 'DS-ORIGINAL', status: 'PENDING_DEPARTURE', appointmentBatches: ['1', '2'].map(id => ({ batchKey: `FBA_APPOINTMENT:${id}`, batchNo: `AP-${id}`, customerId: 'customer-a', sources: [] })) })
- const wrapper = render(['1', '2'].map(id => ({ batchKey: `FBA_APPOINTMENT:${id}`, dispatchNo: 'DS-ORIGINAL', customerId: 'customer-a' }))); await flushPromises()
- expect(getDispatch).toHaveBeenCalledTimes(1)
- expect(wrapper.findAll('tbody tr')).toHaveLength(1)
- wrapper.unmount()
+it('reads a shared whole dispatch once and verifies every nested batch and real customer', async () => {
+ const value = detail(); value.dispatchInfo.appointmentBatches = ['a', 'b'].map((customerId, index) => ({ batchKey: `FBA_APPOINTMENT:${index + 1}`, batchNo: `AP-${index + 1}`, customerId, recordVersion: 0, sources: [] })); vi.mocked(getDispatch).mockResolvedValue(value)
+ const wrapper = render(value.dispatchInfo.appointmentBatches.map(row => ({ batchKey: row.batchKey, customerId: row.customerId, dispatchNo: value.dispatchNo }))); await flushPromises()
+ expect(getDispatch).toHaveBeenCalledTimes(1); expect(wrapper.findAll('tbody tr')).toHaveLength(1); expect(wrapper.emitted('ready')?.at(-1)).toEqual([true]); expect(resolveBatchWork).not.toHaveBeenCalled(); wrapper.unmount()
})
-it('reads the original dispatch and passes its existing cargo and origin to trip preparation', async () => {
- const wrapper = render(); await flushPromises()
- expect(getDispatch).toHaveBeenCalledExactlyOnceWith('DS-ORIGINAL')
- await wrapper.findAll('button').find(button => button.text() === '继续安排本批车辆')!.trigger('click')
- const dialog = wrapper.getComponent({ name: 'TripPreparationDialog' }); expect(dialog.props()).toMatchObject({ warehouseId: 'origin-1', dispatchNos: ['DS-ORIGINAL'] })
- dialog.vm.$emit('saved', { trip: { tripNo: 'TR/001' } }); expect(wrapper.emitted('external')).toEqual([['/overseas-master-data/trips/TR%2F001']])
- expect(wrapper.text()).not.toContain('9007199254740999'); wrapper.unmount()
+it('resolves the opaque dispatch batch in the work domain and opens the original independent detail', async () => {
+ const wrapper = render(); await flushPromises(); expect(resolveBatchWork).toHaveBeenCalledWith('DISPATCH:9007199254740999', undefined)
+ await button(wrapper, '继续维护本车').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS%2FORIGINAL']])
+ expect(wrapper.text()).not.toContain('9007199254740999'); expect(wrapper.text()).not.toContain('安排车次'); wrapper.unmount()
})
-it('rejects mismatched dispatch identity instead of arranging unrelated cargo', async () => {
- vi.mocked(getDispatch).mockResolvedValue({ id: '9007199254740998', dispatchNo: 'DS-ORIGINAL', appointmentBatches: [], status: 'PENDING_DEPARTURE' })
- const wrapper = render(); await flushPromises(); expect(wrapper.text()).toContain('排车单与工作批次关联不一致'); expect(wrapper.find('table').exists()).toBe(false); wrapper.unmount()
+it('rejects mismatched authority or returned business identity instead of deriving an internal ID', async () => {
+ vi.mocked(resolveBatchWork).mockResolvedValueOnce({ batchKey: 'DISPATCH:9007199254740999', customerId: 'a', detail: workDetail({ item: workItem({ batchKey: 'DISPATCH:9007199254740999', batchNo: 'DS-OTHER' }) }), candidates: [] })
+ const wrapper = render(); await flushPromises(); expect(wrapper.find('table').exists()).toBe(false); expect(wrapper.text()).toContain('关联不一致'); wrapper.unmount()
+ vi.mocked(getDispatch).mockResolvedValueOnce(detail('WRONG')); const wrong = render(); await flushPromises(); expect(wrong.find('table').exists()).toBe(false); wrong.unmount()
})
-it('opens an already bound real trip instead of preparing another one', async () => {
- vi.mocked(getDispatch).mockResolvedValue({ id: '9007199254740999', dispatchNo: 'DS-ORIGINAL', appointmentBatches: [], workflow: { tripNo: 'TR-EXISTING', dispatchReview: { status: 'PENDING', reason: null, reviewedAt: null }, loadingReview: { status: 'PENDING', reason: null, reviewedAt: null } } })
- const wrapper = render(); await flushPromises(); expect(wrapper.text()).not.toContain('继续安排本批车辆')
- await wrapper.findAll('button').find(button => button.text() === 'TR-EXISTING')!.trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-master-data/trips/TR-EXISTING']]); wrapper.unmount()
+it('opens same-dispatch adding only under the server gate, and keeps already scanned cargo out of the old merge flow', async () => {
+ const wrapper = render(); await flushPromises(); await button(wrapper, '为本车添加同仓货物').trigger('click')
+ expect(wrapper.getComponent({ name: 'WorkSharedTripForm' }).props()).toMatchObject({ dispatchNo: 'DS/ORIGINAL', canWrite: true }); wrapper.unmount()
+ const value = detail(); value.stage = 'LOADING'; value.counts.pickedPackageCount = 1; value.actions.ADD_CARGO!.allowed = false; vi.mocked(getDispatch).mockResolvedValueOnce(value)
+ const scanned = render(); await flushPromises(); expect(scanned.text()).not.toContain('为本车添加同仓货物'); expect(scanned.text()).not.toContain('共车'); scanned.unmount()
})
-it('does not read the dispatch without its original list permission', async () => {
- state.allowed = false; const wrapper = render(); await flushPromises(); expect(getDispatch).not.toHaveBeenCalled(); wrapper.unmount()
+it('does not read dispatch or batch authority without the actual list permissions', async () => {
+ access.allowed = false; const wrapper = render(); await flushPromises(); expect(getDispatch).not.toHaveBeenCalled(); expect(resolveBatchWork).not.toHaveBeenCalled(); wrapper.unmount()
})
diff --git a/src/modules/appointment-calendar/WorkExistingDispatchForm.vue b/src/modules/appointment-calendar/WorkExistingDispatchForm.vue
index 29fd11bb..29392544 100644
--- a/src/modules/appointment-calendar/WorkExistingDispatchForm.vue
+++ b/src/modules/appointment-calendar/WorkExistingDispatchForm.vue
@@ -1,44 +1,60 @@
-
-
+ (), getDispatch: vi.fn() }))
vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn() } }))
let guard: LeaveGuard
-function render() { return mount(WorkSharedTripForm, { props: { dispatchNo: 'DS-60', canWrite: true }, global: { provide: { 'appointment-work-leave-guard': (value: LeaveGuard) => { guard = value; return () => undefined } }, stubs: {
- ElButton: { props: ['disabled'], template: '' },
- TripPreparationDialog: { name: 'TripPreparationDialog', props: ['modelValue', 'warehouseId', 'dispatchNos'], template: '' },
- LoadErrorState: { props: ['message'], template: ', label: string) => wrapper.findAll('button').find(row => row.text() === label)!
+beforeEach(() => { vi.clearAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID(); access.allowed = true; vi.mocked(getDispatch).mockResolvedValue(detail()) })
+it('opens the native add-cargo workflow for the same dispatch instead of asking for another customer dispatch', async () => {
+ const wrapper = render(); await flushPromises(); expect(getDispatch).toHaveBeenCalledExactlyOnceWith('DS-60'); expect(wrapper.find('input').exists()).toBe(false)
+ expect(wrapper.text()).toContain('60 箱'); await button(wrapper, '选择同仓未安排货物').trigger('click')
+ const dialog = wrapper.getComponent({ name: 'DispatchWorkflowDialog' }); expect(dialog.props()).toMatchObject({ modelValue: true, dispatchNo: 'DS-60', action: 'ADD_CARGO' }); expect(await guard()).toBe(false)
+ dialog.vm.$emit('saved'); await flushPromises(); expect(wrapper.emitted('updated')).toHaveLength(1); expect(await guard()).toBe(true); wrapper.unmount()
})
-it('rejects duplicate, cross-warehouse, already-bound and mismatched dispatches without opening Fleet preparation', async () => {
- const wrapper = render(); await wrapper.get('input').setValue('DS-60'); await wrapper.get('button').trigger('click'); await flushPromises()
- expect(getDispatch).not.toHaveBeenCalled()
- for (const change of [{ overseasWarehouseId: 'another-warehouse' }, { workflow: { tripNo: 'TR-OTHER', dispatchReview: { status: 'PENDING' as const, reason: null, reviewedAt: null }, loadingReview: { status: 'PENDING' as const, reason: null, reviewedAt: null } } }, { status: 'SHIPPED' }, { dispatchNo: 'WRONG' }]) {
- vi.mocked(getDispatch).mockResolvedValueOnce({ id: 'a', dispatchNo: 'DS-60', appointmentBatches: [], overseasWarehouseId: 'warehouse-real', status: 'PENDING_DEPARTURE' }).mockResolvedValueOnce({ id: 'b', dispatchNo: 'DS-40', appointmentBatches: [], overseasWarehouseId: 'warehouse-real', status: 'PENDING_DEPARTURE', ...change })
- await wrapper.get('input').setValue('DS-40'); await wrapper.get('button').trigger('click'); await flushPromises()
- expect(wrapper.findComponent({ name: 'TripPreparationDialog' }).exists()).toBe(false); expect(wrapper.find('[role="alert"]').exists()).toBe(true)
- }
- wrapper.unmount()
+it('honors native stage/gate and permissions and rejects a different returned business number', async () => {
+ vi.mocked(getDispatch).mockResolvedValueOnce({ ...detail('DS-60', false), stage: 'LOADING' }); const scanned = render(); await flushPromises(); expect(button(scanned, '选择同仓未安排货物').attributes('disabled')).toBeDefined(); expect(scanned.text()).toContain('货物已开始真实拣货'); scanned.unmount()
+ vi.mocked(getDispatch).mockResolvedValueOnce(detail('WRONG')); const wrong = render(); await flushPromises(); expect(wrong.get('[role="alert"]').text()).toContain('原排车单不一致'); wrong.unmount()
+ access.allowed = false; const count = vi.mocked(getDispatch).mock.calls.length, denied = render(); await flushPromises(); expect(getDispatch).toHaveBeenCalledTimes(count); denied.unmount()
})
-it('keeps a failed lookup retry read-only and respects original permissions', async () => {
- const wrapper = render(); vi.mocked(getDispatch).mockRejectedValueOnce(new Error('读取失败'))
- await wrapper.get('input').setValue('DS-40'); await wrapper.get('button').trigger('click'); await flushPromises()
- expect(wrapper.findComponent({ name: 'TripPreparationDialog' }).exists()).toBe(false)
- await wrapper.get('button').trigger('click'); await flushPromises()
- expect(getDispatch).toHaveBeenCalledTimes(4); expect(wrapper.getComponent({ name: 'TripPreparationDialog' }).props('dispatchNos')).toEqual(['DS-60', 'DS-40'])
- wrapper.unmount(); access.allowed = false
- const readonly = render(); await readonly.get('button').trigger('click'); expect(getDispatch).toHaveBeenCalledTimes(4); readonly.unmount()
+it('retains an unknown original add command after the overlay closes and offers recovery without a new key', async () => {
+ const recovery = useDispatchCommandRecovery(() => identity.id); recovery.begin('DS-60', 'ADD_CARGO', { recordVersion: 0, idempotencyKey: 'original-key', cargo: [], batchAllocations: [] })
+ const wrapper = render(); await flushPromises(); expect(button(wrapper, '选择同仓未安排货物').attributes('disabled')).toBeDefined(); expect(await guard()).toBe(false)
+ await button(wrapper, '核对原加货请求').trigger('click'); expect(wrapper.getComponent({ name: 'DispatchWorkflowDialog' }).props('modelValue')).toBe(true)
+ expect(recovery.pending.value?.body.idempotencyKey).toBe('original-key'); wrapper.getComponent({ name: 'DispatchWorkflowDialog' }).vm.$emit('update:modelValue', false); await flushPromises(); expect(await guard()).toBe(false); wrapper.unmount()
+})
+it('retries lookup as a read and keeps the original detail navigation', async () => {
+ vi.mocked(getDispatch).mockRejectedValueOnce(new Error('lookup failed')); const wrapper = render(); await flushPromises(); await wrapper.get('[role="alert"] button').trigger('click'); await flushPromises(); expect(getDispatch).toHaveBeenCalledTimes(2)
+ await button(wrapper, '查看原排车单').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS-60']]); wrapper.unmount()
})
diff --git a/src/modules/appointment-calendar/WorkSharedTripForm.vue b/src/modules/appointment-calendar/WorkSharedTripForm.vue
index 288c0a7f..16b0d4aa 100644
--- a/src/modules/appointment-calendar/WorkSharedTripForm.vue
+++ b/src/modules/appointment-calendar/WorkSharedTripForm.vue
@@ -1,50 +1,51 @@
-
- 核对两单并安排共车
-
+ 选择同仓未安排货物 查看原排车单
+
diff --git a/src/modules/domestic-containers/pages/DomesticContainersView.vue b/src/modules/domestic-containers/pages/DomesticContainersView.vue
index 0a4f34b9..7ba22378 100644
--- a/src/modules/domestic-containers/pages/DomesticContainersView.vue
+++ b/src/modules/domestic-containers/pages/DomesticContainersView.vue
@@ -21,10 +21,10 @@ import './domesticContainersSummary.css'
type TabName = 'inbound' | 'outbound' | 'inventory'
const router = useRouter(); const access = useAccessPreviewStore(); const activeTab = ref('inbound')
-const businessTabs: Array<{ value: TabName; label: string; icon: string }> = [
- { value: 'inbound', label: '整柜入库单', icon: '📥' },
- { value: 'outbound', label: '整柜出库单', icon: '📤' },
- { value: 'inventory', label: '整柜库存', icon: '📦' },
+const businessTabs: Array<{ value: TabName; label: string }> = [
+ { value: 'inbound', label: '整柜入库单' },
+ { value: 'outbound', label: '整柜出库单' },
+ { value: 'inventory', label: '整柜库存' },
]
const loading = ref(false); const loadError = ref(null); const rows = ref<(ContainerOrder | InventoryRecord)[]>([]); const page = ref(1); const pageSize = ref(20); const total = ref(0)
const summary = ref({ inboundBoxes: 0, outboundBoxes: 0, availableBoxes: 0, inboundVolumeCbm: 0 })
@@ -76,7 +76,7 @@ watch([page, pageSize], load); onMounted(async () => { await Promise.all([loadWa
查看 —
+ form: { id: string; category: string; feeTypeName: string; defaultPrice: number | null }
+ } }).setupState
+ state.openCreate(); await flushPromises()
+ Object.assign(state.form, { category: '操作费', feeTypeName: '加封费', defaultPrice: 60 })
+ await state.saveFeeItem(); await flushPromises()
+ expect(createPlatformFeeItem).toHaveBeenLastCalledWith(expect.objectContaining({ defaultPrice: 60 }))
+ state.openCreate(); await flushPromises()
+ Object.assign(state.form, { category: '操作费', feeTypeName: '零元费', defaultPrice: 0 })
+ await state.saveFeeItem(); await flushPromises()
+ expect(createPlatformFeeItem).toHaveBeenLastCalledWith(expect.objectContaining({ defaultPrice: 0 }))
+ state.openCreate(); await flushPromises()
+ Object.assign(state.form, { id: '1', category: '操作费', feeTypeName: '加封费', defaultPrice: null })
+ await state.saveFeeItem(); await flushPromises()
+ expect(updatePlatformFeeItem).toHaveBeenCalledWith('1', expect.objectContaining({ defaultPrice: null }))
+ })
+
beforeEach(() => {
vi.stubGlobal('ResizeObserver', ResizeObserverStub)
vi.stubGlobal('localStorage', createMemoryStorage())
diff --git a/src/modules/fee-items/pages/FeeItemsView.vue b/src/modules/fee-items/pages/FeeItemsView.vue
index cf8f6fe1..90d2bac6 100644
--- a/src/modules/fee-items/pages/FeeItemsView.vue
+++ b/src/modules/fee-items/pages/FeeItemsView.vue
@@ -71,6 +71,7 @@ function emptyForm(): FeeItemForm {
category: '',
tradeScope: 'DOMESTIC',
feeTypeName: '',
+ defaultPrice: null,
supplierCategory: null,
pickupPayable: false,
pickupReceivable: false,
@@ -86,6 +87,7 @@ const rules: FormRules = {
category: [{ required: true, message: '请输入费用分类', trigger: 'blur' }],
tradeScope: [{ required: true, message: '请选择贸易范围', trigger: 'change' }],
feeTypeName: [{ required: true, message: '请输入费用名称', trigger: 'blur' }],
+ defaultPrice: [{ type: 'number', min: 0, max: 9999999999.99, message: '默认价格须为非负金额，最多两位小数', trigger: 'change' }],
}
const hasPayableDirection = computed(() => form.pickupPayable || form.warehousePayable)
@@ -118,6 +120,7 @@ const columns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 250, fixed: 'left', slotName: 'actions' },
{ key: 'feeTypeName', label: '费用项目', minWidth: 210, slotName: 'feeItem' },
{ key: 'category', prop: 'category', label: '费用分类', minWidth: 150 },
+ { key: 'defaultPrice', label: '默认价格(CNY)', width: 150, formatter: (row: PlatformFeeItemResource) => row.defaultPrice == null ? '—' : Number(row.defaultPrice).toFixed(2) },
{ key: 'tradeScope', label: '贸易范围', width: 110, slotName: 'tradeScope' },
{ key: 'pickup', label: '提货', minWidth: 160, slotName: 'pickup' },
{ key: 'warehouse', label: '仓库', minWidth: 160, slotName: 'warehouse' },
@@ -203,6 +206,7 @@ function assignForm(item: PlatformFeeItemResource) {
category: item.category,
tradeScope: item.tradeScope,
feeTypeName: item.feeTypeName,
+ defaultPrice: item.defaultPrice,
supplierCategory: item.supplierCategory,
pickupPayable: item.pickupPayable,
pickupReceivable: item.pickupReceivable,
@@ -236,6 +240,7 @@ function buildPayload(): SavePlatformFeeItemRequest {
category: form.category.trim(),
tradeScope: form.tradeScope,
feeTypeName: form.feeTypeName.trim(),
+ defaultPrice: form.defaultPrice ?? null,
supplierCategory: hasPayableDirection.value ? form.supplierCategory : null,
pickupPayable: form.pickupPayable,
pickupReceivable: form.pickupReceivable,
@@ -440,6 +445,10 @@ onMounted(() => {
+
+
+
合托 取消合托 转仓 生成入库计划 按柜批量生成
+ 合托 取消合托 转仓 入库 按柜批量生成
暂扣 解除暂扣 是 否
+
)/)
const end = value.indexOf('\n]', start)
return [...value.slice(start, end).matchAll(/\{ key: '([^']+)'/g)].map((match) => match[1])
}
@@ -57,7 +57,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
it('keeps the operation column first on every business list', () => {
for (const fileName of ['LastMileOrdersView.vue', 'InboundOrdersView.vue', 'DispatchesView.vue', 'InventoryView.vue', 'RelabelOrdersView.vue', 'PalletsView.vue', 'CartonsView.vue', 'ProductsView.vue']) {
const value = source(fileName)
- const columns = value.slice(value.indexOf('const columns: DataTableColumn[]'))
+ const columns = value.slice(value.search(/const columns(?:: DataTableColumn\[\]| = computed)/))
expect(columns.match(/\{\s*key: '([^']+)'/)?.[1]).toBe('actions')
}
})
@@ -220,7 +220,9 @@ describe('overseas warehouse first-batch prototype contract', () => {
expect(value).toContain('type="primary" @click="openSmartDispatch"')
expect(value).not.toContain('type="primary" :disabled="!selectedRows.length" @click="openSmartDispatch"')
expect(value).toContain('access.can(permission.inboundOrderAppointment)')
- expect(value).toContain('access.can(permission.inboundOrderSmartDispatch)')
+ expect(value).toContain('access.can(permission.dispatchList) && access.can(permission.dispatchCreate)')
+ expect(value).toContain('v-if="canCreateDispatch"')
+ expect(value).not.toContain('inboundOrderSmartDispatch')
expect(value).toContain(' {
}
})
- it('connects intelligent dispatch without a frontend customerId constraint', () => {
+ it('connects native same-warehouse multi-customer draft containers and independent resources', () => {
const dialog = source('../components/SmartDispatchDialog.vue')
- expect(dialog).toContain('listDispatchCandidates')
- expect(dialog).toContain('preArrangeDispatch')
- expect(dialog).toContain("planPalletIds: sources.filter(item => item.sourceType !== 'RETURN_RECEIPT')")
- expect(dialog).toContain("returnReceiptIds: sources.filter(item => item.sourceType === 'RETURN_RECEIPT')")
- expect(dialog).toContain('planPalletIds: assigned.value.map(palletId)')
- expect(dialog).toContain("if (item.sourceStage === 'RELABEL') return String(item.warehousePalletId || '')")
- expect(dialog).toContain('lockDispatchDraftPallet')
- expect(dialog).toContain('unlockDispatchDraftPallet')
- expect(dialog.match(/async function close\([\s\S]*?\n}/)?.[0]).not.toContain('releaseDispatchDraft')
- expect(dialog).toContain('await releaseDispatchDraft(draftToken.value)')
- expect(dialog).toContain('释放并重新选择')
- expect(dialog).toContain('排车明细已同步到预排列表')
- expect(dialog).toContain("router.push({ name: 'overseas-dispatches' })")
- expect(dialog).not.toContain('customerId:')
- expect(dialog).toContain("planIds: query.sourceStage !== 'RELABEL' && planIds.value.length ? planIds.value.join(',') : undefined")
- expect(dialog).toContain('v-model="query.fbaWarehouseCode" clearable')
- expect(dialog).toContain("订单号 / 换标单号 / 原入仓码")
- expect(dialog).toContain('label="私人仓"')
- expect(dialog).toContain('item.deliveryAddress, item.postalCode')
- expect(dialog).not.toContain(':model-value="fbaWarehouseCode" readonly')
- expect(dialog).toContain("sourceStage: 'RECEIVED'")
- expect(dialog).toContain('一次排车只能装同一客户的托盘')
- expect(dialog).toContain('该托盘尚未关联海外仓，不能排车')
- expect(dialog).toContain('所选托盘中存在尚未关联海外仓的托盘')
- expect(dialog).toContain('function ensureDraftToken()')
- expect(dialog).toContain('lockDispatchDraftPallet(id, ensureDraftToken(), target.id)')
- expect(dialog).toContain('function hydrateDraftPallets()')
- expect(dialog).toContain('@click="removePallet(id)"')
- expect(dialog).not.toContain('removePallet(candidates.find')
- expect(dialog).toContain('洛杉矶')
- expect(dialog).toContain('纽约')
- expect(dialog).toContain("value: 'ALL', label: '全部'")
- expect(dialog).toContain('换标下单')
- expect(dialog).toContain('退货换标')
- expect(dialog).toContain('本土散板')
- expect(dialog).toContain('仓储转运')
- expect(dialog).toContain('relabelCartonMarks(item)')
- expect(dialog).toContain('type="warning">换标')
- expect(dialog).not.toContain('function cartonMarks(')
- expect(dialog).not.toContain('`normal-${mark}`')
- expect(dialog).not.toContain('暂无箱唛')
- expect(dialog).toContain('class="warehouse-tabs density-tabs"')
- expect(dialog).toContain('dispatchVehicleSpecs')
+ for (const symbol of ['listDispatchCandidates', 'createDispatchDraft', 'lockDispatchDraftPallet', 'unlockDispatchDraftPallet', 'releaseDispatchDraft', 'convertDispatchDraft', 'requireVersion', 'draftContainerId', 'sourceVersion', 'result.complete !== true', 'validateCurrentDispatch', 'warehouse-tabs density-tabs', '洛杉矶', '纽约', '先建空单后加货', 'settings[containerId]']) expect(dialog).toContain(symbol)
+ expect(dialog).toContain('cargo: cargo.map(row => row.selection)')
+ expect(dialog).toContain('同仓可混装多个客户与目的仓')
+ expect(dialog).not.toContain('一次排车只能装同一客户')
+ expect(dialog).not.toContain('ensureDraftToken')
+ expect(dialog).not.toContain('preArrangeDispatch')
+ expect(dialog).toContain('原请求结果尚待核对')
+ expect(dialog).not.toContain('v-model="route"')
const vehicleSpecs = source('../dispatchVehicleSpecs.ts')
expect(vehicleSpecs).toContain("label: '大车（30托）'")
expect(vehicleSpecs).toContain("label: '小车（15托）'")
- expect(vehicleSpecs).not.toContain('14托')
- expect(vehicleSpecs).not.toContain('12托')
- expect(dialog).not.toContain('排车路线（选填）')
- expect(dialog).not.toContain('v-model="route"')
- const dispatches = source('DispatchesView.vue')
- expect(dispatches).toContain('v-model="editForm.route" readonly')
- expect(dispatches).not.toContain('route: editForm.route.trim()')
})
it('adds the prototype inventory transaction page as a read-only inventory route', () => {
@@ -349,9 +309,9 @@ describe('overseas warehouse first-batch prototype contract', () => {
const value = source(fileName)
expect(value).toContain(routeName)
if (fileName === 'DispatchesView.vue') {
- expect(value).toMatch(/]*:actions="rowActions\(row as DispatchListItem\)"/)
- expect(value).toContain("{ key: 'detail', label: '查看', priority: 300 }")
- expect(value).toContain("if (command === 'detail') openDetail(row)")
+ expect(value).toMatch(/]*:actions="rowActions\(row as DispatchListRow\)"/)
+ expect(value).toContain("{ key: 'detail', label: '详情', priority: 500 }")
+ expect(value).toContain("if (value === 'detail') return openDetail(row)")
} else if (fileName === 'LastMileOrdersView.vue') {
expect(value).toContain(' {
it('uses the overseas warehouse code when the warehouse name is unavailable', () => {
- const losAngeles = { overseasWarehouseCode: 'US-LAX-01', overseasWarehouseName: null }
- const newYork = { overseasWarehouseCode: 'US-NY-01', overseasWarehouseName: null }
+ const losAngeles = { warehouseCode: 'US-LAX-01', warehouseName: '' }
+ const newYork = { warehouseCode: 'US-NY-01', warehouseName: '' }
expect(matchesSmartDispatchWarehouseTab(losAngeles, 'LAX')).toBe(true)
expect(matchesSmartDispatchWarehouseTab(losAngeles, 'NYC')).toBe(false)
@@ -13,7 +13,7 @@ describe('smart dispatch warehouse tabs', () => {
})
it('keeps the all tab unfiltered and supports warehouse names as a fallback', () => {
- const warehouse = { overseasWarehouseCode: null, overseasWarehouseName: '洛杉矶接柜仓' }
+ const warehouse = { warehouseCode: '', warehouseName: '洛杉矶接柜仓' }
expect(matchesSmartDispatchWarehouseTab(warehouse, 'ALL')).toBe(true)
expect(matchesSmartDispatchWarehouseTab(warehouse, 'LAX')).toBe(true)
diff --git a/src/modules/overseas-warehouse/smartDispatchWarehouseTab.ts b/src/modules/overseas-warehouse/smartDispatchWarehouseTab.ts
index 6edd7c2d..baae1c92 100644
--- a/src/modules/overseas-warehouse/smartDispatchWarehouseTab.ts
+++ b/src/modules/overseas-warehouse/smartDispatchWarehouseTab.ts
@@ -1,13 +1,13 @@
-import type { DispatchPalletCandidateDto } from './api/dispatches'
+import type { Candidate } from './dispatchContracts'
export type SmartDispatchWarehouseTab = 'ALL' | 'LAX' | 'NYC'
export function matchesSmartDispatchWarehouseTab(
- candidate: Pick,
+ candidate: Pick,
tab: SmartDispatchWarehouseTab,
) {
if (tab === 'ALL') return true
- const warehouse = [candidate.overseasWarehouseCode, candidate.overseasWarehouseName]
+ const warehouse = [candidate.warehouseCode, candidate.warehouseName]
.map((value) => String(value || '').trim().toLowerCase())
.filter(Boolean)
.join(' ')
diff --git a/src/modules/overseas-warehouse/types.test.ts b/src/modules/overseas-warehouse/types.test.ts
index 00932201..3cdeaf23 100644
--- a/src/modules/overseas-warehouse/types.test.ts
+++ b/src/modules/overseas-warehouse/types.test.ts
@@ -7,10 +7,13 @@ const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehou
describe('overseas warehouse presentation contracts', () => {
it('covers every formal list without freezing an API transport', () => {
for (const name of [
- 'LastMileOrderListItem', 'InboundOrderListItem', 'DispatchListItem', 'InventoryListItem',
+ 'LastMileOrderListItem', 'InboundOrderListItem', 'InventoryListItem',
'RelabelOrderListItem', 'PalletListItem', 'CartonListItem',
'ProductListItem', 'InventoryTransactionListItem',
]) expect(source).toContain(`interface ${name}`)
+ const native = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/dispatchContracts.ts'), 'utf8')
+ expect(native).toContain('interface DispatchListRow')
+ expect(source).not.toContain('interface DispatchListItem')
expect(source).not.toContain('axios')
expect(source).not.toContain("from '@/shared/api/http'")
expect(source).not.toMatch(/https?:\/\//)
diff --git a/src/modules/overseas-warehouse/types.ts b/src/modules/overseas-warehouse/types.ts
index c97fe4fe..38bfc63e 100644
--- a/src/modules/overseas-warehouse/types.ts
+++ b/src/modules/overseas-warehouse/types.ts
@@ -100,29 +100,6 @@ export interface InboundOrderListItem {
version: number
}
-export interface DispatchListItem {
- actions?: import('./api/dispatches').DispatchActions
- workflow?: import('./api/dispatches').DispatchWorkflow | null
- id: string
- dispatchNo: string
- vehiclePlate: string
- driverName: string
- driverPhone: string
- carrierName: string
- orderNos: string
- route: string
- overseasWarehouse: string
- departAt: string
- fbaAppointment: string
- vehicleAppointment: string
- estimatedArrivalAt: string
- status: string
- statusCode: string
- palletCount: number
- packageCount: number
- createdAt: string
-}
-
export interface InventoryListItem {
id: string
customerId: string
diff --git a/src/modules/sailing-calendar/pages/SailingCalendarView.test.ts b/src/modules/sailing-calendar/pages/SailingCalendarView.test.ts
index 936cf867..2815a7be 100644
--- a/src/modules/sailing-calendar/pages/SailingCalendarView.test.ts
+++ b/src/modules/sailing-calendar/pages/SailingCalendarView.test.ts
@@ -39,6 +39,20 @@ beforeEach(() => {
afterEach(() => { wrapper?.unmount(); wrapper = undefined; document.body.innerHTML = ''; vi.useRealTimers() })
describe('SailingCalendarView integrated workspace', () => {
+ it('keeps one create entry and defaults the sailing to the selected calendar date', async () => {
+ const view = await mountView()
+ expect(view.find('.detail-header button').exists()).toBe(false)
+ const createButtons = view.findAll('button').filter(button => button.text() === '新增单个船次')
+ expect(createButtons).toHaveLength(1)
+ const otherDate = view.findAll('.calendar-cell').find(cell => cell.get('.day-number').text() === '29')!
+ await otherDate.trigger('click')
+ await createButtons[0].trigger('click')
+ await flushPromises()
+ expect(document.querySelector('.el-dialog__title')?.textContent).toBe('新增船期')
+ const departurePicker = view.findAllComponents({ name: 'ElDatePicker' }).find(picker => picker.props('type') === 'datetime')!
+ expect(departurePicker.props('modelValue')).toBe('2026-09-29T10:00:00')
+ })
+
it('preserves keyword search, date selection and month navigation with the shared header', async () => {
const view = await mountView()
expect(view.get('h1').text()).toBe('船期日历')
diff --git a/src/modules/sailing-calendar/pages/SailingCalendarView.vue b/src/modules/sailing-calendar/pages/SailingCalendarView.vue
index a27c17a4..71bf13a9 100644
--- a/src/modules/sailing-calendar/pages/SailingCalendarView.vue
+++ b/src/modules/sailing-calendar/pages/SailingCalendarView.vue
@@ -440,7 +440,7 @@ onMounted(() => void load())
diff --git a/src/modules/self-operated/pages/OverviewView.test.ts b/src/modules/self-operated/pages/OverviewView.test.ts
index 687baa30..93ce7a98 100644
--- a/src/modules/self-operated/pages/OverviewView.test.ts
+++ b/src/modules/self-operated/pages/OverviewView.test.ts
@@ -32,6 +32,24 @@ beforeEach(() => {
})
afterEach(() => { wrappers.splice(0).forEach(wrapper => wrapper.unmount()); vi.useRealTimers(); vi.restoreAllMocks() })
describe('warehouse operating dashboard', () => {
+ it.each([
+ ['1896.0666666666667', '1,896.07'],
+ [1896.0666666666667, '1,896.07'],
+ ['1200', '1,200'],
+ ['12.5', '12.5'],
+ ['0', '0'],
+ [null, '—'],
+ ])('formats the daily average %s without changing the returned metric', async (value, expected) => {
+ const response = structuredClone(dashboardFixture)
+ response.kpis.averageDailyOutboundQuantity.value = value
+ mocks.dashboard.mockResolvedValue(response)
+ const wrapper = page(); await choose(wrapper, { warehouseCode: 'WH-A' })
+ const card = wrapper.findAll('.dashboard-kpis section').find(node => node.find('h3').text() === '所选时段日均出库')!
+ expect(card.find('strong').text()).toBe(expected)
+ expect(card.text()).toContain('件／日')
+ expect(response.kpis.averageDailyOutboundQuantity.value).toBe(value)
+ })
+
it.each(['PARTIAL', 'UNKNOWN'])('renders omitted nullable KPI fields for %s instead of rejecting the dashboard', async status => {
const response = structuredClone(dashboardFixture)
for (const metric of Object.values(response.kpis)) {
@@ -246,6 +264,8 @@ describe('warehouse operating dashboard', () => {
expect(wrapper.text()).toContain('区间已采集出库量')
expect(wrapper.text()).toContain('已知小计 128')
expect(wrapper.text()).toContain('另 1 SKU 待核验')
+ expect(wrapper.find('.dashboard-kpis').text()).not.toContain('另 0 SKU 待核验')
+ expect(wrapper.findAll('.dashboard-kpis small').every(node => node.text() !== '—')).toBe(true)
expect(wrapper.text()).not.toContain('lingxing-primary')
})
it('changes the shared date range while pinning versions, then explicitly refreshes the whole snapshot', async () => {
diff --git a/src/modules/self-operated/pages/OverviewView.vue b/src/modules/self-operated/pages/OverviewView.vue
index a12d481c..78bfe370 100644
--- a/src/modules/self-operated/pages/OverviewView.vue
+++ b/src/modules/self-operated/pages/OverviewView.vue
@@ -70,6 +70,12 @@ const metricNames: { key: keyof Dashboard['kpis']; label: string; inventory?: bo
{ key: 'physicalQuantity', label: '实物库存', inventory: true }, { key: 'availableQuantity', label: '正品可售', inventory: true },
{ key: 'physicalSkuCount', label: '有库存SKU', inventory: true }, { key: 'noOutboundSkuCount', label: '所选时段无出库SKU', inventory: true },
]
+// 日均值只在展示时舍入，保留原始接口精度和未知状态。
+function averageDailyText(value: string | number | null | undefined) {
+ if (value == null || String(value).trim() === '') return '—'
+ const number = Number(value)
+ return Number.isFinite(number) ? number.toLocaleString('zh-CN', { maximumFractionDigits: 2 }) : '—'
+}
const metricIcons = [ArrowUpRight, Activity, Boxes, Package, Layers, Clock3]
const metricColors = ['#5575ed', '#3aa9ba', '#8871ce', '#35a987', '#c6923e', '#d67b91']
const rankingNames = [{ key: 'hotSkus', label: '所选时段热销Top10', unit: '件', all: '查看Top100' }, { key: 'longCoverageSkus', label: '预计消化时间最长Top10', unit: '天', all: '查看全部' }, { key: 'noOutboundSkus', label: '所选时段无出库库存Top10', unit: '件', all: '查看全部' }] as const
@@ -212,7 +218,7 @@ onUnmounted(() => { dataFence.cancel(); trendFence.cancel(); poller.stop(); clea
{{ syncing ? '预约工作清单同步中，正在自动读取最新事项；已保存内容无需重复提交。' : '正在读取当前事项与操作资格…' }}
-{{ detail.item.title }}
{{ typeLabels[detail.item.type] }} · {{ flowLabels[detail.item.flow] }} · {{ workStatus(detail.item) }}
-{{ workDate(detail.item) }} · {{ detail.item.timezone || '地点时区待核实' }}
{{ detail.item.destinationName || detail.item.originName || '地点待核实' }} · {{ detail.item.owner?.name || '待分派' }}
-下次跟进：{{ detail.item.followupDate || '尚未安排' }} · 作业日期未定，跟进日不作为作业日期
-{{ !detail.item.owner ? '负责人待分派。' : '' }}{{ !detail.item.followupDate ? '请补充下一次跟进安排。' : '' }}请记录跟进；若无操作权限，请联系负责人。
- -{{ workReason(reason) }}
+{{ detail.item.title }}
{{ typeLabels[detail.item.type] }} · {{ flowLabels[detail.item.flow] }}
+-
+
- 作业时间
- {{ workDate(detail.item) }}
- 作业时区
- {{ detail.item.timezone || '地点时区待核实' }}
- 作业地点
- {{ detail.item.destinationName || detail.item.originName || '地点待核实' }}
- 负责人
- {{ detail.item.owner?.name || '待分派' }}
- 下次跟进
- {{ detail.item.followupDate || '尚未安排' }}作业日期未定，跟进日不作为作业日期
关联货柜{{ container.containerNo || container.bookingNo || '—' }} · 本柜待办
+
还空责任：{{ detail.returnHandoff.from.name }} → {{ detail.returnHandoff.to.name }} · {{ detail.returnHandoff.status === 'PENDING_ACCEPTANCE' ? '接手方待确认，持续跟进' : '已确认接手' }}
+{{ detail.item.executionStatus === 'COMPLETED' ? '事项结果' : '当前处理' }}
+当前事项已完成，可查看关联工作和历史记录。
本次保存已完成。{{ loading ? '正在读取当前下一步…' : error ? '下一步读取失败，请重试读取事项，无需重复提交已保存内容。' : detail.item.executionStatus === 'COMPLETED' ? '当前事项已完成，可返回查看其他待办。' : '请按当前下一步继续处理。' }}
原业务进度
原业务进度
更多操作
关联工作 · {{ detail.relatedItems.length }} 项
原业务记录 · {{ detail.references.length }} 项
{{ reference.label }} · {{ reference.businessNo || '—' }}
操作记录
{{ entry.action }}
{{ entry.summary }}
{{ entry.operatorName || '—' }} · {{ entry.occurredAt }}暂无记录
关联工作 · {{ detail.relatedItems.length }} 项
暂无关联工作
原业务记录 · {{ detail.references.length }} 项
{{ reference.label }} · {{ reference.businessNo || '—' }}
暂无原业务记录
操作记录 · {{ detail.history.length }} 条
{{ historyLabels[entry.action] || '事项记录' }}
{{ entry.summary }}
{{ entry.operatorName || '—' }} · {{ entry.action }}暂无记录
{{ message }}
' }, ApiErrorMeta: true, TripPreparationDialog: { name: 'TripPreparationDialog', props: ['warehouseId', 'dispatchNos'], template: '' } } } }) } -function button(wrapper: ReturnType{{ message }}
' }, ApiErrorMeta: true } } }) } +const button = (wrapper: ReturnType{{ existingDispatches.length ? '沿用本批已有排车单' : '按批次选择真实托盘' }}
已有排车单沿用原实物安排车辆；只有尚未分配的实物才需要创建排车单。
-只安排部分箱数时，先核对本批逐来源数量并分批；新的当前批次继续使用原排车资格。若箱数无法对应完整实物，请先在原库存作业中完成拆托；不把整票重新选入。
-读取批次实物需要预约、尾程订单和入仓单列表权限。
+{{ existing.length ? '沿用本批已有排车单' : '按批次选择同仓真实货物' }}
同一张排车单可装同仓多个客户与目的仓，客户和预约归属逐来源保留。
+读取批次实物需要预约、尾程订单、入仓单和排车列表权限。
正在核对批次、客户与实物来源…
- -正在核对批次、客户、起运仓与实物来源…
+ +已创建排车单：{{ result.dispatchNo }}
排车结果未提供起运仓，需在原排车单核对。
{{ reason }}
-| 选择 | 托盘码 | 入库单号 | 来源 | 箱数 | 不可选择原因 |
|---|---|---|---|---|---|
| {{ row.palletNo || '—' }} | {{ row.planNo || '—' }} | {{ row.sourceStage === 'RECEIVED' ? '已收货实物' : row.sourceStage === 'PLAN' ? '计划托盘' : '原业务来源' }} | {{ row.packageCount ?? '待核实' }} | {{ reasons(row).join('；') || '可选' }} |
当前批次尚无可排实物。
已创建整车排车单：{{ result.dispatchNo }}
{{ reason }}
+部分箱数先按本批逐来源数量分批；不对应完整实物时，先在原库存作业拆托。
+ +| 选择 | 客户 | 托盘码 | 入库单号 | 来源 | 箱数 | 不可选择原因 |
|---|---|---|---|---|---|---|
| {{ row.native?.customerName || '客户待核实' }} | {{ row.palletNo || '—' }} | {{ row.planNo || '—' }} | {{ row.sourceStage === 'RECEIVED' ? '已收货实物' : '计划托盘' }} | {{ row.packageCount ?? '待核实' }} | {{ reasons(row).join('；') || '可选' }} |
当前批次尚无可排实物。
+本次草稿与原请求已保留，请勿改变来源、版本或另建排车单。
{{ message }}
' }, ApiErrorMeta: true, TripPreparationDialog: { name: 'TripPreparationDialog', props: ['warehouseId', 'dispatchNos'], template: '' } } } }) } -beforeEach(() => { vi.clearAllMocks(); state.allowed = true; vi.mocked(getDispatch).mockResolvedValue({ id: '9007199254740999', dispatchNo: 'DS-ORIGINAL', appointmentBatches: [], overseasWarehouseId: 'origin-1', overseasWarehouseName: '原起运仓', status: 'PENDING_DEPARTURE', packageCount: 12 }) }) -it.each(['customer-b', undefined])('rejects FBA dispatch references outside the exact batch customer: %s', async customerId => { - vi.mocked(getDispatch).mockResolvedValue({ id: '1', dispatchNo: 'DS-ORIGINAL', status: 'PENDING_DEPARTURE', appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'customer-a', sources: [] }] }) - const wrapper = render([{ batchKey: 'FBA_APPOINTMENT:1', dispatchNo: 'DS-ORIGINAL', customerId }]); await flushPromises() - expect(wrapper.text()).toContain('排车单与工作批次关联不一致') - expect(wrapper.find('table').exists()).toBe(false) - wrapper.unmount() +vi.mock('./workApi', async original => ({ ...await original{{ message }}
' }, ApiErrorMeta: true, WorkSharedTripForm: { name: 'WorkSharedTripForm', props: ['dispatchNo', 'canWrite'], template: '' } } } }) } +const button = (wrapper: ReturnType原排车单安排用车
沿用本批已选实物和原排车单，确认起运仓后安排车次、车辆与司机。
-查看原排车单需要排车列表权限。
正在核对原排车单与批次…
+沿用原整车排车
在原排车单维护车辆、司机和货物；一张排车单就是一趟车。
+查看原排车单及批次关联需要相应列表权限。
正在核对原排车单与批次…
| 操作 | 排车单号 | 起运仓 | 箱数 | 车次 |
|---|---|---|---|---|
| {{ row.dispatchNo }} | {{ row.overseasWarehouseName || '起运仓待核实' }} | {{ row.packageCount ?? '待核实' }} |
| 操作 | 排车单号 | 车牌号 | 箱数 | 阶段 |
|---|---|---|---|---|
| {{ row.dispatchNo }} | {{ row.vehicleInfo.vehicle?.plate || '—' }} | {{ row.counts.packageCount }} | {{ stageLabel(row.stage) }} |
{{ message }}
' }, ApiErrorMeta: true, -} } }) } -beforeEach(() => { vi.clearAllMocks(); access.allowed = true; vi.mocked(getDispatch).mockImplementation(async number => ({ id: `internal-${number}`, dispatchNo: number, appointmentBatches: [], customerId: number === 'DS-60' ? 'customer-b' : 'customer-d', overseasWarehouseId: 'warehouse-real', overseasWarehouseName: '实际起运仓', packageCount: number === 'DS-60' ? 60 : 40, status: 'PENDING_DEPARTURE' })) }) -it('checks exact 60 and 40 dispatch business numbers and passes both to the existing Fleet preparation before navigating to its real trip', async () => { - const wrapper = render() - expect(getDispatch).not.toHaveBeenCalled() - await wrapper.get('input').setValue('DS-40'); await wrapper.get('button').trigger('click'); await flushPromises() - expect(vi.mocked(getDispatch).mock.calls.map(call => call[0])).toEqual(['DS-60', 'DS-40']) - const prepare = wrapper.getComponent({ name: 'TripPreparationDialog' }) - expect(prepare.props()).toMatchObject({ modelValue: true, warehouseId: 'warehouse-real', dispatchNos: ['DS-60', 'DS-40'] }) - expect(wrapper.text()).toContain('60 箱'); expect(wrapper.text()).toContain('40 箱'); expect(wrapper.text()).not.toContain('internal-') - expect(await guard()).toBe(false) - prepare.vm.$emit('saved', { trip: { tripNo: 'TR-SHARED' } }); await flushPromises() - expect(wrapper.emitted('external')).toEqual([['/overseas-master-data/trips/TR-SHARED']]); expect(wrapper.emitted('updated')).toHaveLength(1) - wrapper.unmount() +function render() { return mount(WorkSharedTripForm, { props: { dispatchNo: 'DS-60', canWrite: true }, global: { provide: { 'appointment-work-leave-guard': (value: LeaveGuard) => { guard = value; return () => undefined } }, stubs: { ElButton: { props: ['disabled'], template: '' }, DispatchWorkflowDialog: { name: 'DispatchWorkflowDialog', props: ['modelValue', 'dispatchNo', 'action'], template: '' }, LoadErrorState: { props: ['message'], template: '{{ message }}
' }, ApiErrorMeta: true } } }) } +function detail(no = 'DS-60', allowed = true) { return { dispatchNo: no, status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: 0, counts: { packageCount: 60 }, vehicleInfo: { vehicle: null, driver: null }, actions: { ADD_CARGO: { allowed, blockCode: allowed ? null : 'PICKED', blockReason: allowed ? null : '货物已开始真实拣货' } } } as DispatchDetail } +const button = (wrapper: ReturnType与同仓其他排车单共车
-本批排车单：{{ dispatchNo }}。请先按各客户实际托盘分别备好排车单，再核对同仓两单并安排同一车次。
-所需箱数无法对应完整实物时，请先在原库存作业中完成拆托，再返回核对；分批计划不会代替实物拆托。
- -{{ row.dispatchNo }} · {{ row.overseasWarehouseName || '起运仓名称待核实' }} · {{ row.packageCount ?? '箱数待核实' }} 箱
-为原排车添加同仓货物
本车 {{ dispatchNo }}。只选择尚未安排的真实货物加入本车，不合并另一张排车单或搬迁已扫码货物。
+箱数无法对应完整实物时，先在原库存作业完成拆托；预约分批不代替实物拆托。
+{{ detail.vehicleInfo.vehicle?.plate || '车辆待维护' }} · {{ detail.counts.packageCount }} 箱
+{{ detail.actions.ADD_CARGO?.blockReason || '当前阶段或权限不允许加货，请从原排车单继续作业。' }}
+原排车请求尚未核对，不能另发加货命令。
整柜业务
-入库箱数{{ summary.inboundBoxes }}
已出库箱数{{ summary.outboundBoxes }}
当前库存{{ summary.availableBoxes }}
累计入库体积{{ summary.inboundVolumeCbm.toFixed(2) }} m³
选择费用项目时自动带入，使用时仍可修改；清空表示不设置默认价格。
diff --git a/src/modules/inbounds/measurement/InboundMeasurementPanel.vue b/src/modules/inbounds/measurement/InboundMeasurementPanel.vue
index 2a5ffbac..bc6f56cc 100644
--- a/src/modules/inbounds/measurement/InboundMeasurementPanel.vue
+++ b/src/modules/inbounds/measurement/InboundMeasurementPanel.vue
@@ -922,7 +922,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
.measurement-comparison thead th { background: #f8fafc; }
.measurement-comparison thead th:nth-child(2) { background: #f7f9ff; color: #465fc4; }
.measurement-comparison thead th:nth-child(3) { background: #f4fbf8; color: #18795d; }
-.measurement-comparison__difference { color: var(--el-color-warning-dark-2); font-weight: 600; }
+.measurement-comparison__difference { color: var(--el-color-danger-dark-2); font-weight: 600; }
.measurement-extra-facts { display: flex; flex-wrap: wrap; gap: var(--admin-space-3, 8px) var(--admin-space-6, 16px); color: var(--cc-muted); font-size: var(--admin-font-caption, 12px); }
.measurement-extra-facts strong { color: var(--cc-text); }
.measurement-panel { overflow: hidden; }
@@ -947,7 +947,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
.measurement-summary-header { display: flex; align-items: flex-start; justify-content: space-between; gap: 20px; }
.measurement-summary-context { display: flex; min-width: 0; flex-wrap: wrap; align-items: center; gap: var(--admin-space-3, 8px) 20px; }
.measurement-summary-header span { color: var(--cc-muted); font-size: var(--admin-font-caption, 11px); }
-.measurement-deviation-alert { margin: 0; width: auto; }
+.measurement-deviation-alert { --el-color-warning: var(--el-color-danger-dark-2); --el-color-warning-dark-2: var(--el-color-danger-dark-2); margin: 0; width: auto; }
.measurement-deviation-alert p { margin: 3px 0 0; line-height: 1.55; }
.measurement-summary-context p { display: inline-flex; min-width: 0; align-items: baseline; gap: var(--admin-space-2, 6px); margin: 0; overflow-wrap: anywhere; color: var(--cc-text); font-size: var(--admin-font-caption, 12px); font-weight: 600; }
.measurement-summary-status { display: flex; flex: 0 0 auto; align-items: center; gap: 9px; }
diff --git a/src/modules/loading-lists/api/containerFees.test.ts b/src/modules/loading-lists/api/containerFees.test.ts
index 586f080f..d272f360 100644
--- a/src/modules/loading-lists/api/containerFees.test.ts
+++ b/src/modules/loading-lists/api/containerFees.test.ts
@@ -1,12 +1,22 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { http } from '@/shared/api/http'
-import { adjustContainerFee, approveContainerFee, approveContainerFeeAllocationGroup, createContainerFee, createContainerFeeAllocationGroup, getContainerSettlementDetails, listContainerFeeSupplierOptions, listContainerFees, rejectContainerFee, uploadContainerFeePaymentVoucher, voidContainerFee, voidContainerFeeAllocationGroup } from './containerFees'
+import { adjustContainerFee, approveContainerFee, approveContainerFeeAllocationGroup, createContainerFee, createContainerFeeAllocationGroup, getContainerSettlementDetails, listApplicableFeeItems, listContainerFeeSupplierOptions, listContainerFees, rejectContainerFee, uploadContainerFeePaymentVoucher, voidContainerFee, voidContainerFeeAllocationGroup } from './containerFees'
import { listSuppliers } from '@/modules/suppliers'
vi.mock('@/modules/suppliers', () => ({ listSuppliers: vi.fn() }))
describe('container fee API', () => {
beforeEach(() => vi.restoreAllMocks())
+ it('retains configured, zero and empty default prices when loading fee choices', async () => {
+ vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: { records: [
+ { id: 1, feeTypeName: '操作费', defaultPrice: '60.25' },
+ { id: 2, feeTypeName: '零元费', defaultPrice: 0 },
+ { id: 3, feeTypeName: '手工费', defaultPrice: null },
+ ] } })
+ await expect(listApplicableFeeItems()).resolves.toMatchObject([
+ { id: '1', defaultPrice: 60.25 }, { id: '2', defaultPrice: 0 }, { id: '3', defaultPrice: null },
+ ])
+ })
it('passes accountId and exact controller DTOs', async () => {
const get = vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: [] })
const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { id: 3, loadingPlanId: 9, containerBookingId: 99, feeItemId: 7, feeItemNameSnapshot: '操作费', direction: 'PAYABLE', supplierId: 41, supplierName: '承运商A', supplierCategory: 'TRUCKING', settlementMode: 'DIRECT_PAID', paidAt: '2026-08-12T10:30:00', paymentMethod: 'BANK_TRANSFER', paymentReferenceNo: 'BANK-7', paymentVoucherFileIds: [9001], businessDate: '2026-08-12', amount: 100, currency: 'CNY', reviewStatus: 'PENDING', sourceStatus: 'ACTIVE', sourceVersion: 1 } })
diff --git a/src/modules/loading-lists/api/containerFees.ts b/src/modules/loading-lists/api/containerFees.ts
index 5d16c89d..94f9db27 100644
--- a/src/modules/loading-lists/api/containerFees.ts
+++ b/src/modules/loading-lists/api/containerFees.ts
@@ -84,6 +84,7 @@ export interface ContainerFeeAllocationGroupAdjustRequest {
}
export interface ApplicableFeeItem {
+ defaultPrice: number | null
id: string
name: string
feeCode: string
@@ -224,7 +225,7 @@ export async function voidContainerFee(planId: string, accountId: string, feeId:
export async function listApplicableFeeItems() {
const response = await http.get[] }>, ApiEnvelope<{ records: Record[] }>>('/platform/v1/fee-items', { params: { status: 'ACTIVE', page: 1, size: 200 } })
- return (unwrapApiResponse(response).records || []).map((raw) => ({ id: id(raw.id), name: String(raw.feeTypeName || ''), feeCode: String(raw.feeCode || ''), supplierCategory: supplierCategory(raw.supplierCategory), warehouseReceivable: Boolean(raw.warehouseReceivable), warehousePayable: Boolean(raw.warehousePayable), pickupReceivable: Boolean(raw.pickupReceivable), pickupPayable: Boolean(raw.pickupPayable) }))
+ return (unwrapApiResponse(response).records || []).map((raw): ApplicableFeeItem => ({ id: id(raw.id), name: String(raw.feeTypeName || ''), defaultPrice: raw.defaultPrice == null ? null : Number(raw.defaultPrice), feeCode: String(raw.feeCode || ''), supplierCategory: supplierCategory(raw.supplierCategory), warehouseReceivable: Boolean(raw.warehouseReceivable), warehousePayable: Boolean(raw.warehousePayable), pickupReceivable: Boolean(raw.pickupReceivable), pickupPayable: Boolean(raw.pickupPayable) }))
}
export async function listContainerFeeSupplierOptions(category: SupplierCategory | null): Promise {
diff --git a/src/modules/loading-lists/components/ContainerFeesPanel.test.ts b/src/modules/loading-lists/components/ContainerFeesPanel.test.ts
index 1339a279..18b94839 100644
--- a/src/modules/loading-lists/components/ContainerFeesPanel.test.ts
+++ b/src/modules/loading-lists/components/ContainerFeesPanel.test.ts
@@ -39,6 +39,90 @@ beforeEach(() => {
})
describe('ContainerFeesPanel contract', () => {
+ it.each(['success', 'failure'])('ignores a closed editor request that finishes late: %s', async (outcome) => {
+ const item = { id: '7', name: '操作费', feeCode: 'OPERATION', defaultPrice: 60, supplierCategory: null, warehouseReceivable: true, warehousePayable: false, pickupReceivable: false, pickupPayable: false }
+ let resolveOld!: (items: typeof item[]) => void
+ let rejectOld!: (reason: Error) => void
+ vi.mocked(listApplicableFeeItems).mockImplementationOnce(() => new Promise((resolve, reject) => { resolveOld = resolve; rejectOld = reject }))
+ vi.mocked(listApplicableFeeItems).mockResolvedValueOnce([{ ...item, defaultPrice: 80 }])
+ const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view'])
+ const state = (wrapper.vm.$ as unknown as { setupState: {
+ openCreate(): void
+ editorOpen: boolean
+ form: { amount: number }
+ feeItems: typeof item[]
+ feeItemsLoading: boolean
+ feeItemsError: unknown
+ } }).setupState
+ state.openCreate(); await flushPromises()
+ state.editorOpen = false; await flushPromises()
+ state.openCreate(); await flushPromises()
+ expect(state.feeItems[0]?.defaultPrice).toBe(80)
+ if (outcome === 'success') resolveOld([item])
+ else rejectOld(new Error('旧窗口请求失败'))
+ await flushPromises()
+ expect(state.feeItemsError).toBeNull()
+ expect(state.feeItemsLoading).toBe(false)
+ const select = wrapper.findAllComponents({ name: 'ElFormItem' }).find((field) => field.props('prop') === 'feeItemId')!.findComponent({ name: 'ElSelect' })
+ select.vm.$emit('update:modelValue', '7'); select.vm.$emit('change', '7')
+ await flushPromises()
+ expect(state.form.amount).toBe(80)
+ wrapper.unmount()
+ })
+
+ it('does not let an old completion clear the current loading state or refill a closed editor', async () => {
+ const item = { id: '7', name: '操作费', feeCode: 'OPERATION', defaultPrice: 60, supplierCategory: null, warehouseReceivable: true, warehousePayable: false, pickupReceivable: false, pickupPayable: false }
+ let resolveOld!: (items: typeof item[]) => void
+ let resolveCurrent!: (items: typeof item[]) => void
+ vi.mocked(listApplicableFeeItems)
+ .mockImplementationOnce(() => new Promise((resolve) => { resolveOld = resolve }))
+ .mockImplementationOnce(() => new Promise((resolve) => { resolveCurrent = resolve }))
+ const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view'])
+ const state = (wrapper.vm.$ as unknown as { setupState: {
+ openCreate(): void; editorOpen: boolean; feeItems: unknown[]; feeItemsLoading: boolean; feeItemsError: unknown
+ } }).setupState
+ state.openCreate(); await flushPromises()
+ state.editorOpen = false
+ state.openCreate(); await flushPromises()
+ resolveOld([item]); await flushPromises()
+ expect(state.feeItems).toEqual([])
+ expect(state.feeItemsLoading).toBe(true)
+ state.editorOpen = false; await flushPromises()
+ resolveCurrent([{ ...item, defaultPrice: 80 }]); await flushPromises()
+ expect(state.feeItems).toEqual([])
+ expect(state.feeItemsLoading).toBe(false)
+ expect(state.feeItemsError).toBeNull()
+ wrapper.unmount()
+ })
+
+ it('prefills the selected default, clears stale prices and retains manual overrides', async () => {
+ const base = { name: '操作费', feeCode: 'OPERATION', supplierCategory: null, warehouseReceivable: true, warehousePayable: false, pickupReceivable: false, pickupPayable: false }
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([
+ { ...base, id: '7', defaultPrice: 60 }, { ...base, id: '8', defaultPrice: null }, { ...base, id: '9', defaultPrice: 0 },
+ ])
+ const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view'])
+ const state = (wrapper.vm.$ as unknown as { setupState: {
+ openCreate(): void; save(): Promise
+ resetForm(row: Record): void
+ form: { feeItemId: string; amount: number }
+ } }).setupState
+ state.resetForm({ feeItemId: '7', direction: 'RECEIVABLE', businessDate: '2026-08-12', amount: 100 })
+ await flushPromises()
+ expect(state.form.amount).toBe(100)
+ state.openCreate(); await flushPromises()
+ const select = wrapper.findAllComponents({ name: 'ElFormItem' }).find((item) => item.props('prop') === 'feeItemId')!.findComponent({ name: 'ElSelect' })
+ for (const [id, price] of [['7', 60], ['8', 0], ['9', 0]] as const) {
+ select.vm.$emit('update:modelValue', id); select.vm.$emit('change', id)
+ await flushPromises()
+ expect(state.form.amount).toBe(price)
+ }
+ select.vm.$emit('update:modelValue', '7'); select.vm.$emit('change', '7')
+ await flushPromises()
+ state.form.amount = 75
+ await state.save(); await flushPromises()
+ expect(createContainerFee).toHaveBeenCalledWith('9', '11', expect.objectContaining({ feeItemId: '7', amount: 75 }))
+ })
+
it('keeps fee controls and table utilities in compact aligned toolbars', () => {
expect(panel).toContain('class="fees-header__actions"')
expect(panel).toContain('class="customer-context"')
@@ -179,7 +263,7 @@ describe('ContainerFeesPanel contract', () => {
})
it('keeps receivable usable when supplier permission is missing', async () => {
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'OPERATION', supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'OPERATION', defaultPrice: null, supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view'])
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; form: { direction: string; supplierId: string | null } } }).setupState
state.openCreate(); await flushPromises()
@@ -190,7 +274,7 @@ describe('ContainerFeesPanel contract', () => {
})
it('isolates a supplier load failure and clears supplier fields for receivable', async () => {
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', defaultPrice: null, supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
vi.mocked(listContainerFeeSupplierOptions).mockRejectedValue(new Error('suppliers unavailable'))
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view', 'platform:supplier:list'])
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; form: { direction: string; feeItemId: string; supplierId: string | null }; feeItems: unknown[] } }).setupState
@@ -203,7 +287,7 @@ describe('ContainerFeesPanel contract', () => {
})
it('submits only the selected supplier ID for payable fees', async () => {
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', defaultPrice: null, supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
vi.mocked(listContainerFeeSupplierOptions).mockResolvedValue([{ id: '41', supplierName: '承运商A', category: 'TRUCKING' }])
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view', 'platform:supplier:list'])
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; save(): Promise; form: { direction: string; feeItemId: string; supplierId: string | null; settlementMode: string | null; amount: number } } }).setupState
@@ -215,7 +299,7 @@ describe('ContainerFeesPanel contract', () => {
})
it('allows any loaded ACTIVE supplier when the payable fee item has no supplier category', async () => {
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '未映射费用', feeCode: 'UNMAPPED', supplierCategory: null, warehouseReceivable: false, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '未映射费用', feeCode: 'UNMAPPED', defaultPrice: null, supplierCategory: null, warehouseReceivable: false, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
vi.mocked(listContainerFeeSupplierOptions).mockResolvedValue([{ id: '41', supplierName: '报关行', category: 'CUSTOMS' }])
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view', 'platform:supplier:list'])
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; save(): Promise; form: { direction: string; feeItemId: string; supplierId: string | null; settlementMode: string | null; amount: number } } }).setupState
@@ -227,7 +311,7 @@ describe('ContainerFeesPanel contract', () => {
})
it('fails closed when a supplier candidate does not match the fee-item category', async () => {
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '拖车费', feeCode: 'TRUCKING', supplierCategory: 'TRUCKING', warehouseReceivable: false, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '拖车费', feeCode: 'TRUCKING', defaultPrice: null, supplierCategory: 'TRUCKING', warehouseReceivable: false, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
vi.mocked(listContainerFeeSupplierOptions).mockResolvedValue([{ id: '41', supplierName: '报关行', category: 'CUSTOMS' }])
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view', 'platform:supplier:list'])
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; save(): Promise; form: { direction: string; feeItemId: string; supplierId: string | null; amount: number } } }).setupState
@@ -249,7 +333,7 @@ describe('ContainerFeesPanel contract', () => {
it('clears paid inputs for RECEIVABLE and ON_ACCOUNT and shows backend settlement semantics', async () => {
vi.mocked(listContainerFees).mockResolvedValue([{ id: '2', loadingPlanId: '9', containerBookingId: '99', containerNo: null, feeItemId: '7', feeItemName: '已付拖车费', direction: 'PAYABLE', supplierId: '41', supplierName: '承运商A', supplierCategory: 'TRUCKING', settlementMode: 'DIRECT_PAID', paidAt: '2026-08-12T10:00:00', paymentMethod: 'BANK_TRANSFER', paymentReferenceNo: 'BANK-1', paymentVoucherFileIds: ['9001'], businessDate: '2026-08-12', amount: 100, currency: 'CNY', reviewStatus: 'PENDING', sourceStatus: 'ACTIVE', sourceVersion: 1, remark: null, reviewerName: null, reviewedAt: null, reviewReason: null }])
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', defaultPrice: null, supplierCategory: 'TRUCKING', warehouseReceivable: true, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view', 'platform:supplier:list'])
expect(wrapper.text()).toContain('已付成本'); expect(wrapper.text()).toContain('银行转账'); expect(wrapper.text()).toContain('BANK-1')
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; form: { direction: string; settlementMode: string | null; paidAt: string | null; paymentMethod: string | null; paymentReferenceNo: string | null; paymentVoucherFileIds: string[] | null } } }).setupState
@@ -259,7 +343,7 @@ describe('ContainerFeesPanel contract', () => {
})
it('fails closed without DIRECT_PAID evidence and submits a scoped uploaded voucher', async () => {
- vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', supplierCategory: 'TRUCKING', warehouseReceivable: false, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
+ vi.mocked(listApplicableFeeItems).mockResolvedValue([{ id: '7', name: '操作费', feeCode: 'TRUCKING', defaultPrice: null, supplierCategory: 'TRUCKING', warehouseReceivable: false, warehousePayable: true, pickupReceivable: false, pickupPayable: false }])
vi.mocked(listContainerFeeSupplierOptions).mockResolvedValue([{ id: '41', supplierName: '承运商A', category: 'TRUCKING' }])
const wrapper = await mountPanel(['firstleg:inbound:fee-detail:view', 'firstleg:inbound:fee-detail:edit', 'firstleg:fee-item:view', 'platform:supplier:list'])
const state = (wrapper.vm.$ as unknown as { setupState: { openCreate(): void; save(): Promise; selectVoucher(event: Event): Promise; form: { direction: string; feeItemId: string; supplierId: string | null; settlementMode: string | null; paidAt: string | null; paymentMethod: string | null; paymentReferenceNo: string | null; amount: number } } }).setupState
diff --git a/src/modules/loading-lists/components/ContainerFeesPanel.vue b/src/modules/loading-lists/components/ContainerFeesPanel.vue
index e6ac949a..13387736 100644
--- a/src/modules/loading-lists/components/ContainerFeesPanel.vue
+++ b/src/modules/loading-lists/components/ContainerFeesPanel.vue
@@ -55,6 +55,7 @@ const voucherUploading = ref(false)
const voucherError = ref(null)
const rejection = ref('')
let loadSequence = 0
+let feeItemLoadSequence = 0
let supplierLoadSequence = 0
const canView = computed(() => access.can('firstleg:inbound:fee-detail:view'))
@@ -122,6 +123,11 @@ function clearPaidFields() {
form.paidAt = null; form.paymentMethod = null; form.paymentReferenceNo = null; form.paymentVoucherFileIds = null
voucherFiles.value = []; voucherError.value = null
}
+
+// 仅在用户主动选费时带价，保留已有费用回显金额与人工修改。
+function applyFeeItemDefaultPrice() {
+ form.amount = selectedFeeItem.value?.defaultPrice ?? 0
+}
function settlementLabel(item: ContainerFeeResource) { return item.direction !== 'PAYABLE' ? '—' : item.settlementMode === 'DIRECT_PAID' ? '已付成本' : item.settlementMode === 'ON_ACCOUNT' ? '账期应付' : '未设置' }
function paymentMethodLabel(value: string | null | undefined) { return ({ ONLINE: '线上支付', BANK_TRANSFER: '银行转账', CASH: '现金', OTHER: '其他' } as Record)[value || ''] || '—' }
function customerLabel(customerId: string) { return customerOptions.value.find((item) => item.value === customerId)?.label || '客户信息缺失' }
@@ -153,12 +159,17 @@ function removeVoucher(fileId: string) {
}
async function loadFeeItems() {
+ const sequence = ++feeItemLoadSequence
feeItems.value = []; feeItemsError.value = null
if (!canViewFeeItems.value) return
feeItemsLoading.value = true
- try { feeItems.value = await listApplicableFeeItems() }
- catch (cause) { feeItemsError.value = getApiErrorDetails(cause, '费用项目加载失败') }
- finally { feeItemsLoading.value = false }
+ try {
+ const items = await listApplicableFeeItems()
+ // 只接收当前窗口最新请求，旧响应不得覆盖价格或清除新请求的加载状态。
+ if (sequence === feeItemLoadSequence) feeItems.value = items
+ }
+ catch (cause) { if (sequence === feeItemLoadSequence) feeItemsError.value = getApiErrorDetails(cause, '费用项目加载失败') }
+ finally { if (sequence === feeItemLoadSequence) feeItemsLoading.value = false }
}
async function loadSuppliers() {
@@ -340,6 +351,12 @@ function clearCustomerContext() {
}
watch(customerOptions, initializeCustomer, { immediate: true })
watch(accountId, () => { clearCustomerContext(); void load() })
+watch(editorOpen, (open) => {
+ if (open) return
+ // 同步失效旧窗口请求，覆盖关闭后立即重开及切换客户的情况。
+ feeItemLoadSequence += 1
+ feeItems.value = []; feeItemsError.value = null; feeItemsLoading.value = false
+}, { flush: 'sync' })
watch(() => form.direction, (direction) => {
if (!applicableItems.value.some((item) => item.id === form.feeItemId)) form.feeItemId = ''
if (direction === 'RECEIVABLE') { supplierLoadSequence += 1; form.supplierId = null; form.settlementMode = null; clearPaidFields(); suppliers.value = []; loadedSupplierCategory.value = undefined; suppliersError.value = null; suppliersLoading.value = false }
@@ -401,7 +418,7 @@ onMounted(() => void load())
账期应付 已付成本
- {{ section.title }}
- 返回拼车接货 重新核对 登记客户货物
+ 返回散板需求 重新核对 登记客户货物
+
- 待我处理 选择车次发布余位
+ 待我处理 选择车次发布余位
(null), page = ref(1), size = ref(20), loading = ref(false), exporting = ref(false), error = ref(null)
const recordOpen = ref(false), selected = ref(null)
+const statisticsOpen = ref(false)
const today = new Date().toISOString().slice(0, 10), monthAgo = new Date(Date.now() - 30 * 86400000).toISOString().slice(0, 10)
-const filters = ref({ from: monthAgo, to: today, keyword: '', sourceType: '', status: '' })
+const defaultFilters = () => ({ from: monthAgo, to: today, keyword: '', sourceType: '', status: '' })
+const filters = ref(defaultFilters())
+const displayedRange = ref('')
let applied: TripOperationsQuery = range(), sequence = 0
const fields: QueryField[] = [
- { key: 'from', label: '实际发车起日(UTC)', type: 'date', width: 185 }, { key: 'to', label: '实际发车止日(UTC)', type: 'date', width: 185 },
- { key: 'keyword', label: '关键词', type: 'input', width: 235, placeholder: '车次 / 发车车牌 / 司机 / 目的仓' },
- { key: 'sourceType', label: '货源', type: 'select', width: 145, options: [{ value: 'OWN', label: '含自有业务' }, { value: 'EXTERNAL', label: '含外接业务' }] },
- { key: 'status', label: '状态', type: 'select', width: 130, options: [{ value: 'IN_TRANSIT', label: '在途' }, { value: 'COMPLETED', label: '货物已结案' }] },
+ { key: 'from', label: '实际发车起日(UTC)', placeholder: '发车起日（UTC）', type: 'date', width: 150, props: { 'aria-label': '实际发车起日（UTC）' } },
+ { key: 'to', label: '实际发车止日(UTC)', placeholder: '发车止日（UTC）', type: 'date', width: 150, props: { 'aria-label': '实际发车止日（UTC）' } },
+ { key: 'keyword', label: '关键词', type: 'input', width: 270, placeholder: '车次 / 车牌 / 司机 / 目的仓', props: { 'aria-label': '车次、车牌、司机或目的仓' } },
+ { key: 'sourceType', label: '货源', placeholder: '全部货源', type: 'select', width: 140, props: { 'aria-label': '货源' }, options: [{ value: 'OWN', label: '含自有业务' }, { value: 'EXTERNAL', label: '含外接业务' }] },
+ { key: 'status', label: '状态', placeholder: '全部状态', type: 'select', width: 140, props: { 'aria-label': '状态' }, options: [{ value: 'IN_TRANSIT', label: '在途' }, { value: 'COMPLETED', label: '货物已结案' }] },
]
-const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 185, fixed: 'left', slotName: 'actions' }, { key: 'tripNo', label: '车次号', minWidth: 220 },
+const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'actions' }, { key: 'tripNo', label: '车次号', minWidth: 220 },
{ key: 'status', label: '状态', width: 125, slotName: 'status' }, { key: 'vehiclePlate', label: '发车车牌', minWidth: 125 }, { key: 'driverName', label: '发车司机', minWidth: 100 },
{ key: 'warehouseName', label: '起运仓', minWidth: 150 }, { key: 'destinations', label: '目的地', minWidth: 180, slotName: 'destinations' },
- { key: 'departedAt', label: '实际发车(UTC)', minWidth: 190 }, { key: 'completedAt', label: '货物结案(UTC)', minWidth: 190 },
- { key: 'physicalPallets', label: '实物托盘', width: 100 }, { key: 'palletSpaces', label: '标准托位', width: 100 }, { key: 'ownPackages', label: '自有箱数', width: 100 }, { key: 'externalPackages', label: '外接箱数', width: 100 },
- { key: 'agreed', label: '外接约定金额', minWidth: 170, slotName: 'agreed' }, { key: 'distance', label: '实际里程(mile)', width: 140, slotName: 'distance' }, { key: 'fuel', label: '实际油耗(L)', width: 130, slotName: 'fuel' }, { key: 'finance', label: '应收 / 实收', minWidth: 260, slotName: 'finance' }, { key: 'cost', label: '已登记直接成本', minWidth: 200, slotName: 'cost' }, { key: 'allocated', label: '自有 / 外接分摊', minWidth: 240, slotName: 'allocated' }]
+ { key: 'departedAt', label: '实际发车(UTC)', minWidth: 190 }, { key: 'physicalPallets', label: '实物托盘', width: 100 },
+ { key: 'agreed', label: '外接约定金额', minWidth: 170, slotName: 'agreed' },
+ { key: 'completedAt', label: '货物结案(UTC)', minWidth: 190, defaultVisible: false },
+ { key: 'palletSpaces', label: '标准托位', width: 100, defaultVisible: false }, { key: 'ownPackages', label: '自有箱数', width: 100, defaultVisible: false }, { key: 'externalPackages', label: '外接箱数', width: 100, defaultVisible: false },
+ { key: 'distance', label: '实际里程(mile)', width: 140, slotName: 'distance', defaultVisible: false }, { key: 'fuel', label: '实际油耗(L)', width: 130, slotName: 'fuel', defaultVisible: false },
+ { key: 'finance', label: '应收 / 实收', minWidth: 260, slotName: 'finance', defaultVisible: false }, { key: 'cost', label: '已登记直接成本', minWidth: 200, slotName: 'cost', defaultVisible: false }, { key: 'allocated', label: '自有 / 外接分摊', minWidth: 240, slotName: 'allocated', defaultVisible: false }]
function range(): TripOperationsQuery {
const from = String(filters.value.from || monthAgo), to = String(filters.value.to || today)
if (!/^\d{4}-\d{2}-\d{2}$/.test(from) || !/^\d{4}-\d{2}-\d{2}$/.test(to) || Number.isNaN(Date.parse(from)) || Number.isNaN(Date.parse(to))) throw new Error('请输入有效日期 YYYY-MM-DD')
return { from: `${from}T00:00:00Z`, to: new Date(Date.parse(`${to}T00:00:00Z`) + 86400000).toISOString(), keyword: String(filters.value.keyword || '') || undefined, sourceType: (filters.value.sourceType || undefined) as TripOperationsQuery['sourceType'], status: String(filters.value.status || '') || undefined }
}
-async function load() { const current = ++sequence; loading.value = true; error.value = null; try { const data = await listTripOperations({ ...applied, page: page.value, size: size.value }); if (current === sequence) result.value = data } catch (e) { if (current === sequence) { result.value = null; error.value = getApiErrorDetails(e, '运营记录加载失败') } } finally { if (current === sequence) loading.value = false } }
+async function load() {
+ const current = ++sequence, query = { ...applied, page: page.value, size: size.value }
+ loading.value = true; error.value = null
+ try {
+ const data = await listTripOperations(query)
+ if (current === sequence) {
+ result.value = data
+ displayedRange.value = `${query.from.slice(0, 10)} 至 ${new Date(Date.parse(query.to) - 86400000).toISOString().slice(0, 10)}（UTC）`
+ }
+ } catch (e) {
+ if (current === sequence) { result.value = null; error.value = getApiErrorDetails(e, '运营记录加载失败') }
+ } finally { if (current === sequence) loading.value = false }
+}
function search() { try { applied = range(); if (page.value !== 1) page.value = 1; else void load() } catch (e) { error.value = getApiErrorDetails(e, '日期范围无效') } }
+function resetFilters() { filters.value = defaultFilters() }
function openRecord(tripNo: unknown) { const row = result.value?.page.records.find(item => item.tripNo === tripNo); if (row) { selected.value = row; recordOpen.value = true } }
async function download() { exporting.value = true; try { await submitExport('TRIP_OPERATIONS_LIST', '出车记录', applied) } catch (e) { error.value = getApiErrorDetails(e, '导出失败') } finally { exporting.value = false } }
const money = (rows: TripOperationsMoney[]) => rows.length ? rows.map(r => `${r.currency} ${r.amount.toFixed(2)}`).join(' / ') : '—'
watch([page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++ })
+
+
+
+
+
+
+
+
+
+
+
+
导出
详情 实测记录
{{ row.status === 'COMPLETED' ? '货物已结案' : '在途' }}{{ row.destinations.map((d: TripOperationsRow['destinations'][number]) => d.label).join(' / ') }}
@@ -73,7 +106,11 @@ watch([page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++ }
()), http: { get: vi.fn(), post: vi.fn(), put: vi.fn(), delete: vi.fn() } }))
-
-describe('dispatch overseas API', () => {
- it('reads an immutable batch and preserves its exact per-source allocations on grouped submission', async () => {
- const allocation = { planPalletId: '9007199254740993', batchKey: 'FBA_APPOINTMENT:9', customerId: '9007199254740999', sourceKey: 'BOOKING:2', destinationKey: 'FBA:ONT8', packageCount: 12 }
- vi.mocked(http.get).mockResolvedValue({ code: '200', data: { batchKey: allocation.batchKey, version: 4, candidates: [], blockReasons: [] } })
- await getBatchDispatchCandidates(allocation.batchKey)
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/appointment-planning/batches/FBA_APPOINTMENT%3A9/dispatch-candidates')
- vi.mocked(http.post).mockResolvedValue({ code: '200', data: [] })
- const request = { draftToken: 'draft-1', groups: [{ draftContainerId: 'container-1', planPalletIds: [allocation.planPalletId], returnReceiptIds: [], batchAllocations: [allocation] }] }
- await preArrangeDraftDispatch(request)
- expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/pre-arrange', request)
- })
- it('submits all explicit draft groups once and preserves container and source identities', async () => {
- const payload = { draftToken: 'original-draft', groups: [
- { draftContainerId: '190000000000000099', planPalletIds: ['11', '13'], returnReceiptIds: [] },
- { draftContainerId: '190000000000000100', planPalletIds: ['12'], returnReceiptIds: ['22'] },
- ] }
- const result = payload.groups.map((group, index) => ({ draftContainerId: group.draftContainerId, dispatch: { id: String(index), dispatchNo: `DS-${index}` } }))
- vi.mocked(http.post).mockResolvedValue({ code: '200', data: result })
- expect(await preArrangeDraftDispatch(payload)).toEqual(result)
- expect(http.post).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/dispatches/drafts/pre-arrange', payload)
- })
- it('propagates a batch rejection without falling back to a flat or repeated command', async () => {
- vi.mocked(http.post).mockResolvedValue({ code: 'A0409', message: '草稿来源已变化', data: null })
- await expect(preArrangeDraftDispatch({ draftToken: 'original-draft', groups: [
- { draftContainerId: 'container', planPalletIds: ['11'], returnReceiptIds: [] },
- ] })).rejects.toThrow('草稿来源已变化')
- expect(http.post).toHaveBeenCalledTimes(1)
- })
- it('locks and submits actual return receipts without pretending they are plan pallets', async () => {
- vi.mocked(http.post).mockResolvedValue({ code: '200', data: null })
- await lockDispatchDraftPallet('RETURN:190000000000000099', 'draft-return', 'container-1')
- expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/draft-locks/lock', {
- sourceType: 'RETURN_RECEIPT', returnReceiptId: '190000000000000099', draftToken: 'draft-return', draftContainerId: 'container-1',
- })
- await unlockDispatchDraftPallet('RETURN:190000000000000099', 'draft-return')
- expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/draft-locks/unlock', {
- sourceType: 'RETURN_RECEIPT', returnReceiptId: '190000000000000099', draftToken: 'draft-return',
- })
- await preArrangeDispatch({ planPalletIds: [], returnReceiptIds: ['190000000000000099'], draftToken: 'draft-return' })
- expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/pre-arrange', {
- planPalletIds: [], returnReceiptIds: ['190000000000000099'], draftToken: 'draft-return',
- })
- })
- it('reads external freight from the scoped dispatch without a supplied customer', async () => {
- vi.mocked(http.get).mockResolvedValue({ code: '200', data: { snapshotHash: 'hash', requiresDeliveryFee: false, quotes: [] } })
- expect(await getDispatchExternalFreight('DP/1')).toEqual({ snapshotHash: 'hash', requiresDeliveryFee: false, quotes: [] })
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/DP%2F1/external-freight')
- })
- it('loads per-shipment coverage without exposing a caller-supplied customer or losing long IDs', async () => {
- vi.mocked(http.get).mockResolvedValue({ code: '200', data: { dispatchNo: 'DP/1', sourceComplete: true, blockReason: null, cargoHash: 'hash', cargo: [], feeSources: [{ financeFeeId: '190000000000000099', sourceFeeId: '190000000000000100', customerId: '101', sourceInboundId: '11', sourceVersion: '2', amount: '100.25' }] } })
- const result = await getDispatchFeeCoverage('DP/1')
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/DP%2F1/fee-coverage')
- expect(result.feeSources[0]).toMatchObject({ financeFeeId: '190000000000000099', sourceVersion: 2, amount: 100.25 })
- })
- beforeEach(() => {
- vi.mocked(http.get).mockReset()
- vi.mocked(http.post).mockReset()
- vi.mocked(http.put).mockReset()
- vi.mocked(http.delete).mockReset()
- })
-
- it('uses the platform dispatch page without customer scope', async () => {
- vi.mocked(http.get).mockResolvedValue({
- code: '200', message: 'success', data: { records: [], page: 2, size: 50, total: 0, pages: 0 },
- })
-
- await listDispatches({
- page: 2, size: 50, dispatchNo: 'PC-1',
- vehiclePlate: 'CA-100', status: 'PENDING_DEPARTURE', fbaAppointmentNo: 'FBA-1',
- })
-
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches', {
- params: {
- page: 2, size: 50, dispatchNo: 'PC-1',
- vehiclePlate: 'CA-100', status: 'PENDING_DEPARTURE', fbaAppointmentNo: 'FBA-1',
- },
- })
- })
-
- it('loads a platform dispatch detail by encoded dispatch number', async () => {
- vi.mocked(http.get).mockResolvedValue({ code: '200', message: 'success', data: { id: '1', dispatchNo: 'PC/1' } })
-
- await getDispatch('PC/1')
-
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1')
- })
-
- it('requests the generated BOL as a PDF blob', async () => {
- vi.mocked(http.get).mockResolvedValue(new Blob(['%PDF-test']))
- await getDispatchBolPdf('PC/1')
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/prints/bol', { responseType: 'blob' })
- })
-
- it('loads candidates and creates a pre-arrange dispatch in an explicit customer scope', async () => {
- vi.mocked(http.get).mockResolvedValue({ code: '200', message: 'success', data: [] })
- vi.mocked(http.post).mockResolvedValue({ code: '200', message: 'success', data: { id: '1', dispatchNo: 'PC-1' } })
- await listDispatchCandidates({ planIds: '101,102', fbaWarehouseCode: 'ONT8', sourceStage: 'PLAN' })
- await preArrangeDispatch({ planPalletIds: ['190000000000000099'] })
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/candidates', { params: { planIds: '101,102', fbaWarehouseCode: 'ONT8', sourceStage: 'PLAN' } })
- expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/pre-arrange', { planPalletIds: ['190000000000000099'] })
- })
-
- it('loads platform candidates without selected inbound plans', async () => {
- vi.mocked(http.get).mockResolvedValue({ code: '200', message: 'success', data: [] })
-
- await listDispatchCandidates({ sourceStage: 'RECEIVED' })
-
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/candidates', {
- params: { sourceStage: 'RECEIVED' },
- })
- })
-
- it('locks, unlocks, and releases intelligent dispatch drafts through dedicated endpoints', async () => {
- vi.mocked(http.post).mockResolvedValue({ code: '200', message: 'success', data: null })
-
- await lockDispatchDraftPallet('99', 'draft-1')
- await unlockDispatchDraftPallet('99', 'draft-1')
- await releaseDispatchDraft('draft-1')
-
- expect(http.post).toHaveBeenNthCalledWith(1, '/platform/v1/last-leg/dispatches/draft-locks/lock', { planPalletId: '99', draftToken: 'draft-1' })
- expect(http.post).toHaveBeenNthCalledWith(2, '/platform/v1/last-leg/dispatches/draft-locks/unlock', { planPalletId: '99', draftToken: 'draft-1' })
- expect(http.post).toHaveBeenNthCalledWith(3, '/platform/v1/last-leg/dispatches/draft-locks/release', { draftToken: 'draft-1' })
- })
-
- it('edits and cancels only by dispatchNo without customer scope or status mutation', async () => {
- vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: { id: '1', dispatchNo: 'PC/1' } })
- vi.mocked(http.delete).mockResolvedValue({ code: '200', message: 'success', data: null })
- await updateDispatch('PC/1', { vehiclePlate: 'CA-100' })
- await cancelDispatch('PC/1')
- expect(http.put).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1', { vehiclePlate: 'CA-100' })
- expect(http.put).not.toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ status: expect.anything() }))
- expect(http.delete).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1')
- })
-
- it('transfers to delivery only by dispatchNo without customerId', async () => {
- vi.mocked(http.post).mockResolvedValue({ code: '200', message: 'success', data: { dispatchNo: 'PC/1', outboundNo: 'OUT-1', outboundStatus: 'PICKED', palletCount: 2, packageCount: 20, deliveries: [{ deliveryNo: 'DEL-1', deliveryStatus: 'WAIT_DELIVERY', destinationWarehouseCode: 'ACY2', palletCount: 2, packageCount: 20 }], replayed: false } })
- const payload = { idempotencyKey: 'transfer-1', plannedDeliveryAt: '2026-09-01T10:00:00', deliveryMethod: 'TRUCK_PALLET', pickupMethod: 'WAREHOUSE_PICKUP', loadingType: 'PALLET', fees: [{ feeType: 'DELIVERY_FEE', feeName: '派送费用', direction: 'RECEIVABLE' as const, currency: 'USD' as const, amount: 10 }] }
- await transferDispatchToDelivery('PC/1', payload)
- expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/transfer-delivery', payload)
- })
-
- it('loads drafts and preserves long container ids in create and delete paths', async () => {
- vi.mocked(http.get).mockResolvedValue({ code: '200', message: 'success', data: [] })
- vi.mocked(http.post).mockResolvedValue({ code: '200', message: 'success', data: { id: '190000000000000099', capacity: 30, palletIds: [] } })
- vi.mocked(http.delete).mockResolvedValue({ code: '200', message: 'success', data: null })
-
- await listDispatchDrafts()
- await createDispatchDraftContainer('draft/1', 30)
- await deleteDispatchDraftContainer('draft/1', '190000000000000099')
-
- expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts')
- expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/containers', { draftToken: 'draft/1', capacity: 30 })
- expect(http.delete).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/draft%2F1/containers/190000000000000099')
- })
+import * as api from './dispatches'
+import { candidate, command, detail, loadingPreview, page } from '../dispatchTestFixtures'
+import type { ArrangeDelivery, CreateDispatch, DispatchBatchAllocation, DraftSelection, LoadingComplete, ReasonCommand, ReviewCommand, UpdateDispatch, Version, VersionCommand } from '../dispatchContracts'
+vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn(), post: vi.fn(), put: vi.fn(), delete: vi.fn() }, unwrapApiResponse: (value: { data: unknown }) => value.data }))
+const body = { recordVersion: 0, idempotencyKey: 'original-key', reason: '核对原因' }
+const draft = () => ({ draftToken: 'server-token', recordVersion: 0, status: 'ACTIVE', warehouseId: '321', containers: [], sources: [candidate()], expiresAt: '' })
+const file = () => ({ fileId: '9007199254740993', fileName: '证据.png', contentType: 'image/png', sizeBytes: 3 })
+beforeEach(() => {
+ vi.clearAllMocks()
+ vi.mocked(http.get).mockImplementation(async url => ({ data: url.endsWith('/items') ? { dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [] } : url.includes('/evidence/') ? file() : url.endsWith('/loading') ? loadingPreview() : url.includes('/commands/') ? command('EDIT') : detail() }))
+ vi.mocked(http.post).mockImplementation(async url => ({ data: url.endsWith('/pre-arrange') ? { draftToken: 'server-token', vehicles: [], replayed: false } : url.includes('/draft') ? draft() : url.includes('/evidence/') ? file() : command('EDIT') }))
+ vi.mocked(http.put).mockResolvedValue({ data: command('EDIT') })
+ vi.mocked(http.delete).mockResolvedValue({ data: draft() })
+})
+
+describe('native whole-vehicle dispatch API', () => {
+ it.each([0, '0', '9007199254740993'])('preserves authoritative batch version %s across direct create, add cargo and grouped conversion', async recordVersion => {
+ const allocation: DispatchBatchAllocation = { planPalletId: '11', batchKey: 'FBA_APPOINTMENT:1', customerId: 'C1', sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2, recordVersion }
+ const create: CreateDispatch = { warehouseId: '321', idempotencyKey: 'create', vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: [candidate().selection], batchAllocations: [allocation] }
+ await api.createDispatch(create); await api.addDispatchCargo('PC/1', { ...body, cargo: create.cargo, batchAllocations: [allocation] }); await api.convertDispatchDraft({ ...body, draftToken: 'draft', groups: [{ draftContainerId: 'container', dispatch: create }] })
+ expect(vi.mocked(http.post).mock.calls[0]![1]).toBe(create)
+ expect(vi.mocked(http.post).mock.calls[1]![1]).toMatchObject({ batchAllocations: [{ recordVersion }] })
+ expect(vi.mocked(http.post).mock.calls[2]![1]).toMatchObject({ groups: [{ dispatch: { batchAllocations: [{ recordVersion }] } }] })
+ })
+ it.each([undefined, null, -1, '', 'bad', 9007199254740992])('rejects missing or invalid nested batch version %s before any write or candidate handoff', async value => {
+ const allocation = { planPalletId: '11', batchKey: 'FBA_APPOINTMENT:1', customerId: 'C1', sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2, recordVersion: value } as unknown as DispatchBatchAllocation
+ const create: CreateDispatch = { warehouseId: '321', idempotencyKey: 'create', vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: [candidate().selection], batchAllocations: [allocation] }
+ await expect(Promise.resolve().then(() => api.createDispatch(create))).rejects.toThrow('重新读取候选')
+ await expect(Promise.resolve().then(() => api.addDispatchCargo('PC/1', { ...body, cargo: create.cargo, batchAllocations: [allocation] }))).rejects.toThrow('重新读取候选')
+ await expect(Promise.resolve().then(() => api.convertDispatchDraft({ ...body, draftToken: 'draft', groups: [{ draftContainerId: 'container', dispatch: create }] }))).rejects.toThrow('重新读取候选')
+ expect(http.post).not.toHaveBeenCalled()
+ vi.mocked(http.get).mockResolvedValueOnce({ data: { batchKey: allocation.batchKey, version: 5, candidates: [{ allocations: [allocation] }], blockReasons: [] } })
+ await expect(api.getBatchDispatchCandidates(allocation.batchKey)).rejects.toThrow('重新读取候选')
+ })
+ it('rejects inconsistent original versions of the same batch across conversion groups', () => {
+ const allocation = { planPalletId: '11', batchKey: 'FBA_APPOINTMENT:1', customerId: 'C1', sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2, recordVersion: '9007199254740993' }
+ const create: CreateDispatch = { warehouseId: '321', idempotencyKey: 'create', vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: [], batchAllocations: [allocation] }
+ expect(() => api.convertDispatchDraft({ ...body, draftToken: 'draft', groups: [{ draftContainerId: 'A', dispatch: create }, { draftContainerId: 'B', dispatch: { ...create, batchAllocations: [{ ...allocation, recordVersion: '9007199254740994' }] } }] })).toThrow('同一预约批次的版本不一致')
+ expect(http.post).not.toHaveBeenCalled()
+ })
+ it('uses actual item, route and evidence endpoints with native multipart and authenticated blob content', async () => {
+ await api.getDispatchItems('PC/1'); await api.getDispatchRoute('PC/1'); await api.getDispatchEvidence('PC/1', 'DRIVER', '9007199254740993')
+ expect(vi.mocked(http.get).mock.calls.map(call => call[0])).toEqual(['/platform/v1/last-leg/dispatches/PC%2F1/items', '/platform/v1/last-leg/dispatches/PC%2F1/route', '/platform/v1/last-leg/dispatches/PC%2F1/evidence/DRIVER/9007199254740993'])
+ const file = new File(['png'], '证据.png', { type: 'image/png' }); await api.uploadDispatchEvidence('PC/1', 'VEHICLE', file)
+ const upload = vi.mocked(http.post).mock.calls[0]!
+ expect(upload[0]).toBe('/platform/v1/last-leg/dispatches/PC%2F1/evidence/VEHICLE'); expect(upload[1]).toBeInstanceOf(FormData); expect((upload[1] as FormData).get('file')).toBe(file)
+ await api.getDispatchEvidenceContent('PC/1', 'VEHICLE', '301'); expect(http.get).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/evidence/VEHICLE/301/content', { responseType: 'blob' })
+ })
+ it('reorders only the supplied existing destination keys with explicit native version zero', async () => {
+ await expect(api.reorderDispatchRoute('PC/1', { recordVersion: null as unknown as number, idempotencyKey: 'key', destinationKeys: [], reason: '路线调整' })).rejects.toThrow('版本')
+ expect(http.put).not.toHaveBeenCalled()
+ const request = { recordVersion: 0, idempotencyKey: 'key', destinationKeys: ['CODE:ONT8', 'PRIVATE:actual'], reason: '现场卸货顺序调整' }
+ await api.reorderDispatchRoute('PC/1', request); expect(http.put).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/dispatches/PC%2F1/route', request)
+ })
+ it('queries five-stage rows with server review sections and preserves statistics', async () => {
+ vi.mocked(http.get).mockResolvedValueOnce({ data: page() })
+ const query = { page: 2, size: 20, stage: 'BEFORE_LOADING' as const, beforeLoadingSection: 'DISPATCH_REVIEW' as const, reviewStatus: 'PENDING' as const, status: 'ACTIVE' as const }
+ const result = await api.listDispatches(query)
+ expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches', { params: query }); expect(result.statistics.stageCounts.DELIVERING).toBe(1)
+ })
+ it('reads the four-object detail and loading without customer scope, encoding business numbers', async () => {
+ await api.getDispatch('PC/1'); await api.getDispatchLoading('PC/1'); await api.getDispatchCommand('PC/1', 'key/1')
+ expect(vi.mocked(http.get).mock.calls.map(call => call[0])).toEqual(['/platform/v1/last-leg/dispatches/PC%2F1', '/platform/v1/last-leg/dispatches/PC%2F1/loading', '/platform/v1/last-leg/dispatches/PC%2F1/commands/key%2F1'])
+ })
+ it('reads candidates with their exact sourceVersion and repeated plan query parameters', async () => {
+ const data = { candidates: [candidate()], snapshotAt: '2026-10-19T10:00:00Z', complete: true }
+ vi.mocked(http.get).mockResolvedValueOnce({ data })
+ expect(await api.listDispatchCandidates({ warehouseId: '321', planIds: ['11', '12'] })).toEqual(data)
+ expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/candidates', { params: { warehouseId: '321', planIds: ['11', '12'] }, paramsSerializer: { indexes: null } })
+ })
+ it('creates an empty real dispatch without an artificial customer or cargo', async () => {
+ const request: CreateDispatch = { idempotencyKey: 'create', warehouseId: '321', vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: [], batchAllocations: [] }
+ await api.createDispatch(request); expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches', request)
+ })
+ it.each(['cancel', 'remove', 'review', 'loading-review', 'return', 'loading', 'depart', 'arrange', 'add', 'submit', 'draft-container', 'draft-select', 'draft-release', 'draft-convert', 'draft-snapshot'])('rejects missing/null/negative versions before %s requests and accepts zero', async action => {
+ const invoke = (value: unknown) => {
+ const request = { ...body, recordVersion: value as Version }
+ switch (action) {
+ case 'cancel': return api.cancelDispatch('PC/1', request)
+ case 'remove': return api.removeDispatchItem('PC/1', '11', request)
+ case 'review': return api.reviewDispatch('PC/1', request as unknown as ReviewCommand)
+ case 'loading-review': return api.reviewDispatchLoading('PC/1', request as unknown as ReviewCommand)
+ case 'return': return api.returnDispatchToReview('PC/1', request)
+ case 'loading': return api.completeDispatchLoading('PC/1', request as unknown as LoadingComplete)
+ case 'depart': return api.departDispatch('PC/1', { ...request, remark: null })
+ case 'arrange': return api.transferDispatchToDelivery('PC/1', request as unknown as ArrangeDelivery)
+ case 'add': return api.addDispatchCargo('PC/1', { ...request, cargo: [], batchAllocations: [] })
+ case 'submit': return api.submitDispatchReview('PC/1', { ...request, remark: null })
+ case 'draft-container': return api.createDispatchDraftContainer({ ...request, draftToken: 'draft', capacity: 30 })
+ case 'draft-select': return api.lockDispatchDraftPallet(request as unknown as DraftSelection)
+ case 'draft-release': return api.releaseDispatchDraft({ ...request, draftToken: 'draft' })
+ case 'draft-convert': return api.convertDispatchDraft({ ...request, draftToken: 'draft', groups: [] })
+ default: return api.saveDispatchDraftSnapshot({ ...request, draftToken: 'draft', planIds: [], containers: [] })
+ }
+ }
+ for (const invalid of [undefined, null, -1, '', 'bad', Number.MAX_SAFE_INTEGER + 1]) await expect(Promise.resolve().then(() => invoke(invalid))).rejects.toThrow('版本')
+ expect(http.post).not.toHaveBeenCalled(); await invoke(0); expect(vi.mocked(http.post).mock.calls[0]![1]).toEqual(expect.objectContaining({ recordVersion: 0 }))
+ })
+ it('updates only an existing appointment reference and its explicit version', async () => {
+ const request: UpdateDispatch = { ...body, vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, vehicleAppointment: { referenceNo: 'AP-1', recordVersion: 0 } }
+ await api.updateDispatch('PC/1', request); expect(http.put).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1', request)
+ await expect(api.updateDispatch('PC/1', { ...request, vehicleAppointment: { referenceNo: 'AP-1', recordVersion: null as unknown as Version } })).rejects.toThrow('版本')
+ await expect(api.updateDispatch('PC/1', { ...request, recordVersion: undefined as unknown as Version })).rejects.toThrow('版本')
+ })
+ it('uses versioned removal and cancellation POSTs instead of unversioned deletes', async () => {
+ await api.cancelDispatch('PC/1', body); await api.removeDispatchItem('PC/1', 'item/1', body)
+ expect(vi.mocked(http.post).mock.calls.map(call => call[0])).toEqual(['/platform/v1/last-leg/dispatches/PC%2F1/cancel', '/platform/v1/last-leg/dispatches/PC%2F1/items/item%2F1/remove']); expect(http.delete).not.toHaveBeenCalled()
+ })
+ it('preserves complete grouped arrangement evidence and returns an immutable command envelope', async () => {
+ const outbound = (customerId: string) => ({ customerId, customerName: `客户${customerId}`, outboundNo: `OUT-${customerId}`, status: 'WAIT_OUTBOUND', packageCount: 2, palletCount: 1 })
+ const delivery = (customerId: string) => ({ ...outbound(customerId), groupKey: customerId, deliveryNo: `DEL-${customerId}`, destination: candidate().destination })
+ const data = { ...command('ARRANGE_DELIVERY'), result: { dispatchNo: 'PC/1', recordVersion: '9007199254740993', arrangementKey: 'arrange', cargoHash: 'cargo', arrangedAt: '2026-10-19T10:00:00Z', outbounds: [outbound('A'), outbound('B')], deliveries: [delivery('A'), delivery('B')] } }
+ vi.mocked(http.post).mockResolvedValueOnce({ data })
+ const request: ArrangeDelivery = { ...body, recordVersion: '9007199254740993', cargoHash: 'cargo', loadingCompletionHash: 'loaded', groups: [] }
+ expect(await api.transferDispatchToDelivery('PC/1', request)).toEqual(data); expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/transfer-delivery', request)
+ })
+ it('keeps draft version, server token and source evidence and converts explicit groups atomically', async () => {
+ const source = candidate().selection
+ await api.lockDispatchDraftPallet({ ...body, draftToken: 'server-token', draftContainerId: '190000000000000011', source })
+ expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/draft-locks/lock', { ...body, draftToken: 'server-token', draftContainerId: '190000000000000011', source })
+ await api.convertDispatchDraft({ ...body, draftToken: 'server-token', groups: [] }); expect(http.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/dispatches/drafts/pre-arrange', { ...body, draftToken: 'server-token', groups: [] })
+ })
+ it('deletes draft containers with the body version and never invents successful response data', async () => {
+ vi.mocked(http.delete).mockRejectedValueOnce(new Error('server failure'))
+ await expect(api.deleteDispatchDraftContainer('draft/1', 'container/1', body as ReasonCommand)).rejects.toThrow('server failure')
+ expect(http.delete).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/draft%2F1/containers/container%2F1', { data: body })
+ })
+ it('reads BOL as a PDF blob', async () => { await api.getDispatchBolPdf('PC/1'); expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/prints/bol', { responseType: 'blob' }) })
})
diff --git a/src/modules/overseas-warehouse/api/dispatches.ts b/src/modules/overseas-warehouse/api/dispatches.ts
index a66df138..66e1527d 100644
--- a/src/modules/overseas-warehouse/api/dispatches.ts
+++ b/src/modules/overseas-warehouse/api/dispatches.ts
@@ -1,346 +1,65 @@
import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { DispatchEvidenceKind, DispatchRoute, DispatchRouteCommand } from '../dispatchContracts'
+import { requireVersion, requireBatchVersions, type AddCargo, type ArrangeDelivery, type CandidateQuery, type ConvertDraft, type CreateDispatch, type DispatchQuery, type DraftContainer, type DraftSelection, type LoadingComplete, type ReasonCommand, type ReviewCommand, type UpdateDispatch, type VersionCommand, type DispatchBatchAllocation } from '../dispatchContracts'
+import { normalizeArrangementPreview, normalizeCandidateList, normalizeConvertedDraft, normalizeDispatchCommand, normalizeDispatchDetail, normalizeDispatchDraft, normalizeDispatchItems, normalizeDispatchPage, normalizeEvidenceFile, normalizeLoadingPreview, type ArrangementPreviewWire, type CandidateListWire, type CommandResultWire, type ConvertedDraftWire, type DispatchDetailWire, type DispatchDraftWire, type DispatchEvidenceFileWire, type DispatchItemsWire, type DispatchPageWire, type LoadingPreviewWire } from '../dispatchWire'
+export type { DispatchBatchReference, DispatchBatchAllocation } from '../dispatchContracts'
-import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
-
-export interface DispatchQuery {
- page: number
- size: number
- dispatchNo?: string
- vehiclePlate?: string
- status?: string
- fbaAppointmentNo?: string
- stage?: 'BEFORE_LOADING' | 'LOADING' | 'AFTER_LOADING' | 'CANCELLED'
-}
-
-export interface DispatchReview { status: 'PENDING' | 'APPROVED' | 'REJECTED'; reason: string | null; reviewedAt: string | null }
-export interface DispatchWorkflow { tripNo: string; dispatchReview: DispatchReview; loadingReview: DispatchReview }
-export interface DispatchActions {
- canEdit: boolean
- editBlockReason: string | null
- canCancel: boolean
- cancelBlockReason: string | null
- canRemovePallet: boolean
- removePalletBlockReason: string | null
- canTransfer: boolean
- transferBlockReason: string | null
- outboundNo: string | null
- outboundStatus: string | null
-}
-
-export interface DispatchPalletCandidateDto {
- sourceType?: 'INBOUND_PLAN' | 'RETURN_RECEIPT'
- returnReceiptId?: string | null
- returnReceiptNo?: string | null
- planId?: string | null
- planPalletId?: string | null
- warehousePalletId?: string | null
- orderId: string
- customerId?: string | null
- customerName?: string | null
- planNo?: string | null
- orderType?: string | null
- volumeWeightKg?: number | null
- grossWeightKg?: number | null
- containerNo?: string | null
- appointmentAt?: string | null
- expectedLoadingAt?: string | null
- overseasWarehouseId?: string | null
- overseasWarehouseCode?: string | null
- overseasWarehouseName?: string | null
- orderNo?: string | null
- orderRefs?: string | null
- inboundCode?: string | null
- palletNo?: string | null
- destinationWarehouseId?: string | null
- destinationWarehouseCode?: string | null
- destinationWarehouseName?: string | null
- fbaWarehouseCode?: string | null
- packageCount?: number | null
- volumeCbm?: number | null
- sourceStage?: 'PLAN' | 'RECEIVED' | 'RELABEL' | null
- cartonMarks?: string | null
- relabelCartonMarks?: string | null
- destinationType?: 'FBA' | 'PRIVATE' | null
- deliveryAddress?: string | null
- postalCode?: string | null
- contactName?: string | null
- contactPhone?: string | null
-}
-
-export interface DispatchCandidateQuery {
- planIds?: string
- orderNo?: string
- fbaWarehouseCode?: string
- sourceStage?: 'PLAN' | 'RECEIVED' | 'RELABEL'
- draftToken?: string
-}
-export interface DispatchDraftContainerDto { id: string; capacity: number; palletIds: string[] }
-export interface DispatchDraftDto { draftToken: string; containers?: DispatchDraftContainerDto[] }
-
-export interface PreArrangeDispatchPayload {
- batchAllocations?: DispatchBatchAllocation[]
- planPalletIds: string[]
- returnReceiptIds?: string[]
- fbaAppointmentNo?: string
- fbaAppointmentStatus?: string
- vehicleAppointmentStatus?: string
- draftToken?: string
- relabelNo?: string
-}
-
-export interface PreArrangeDispatchDraftGroup {
- batchAllocations?: DispatchBatchAllocation[]
- draftContainerId: string
- planPalletIds: string[]
- returnReceiptIds: string[]
-}
-export interface PreArrangeDispatchDraftPayload {
- draftToken: string
- groups: PreArrangeDispatchDraftGroup[]
-}
-export interface PreArrangeDispatchDraftResult {
- draftContainerId: string
- dispatch: DispatchSummaryDto
-}
-export interface DispatchBatchAllocation { planPalletId: string; batchKey: string; customerId: string; sourceKey: string; destinationKey: string; packageCount: number }
-export interface BatchDispatchCandidate { planPalletId: string; palletNo: string; planId: string; planNo: string; customerId: string; sourceStage: string; packageCount: number | null; allocations: DispatchBatchAllocation[]; blockReasons: string[] }
-export interface BatchDispatchCandidates { batchKey: string; version: number; candidates: BatchDispatchCandidate[]; blockReasons: string[] }
-export async function getBatchDispatchCandidates(batchKey: string) {
- return unwrapApiResponse(await http.get, ApiEnvelope>(`/platform/v1/last-leg/appointment-planning/batches/${encodeURIComponent(batchKey)}/dispatch-candidates`))
-}
-
-export interface DispatchBatchReference { batchKey: string; batchNo: string | null; customerId: string; sources: Array<{ sourceKey: string; destinationKey: string; packageCount: number }> }
-export interface DispatchSummaryDto {
- actions?: DispatchActions
- appointmentBatches: DispatchBatchReference[]
- workflow?: DispatchWorkflow | null
- id: string
- dispatchNo: string
- vehiclePlate?: string | null
- driverName?: string | null
- driverPhone?: string | null
- carrierName?: string | null
- orderNos?: string | null
- route?: string | null
- overseasWarehouseId?: string | null
- overseasWarehouseName?: string | null
- departAt?: string | null
- fbaAppointmentNo?: string | null
- fbaAppointmentStatus?: string | null
- vehicleAppointmentStatus?: string | null
- estimatedArrivalAt?: string | null
- status?: string | null
- itemCount?: number | null
- palletCount?: number | null
- packageCount?: number | null
- pickedPackageCount?: number | null
- shippedPackageCount?: number | null
- remainingPackageCount?: number | null
- partialCompletionReason?: string | null
- createdAt?: string | null
- items?: DispatchItemDto[]
- bolLines?: DispatchBolLineDto[]
-}
-
-export interface DispatchBolLineDto {
- containerNo?: string | null
- palletNo?: string | null
- fbaWarehouseCode?: string | null
- destinationWarehouseName?: string | null
- warehouseNo?: string | null
- fbaShipmentId?: string | null
- poReferenceNo?: string | null
- packageCount: number
-}
-
-export interface UpdateDispatchPayload {
- vehiclePlate?: string | null
- driverName?: string | null
- driverPhone?: string | null
- carrierName?: string | null
- departAt?: string | null
- fbaAppointmentNo?: string | null
- fbaAppointmentStatus?: string | null
- vehicleAppointmentStatus?: string | null
- estimatedArrivalAt?: string | null
-}
-
-export interface DispatchItemDto {
- id: string
- planPalletId: string
- warehousePalletId?: string | null
- palletNo?: string | null
- overseasWarehouseId?: string | null
- overseasWarehouseName?: string | null
- orderNo?: string | null
- orderRefs?: string | null
- inboundCode?: string | null
- destinationWarehouseCode?: string | null
- destinationWarehouseName?: string | null
- fbaWarehouseCode?: string | null
- packageCount?: number | null
- grossWeightKg?: number | null
- volumeWeightKg?: number | null
- volumeCbm?: number | null
- sourceStage?: string | null
-}
+const base = '/platform/v1/last-leg/dispatches'
+const path = (dispatchNo: string) => `${base}/${encodeURIComponent(dispatchNo)}`
+async function get(url: string) { return unwrapApiResponse(await http.get, ApiEnvelope>(url)) }
+async function post(url: string, body: object) { return unwrapApiResponse(await http.post, ApiEnvelope>(url, body)) }
+const postCommand = (url: string, body: object) => post(url, body).then(normalizeDispatchCommand)
+const postDraft = (url: string, body: object) => post(url, body).then(normalizeDispatchDraft)
+function versioned(body: T): T { requireVersion(body.recordVersion); return body }
export async function listDispatches(query: DispatchQuery) {
- const response = await http.get>, ApiEnvelope>>(
- '/platform/v1/last-leg/dispatches',
- { params: query },
- )
- return normalizeOverseasPage(unwrapApiResponse(response))
+ return normalizeDispatchPage(unwrapApiResponse(await http.get, ApiEnvelope>(base, { params: query })))
}
+export const getDispatch = (dispatchNo: string) => get(path(dispatchNo)).then(normalizeDispatchDetail)
+export const getDispatchItems = (no: string) => get(`${path(no)}/items`).then(normalizeDispatchItems)
+export const getDispatchRoute = (no: string) => get(`${path(no)}/route`)
+export async function reorderDispatchRoute(no: string, body: DispatchRouteCommand) { return normalizeDispatchCommand(unwrapApiResponse(await http.put, ApiEnvelope>(`${path(no)}/route`, versioned(body)))) }
+const evidencePath = (no: string, kind: DispatchEvidenceKind, id?: string) => `${path(no)}/evidence/${kind}${id ? `/${encodeURIComponent(id)}` : ''}`
+export async function uploadDispatchEvidence(no: string, kind: DispatchEvidenceKind, file: File) { const form = new FormData(); form.append('file', file); return post(evidencePath(no, kind), form).then(normalizeEvidenceFile) }
+export const getDispatchEvidence = (no: string, kind: DispatchEvidenceKind, id: string) => get(evidencePath(no, kind, id)).then(normalizeEvidenceFile)
+export const getDispatchEvidenceContent = (no: string, kind: DispatchEvidenceKind, id: string) => http.get(`${evidencePath(no, kind, id)}/content`, { responseType: 'blob' })
+export const getDispatchLoading = (dispatchNo: string) => get(`${path(dispatchNo)}/loading`).then(normalizeLoadingPreview)
+export const getDispatchCommand = (dispatchNo: string, key: string) => get(`${path(dispatchNo)}/commands/${encodeURIComponent(key)}`).then(normalizeDispatchCommand)
+export const createDispatch = (body: CreateDispatch) => { requireBatchVersions(body.batchAllocations); return postCommand(base, body) }
+export async function updateDispatch(dispatchNo: string, body: UpdateDispatch) {
+ versioned(body)
+ if (body.vehicleAppointment) requireVersion(body.vehicleAppointment.recordVersion)
+ return normalizeDispatchCommand(unwrapApiResponse(await http.put, ApiEnvelope>(path(dispatchNo), body)))
+}
+export const addDispatchCargo = (no: string, body: AddCargo) => { versioned(body); requireBatchVersions(body.batchAllocations); return postCommand(`${path(no)}/items`, body) }
+export const removeDispatchItem = (no: string, itemId: string, body: ReasonCommand) => postCommand(`${path(no)}/items/${encodeURIComponent(itemId)}/remove`, versioned(body))
+export const cancelDispatch = (no: string, body: ReasonCommand) => postCommand(`${path(no)}/cancel`, versioned(body))
+export const submitDispatchReview = (no: string, body: VersionCommand & { remark: string | null }) => postCommand(`${path(no)}/submit-review`, versioned(body))
+export const reviewDispatch = (no: string, body: ReviewCommand) => postCommand(`${path(no)}/dispatch-review`, versioned(body))
+export const reviewDispatchLoading = (no: string, body: ReviewCommand) => postCommand(`${path(no)}/loading-review`, versioned(body))
+export const returnDispatchToReview = (no: string, body: ReasonCommand) => postCommand(`${path(no)}/return-to-review`, versioned(body))
+export const completeDispatchLoading = (no: string, body: LoadingComplete) => postCommand(`${path(no)}/loading-complete`, versioned(body))
+export const departDispatch = (no: string, body: VersionCommand & { remark: string | null }) => postCommand(`${path(no)}/depart`, versioned(body))
+export const getDispatchArrangement = (no: string) => get(`${path(no)}/delivery-arrangement`).then(normalizeArrangementPreview)
+export const transferDispatchToDelivery = (no: string, body: ArrangeDelivery) => postCommand(`${path(no)}/transfer-delivery`, versioned(body))
+export const getDispatchBolPdf = (no: string) => http.get(`${path(no)}/prints/bol`, { responseType: 'blob' })
-export async function getDispatch(dispatchNo: string) {
- const response = await http.get, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}`,
- )
- return unwrapApiResponse(response)
+export async function listDispatchCandidates(query: CandidateQuery) {
+ return normalizeCandidateList(unwrapApiResponse(await http.get, ApiEnvelope>(`${base}/candidates`, { params: query, paramsSerializer: { indexes: null } })))
}
+export const listDispatchDrafts = () => get(`${base}/drafts`).then(values => values.map(normalizeDispatchDraft))
+export const createDispatchDraft = (body: { idempotencyKey: string; warehouseId: string }) => postDraft(`${base}/drafts`, body)
+export const createDispatchDraftContainer = (body: VersionCommand & { draftToken: string; capacity: number }) => postDraft(`${base}/drafts/containers`, versioned(body))
+export const saveDispatchDraftSnapshot = (body: VersionCommand & { draftToken: string; planIds: string[]; containers: DraftContainer[] }) => postDraft(`${base}/drafts/snapshot`, versioned(body))
+export const lockDispatchDraftPallet = (body: DraftSelection) => postDraft(`${base}/draft-locks/lock`, versioned(body))
+export const unlockDispatchDraftPallet = (body: DraftSelection) => postDraft(`${base}/draft-locks/unlock`, versioned(body))
+export const releaseDispatchDraft = (body: VersionCommand & { draftToken: string }) => postDraft(`${base}/draft-locks/release`, versioned(body))
+export async function deleteDispatchDraftContainer(token: string, id: string, body: ReasonCommand) {
+ return normalizeDispatchDraft(unwrapApiResponse(await http.delete, ApiEnvelope>(`${base}/drafts/${encodeURIComponent(token)}/containers/${encodeURIComponent(id)}`, { data: versioned(body) })))
+}
+export const convertDispatchDraft = (body: ConvertDraft) => { versioned(body); requireBatchVersions(body.groups.flatMap(group => group.dispatch.batchAllocations)); return post(`${base}/drafts/pre-arrange`, body).then(normalizeConvertedDraft) }
-export async function getDispatchBolPdf(dispatchNo: string) {
- return http.get(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}/prints/bol`,
- { responseType: 'blob' },
- )
-}
-
-export async function updateDispatch(dispatchNo: string, payload: UpdateDispatchPayload) {
- const response = await http.put, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}`, payload,
- )
- return unwrapApiResponse(response)
-}
-
-export async function cancelDispatch(dispatchNo: string) {
- const response = await http.delete, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}`,
- )
- return unwrapApiResponse(response)
-}
-
-export async function removeDispatchItem(dispatchNo: string, itemId: string) {
- const response = await http.delete, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}/items/${encodeURIComponent(itemId)}`,
- )
- return unwrapApiResponse(response)
-}
-
-export async function listDispatchCandidates(query: DispatchCandidateQuery) {
- const response = await http.get, ApiEnvelope>(
- '/platform/v1/last-leg/dispatches/candidates',
- { params: query },
- )
- return unwrapApiResponse(response)
-}
-
-export async function preArrangeDispatch(payload: PreArrangeDispatchPayload) {
- const response = await http.post, ApiEnvelope>(
- '/platform/v1/last-leg/dispatches/pre-arrange',
- payload,
- )
- return unwrapApiResponse(response)
-}
-
-export async function preArrangeDraftDispatch(payload: PreArrangeDispatchDraftPayload) {
- const response = await http.post, ApiEnvelope>(
- '/platform/v1/last-leg/dispatches/drafts/pre-arrange', payload,
- )
- return unwrapApiResponse(response)
-}
-
-function draftSource(selection: string) {
- return selection.startsWith('RETURN:')
- ? { sourceType: 'RETURN_RECEIPT', returnReceiptId: selection.slice(7) }
- : { planPalletId: selection }
-}
-export async function lockDispatchDraftPallet(selection: string, draftToken: string, draftContainerId?: string) {
- const response = await http.post, ApiEnvelope>(
- '/platform/v1/last-leg/dispatches/draft-locks/lock', { ...draftSource(selection), draftToken, ...(draftContainerId ? { draftContainerId } : {}) },
- )
- return unwrapApiResponse(response)
-}
-
-export async function listDispatchDrafts() {
- const response = await http.get, ApiEnvelope>('/platform/v1/last-leg/dispatches/drafts')
- return unwrapApiResponse(response)
-}
-export async function createDispatchDraftContainer(draftToken: string, capacity: number) {
- const response = await http.post, ApiEnvelope>('/platform/v1/last-leg/dispatches/drafts/containers', { draftToken, capacity })
- return unwrapApiResponse(response)
-}
-export async function deleteDispatchDraftContainer(draftToken: string, containerId: string) {
- const response = await http.delete, ApiEnvelope>(`/platform/v1/last-leg/dispatches/drafts/${encodeURIComponent(draftToken)}/containers/${encodeURIComponent(containerId)}`)
- return unwrapApiResponse(response)
-}
-
-export async function unlockDispatchDraftPallet(selection: string, draftToken: string) {
- const response = await http.post, ApiEnvelope>(
- '/platform/v1/last-leg/dispatches/draft-locks/unlock', { ...draftSource(selection), draftToken },
- )
- return unwrapApiResponse(response)
-}
-
-export async function releaseDispatchDraft(draftToken: string) {
- const response = await http.post, ApiEnvelope>(
- '/platform/v1/last-leg/dispatches/draft-locks/release', { draftToken },
- )
- return unwrapApiResponse(response)
-}
-
-export interface TransferDeliveryItem { deliveryNo: string; deliveryStatus: string; destinationWarehouseId?: string | null; destinationWarehouseCode?: string | null; destinationWarehouseName?: string | null; palletCount: number; packageCount: number }
-export interface TransferDeliveryResult { dispatchNo: string; outboundNo: string; outboundStatus: string; palletCount: number; packageCount: number; deliveries: TransferDeliveryItem[]; replayed: boolean }
-export interface TransferDeliveryPayload {
- feeCoverageCargoHash?: string
- feeCoverage?: import('../feeCoverageTypes').FeeCoverageSelection[]
- externalFreightHash?: string
- idempotencyKey: string
- plannedDeliveryAt: string
- deliveryMethod: string
- waybillNo?: string
- carrierName?: string
- pickupMethod: string
- loadingType: string
- vehicleType?: string
- vehicleSize?: string
- driverName?: string
- driverPhone?: string
- vehiclePlate?: string
- appointmentAccount?: string
- sellerName?: string
- remark?: string
- fees: Array<{ feeType: string; feeName: string; direction: 'RECEIVABLE' | 'PAYABLE'; currency: 'CNY' | 'USD'; amount: number
- supplierId?: string; supplierName?: string; supplierCategory?: string; settlementMode?: 'ON_ACCOUNT' | 'DIRECT_PAID'
- paidAt?: string; paymentMethod?: 'ONLINE' | 'BANK_TRANSFER' | 'CASH' | 'OTHER'; paymentReferenceNo?: string
- paymentVoucherFileIds?: string[]; chargeableQuantity?: number; quantityUnit?: string; unitPrice?: number
- periodStart?: string; periodEnd?: string; remark?: string }>
-}
-export async function transferDispatchToDelivery(dispatchNo: string, payload: TransferDeliveryPayload) {
- const response = await http.post, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}/transfer-delivery`, payload,
- )
- return unwrapApiResponse(response)
-}
-
-export interface ExternalFreightPreview {
- snapshotHash: string
- requiresDeliveryFee: boolean
- quotes: Array<{ bookingNo: string; recordVersion: string | number; incomingNo: string; inboundCode: string;
- customerName: string; destinationKey: string; currency: string; amount: number; quantity: number; quantityUnit: string; unitPrice: number }>
-}
-export async function getDispatchExternalFreight(dispatchNo: string): Promise {
- const response = await http.get, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}/external-freight`,
- )
- return unwrapApiResponse(response)
-}
-
-export async function getDispatchFeeCoverage(dispatchNo: string): Promise {
- const response = await http.get, ApiEnvelope>(
- `/platform/v1/last-leg/dispatches/${encodeURIComponent(dispatchNo)}/fee-coverage`,
- )
- const data = unwrapApiResponse(response)
- return { ...data, cargo: data.cargo.map(row => ({ ...row, dispatchItemId: String(row.dispatchItemId), warehousePalletId: String(row.warehousePalletId), orderId: row.orderId == null ? null : String(row.orderId), sourceInboundId: row.sourceInboundId == null ? null : String(row.sourceInboundId), packages: Number(row.packages) })), feeSources: data.feeSources.map(row => ({ ...row, financeFeeId: String(row.financeFeeId), sourceFeeId: String(row.sourceFeeId), customerId: String(row.customerId), sourceInboundId: String(row.sourceInboundId), sourceVersion: Number(row.sourceVersion), amount: Number(row.amount) })) }
-}
+// Existing appointment-domain provider; its consumer handoff remains with the coordinator.
+export interface BatchDispatchCandidate { planPalletId: string; palletNo: string; planId: string; planNo: string; customerId: string; sourceStage: string; packageCount: number | null; allocations: DispatchBatchAllocation[]; blockReasons: string[] }
+export interface BatchDispatchCandidates { batchKey: string; version: number; candidates: BatchDispatchCandidate[]; blockReasons: string[] }
+export const getBatchDispatchCandidates = (key: string) => get(`/platform/v1/last-leg/appointment-planning/batches/${encodeURIComponent(key)}/dispatch-candidates`).then(value => { requireBatchVersions(value.candidates.flatMap(row => row.allocations)); return value })
diff --git a/src/modules/overseas-warehouse/components/DispatchArrangeFields.test.ts b/src/modules/overseas-warehouse/components/DispatchArrangeFields.test.ts
new file mode 100644
index 00000000..be1c16b7
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/DispatchArrangeFields.test.ts
@@ -0,0 +1,35 @@
+import ElementPlus from 'element-plus'
+import { mount } from '@vue/test-utils'
+import { expect, it } from 'vitest'
+import DispatchArrangeFields from './DispatchArrangeFields.vue'
+import type { ArrangeGroup, CargoLine, PreviewGroup } from '../dispatchContracts'
+import { destination } from '../dispatchTestFixtures'
+const cargo = (sourceKey: string, customerId = 'C1'): CargoLine => ({ sourceKey, customerId, inboundCode: `IN-${sourceKey}` }) as CargoLine
+function values() {
+ const preview: PreviewGroup = { groupKey: 'group-1', customerId: 'C1', customerName: '客户甲', destination: destination(), groupCargoHash: 'group-cargo', cargo: [cargo('A'), cargo('B')], externalFreightHash: 'external-hash', externalQuotes: [], feeCoverageCargoHash: 'coverage-hash', feeSources: [{ financeFeeId: 'fee-1', customerId: 'C1', currency: 'USD', amount: 100, sourceVersion: 2, sourceHash: 'fee-hash', status: 'ACTIVE', services: ['DELIVERY_FEE', 'LOADING_FEE'], sourceKeys: ['A'] }], requiredServices: ['DELIVERY_FEE'], blockReasons: [] }
+ const group: ArrangeGroup = { groupKey: 'group-1', groupCargoHash: 'group-cargo', plannedDeliveryAt: '', deliveryMethod: '', waybillNo: null, carrierName: null, pickupMethod: '', loadingType: 'PALLET', vehicleType: null, vehicleSize: null, appointmentAccount: null, sellerName: null, remark: null, externalFreightHash: 'external-hash', feeCoverageCargoHash: 'coverage-hash', feeCoverage: [], fees: ['DELIVERY_FEE', 'LOADING_FEE', 'APPOINTMENT_FEE'].map(feeType => ({ feeType, feeName: feeType, direction: 'RECEIVABLE', currency: 'USD', amount: null })) }
+ return { preview, group }
+}
+it('requires explicit per-service coverage and preserves uncovered cargo instead of treating a partial fee as full coverage', async () => {
+ const { preview, group } = values()
+ const wrapper = mount(DispatchArrangeFields, { props: { modelValue: [group], preview: [preview], disabled: false }, global: { plugins: [ElementPlus] } })
+ const covered = (wrapper.vm as unknown as { covered(index: number, preview: PreviewGroup, service: string): boolean }).covered
+ expect(covered(0, preview, 'DELIVERY_FEE')).toBe(false)
+ await wrapper.get('input[type="checkbox"]').setValue(true)
+ expect(group.feeCoverage).toEqual([{ financeFeeId: 'fee-1', sourceVersion: 2, sourceHash: 'fee-hash', services: ['DELIVERY_FEE'] }])
+ expect(covered(0, preview, 'DELIVERY_FEE')).toBe(false)
+ preview.feeSources[0]!.sourceKeys.push('B'); expect(covered(0, preview, 'DELIVERY_FEE')).toBe(true)
+ expect(covered(0, preview, 'LOADING_FEE')).toBe(false)
+ preview.feeSources[0]!.customerId = 'C2'; expect(covered(0, preview, 'DELIVERY_FEE')).toBe(false); wrapper.unmount()
+})
+it('matches external quotes to the original customer and inbound source and shows only applicable additional fees', async () => {
+ const { preview, group } = values(); preview.cargo = [cargo('A')]
+ preview.externalQuotes = [{ customerId: 'C2', groupKey: 'group-1', bookingNo: 'BOOK-1', inboundCode: 'IN-A', currency: 'USD', amount: 100, sourceHash: 'external-source' }]
+ const wrapper = mount(DispatchArrangeFields, { props: { modelValue: [group], preview: [preview], disabled: false }, global: { plugins: [ElementPlus] } })
+ const state = wrapper.vm as unknown as { covered(index: number, preview: PreviewGroup, service: string): boolean }
+ expect(state.covered(0, preview, 'DELIVERY_FEE')).toBe(false)
+ expect(wrapper.findAll('.el-input-number')).toHaveLength(1)
+ preview.externalQuotes[0]!.customerId = 'C1'; expect(state.covered(0, preview, 'DELIVERY_FEE')).toBe(true)
+ group.loadingType = 'FLOOR'; group.appointmentAccount = 'BUY_APPOINTMENT'; await wrapper.setProps({ modelValue: [{ ...group }] })
+ expect(wrapper.findAll('.el-input-number')).toHaveLength(2); expect(wrapper.text()).toContain('卖家姓名'); wrapper.unmount()
+})
diff --git a/src/modules/overseas-warehouse/components/DispatchArrangeFields.vue b/src/modules/overseas-warehouse/components/DispatchArrangeFields.vue
new file mode 100644
index 00000000..4c80fe37
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/DispatchArrangeFields.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
diff --git a/src/modules/overseas-warehouse/components/DispatchEvidenceFiles.test.ts b/src/modules/overseas-warehouse/components/DispatchEvidenceFiles.test.ts
new file mode 100644
index 00000000..02d13fe8
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/DispatchEvidenceFiles.test.ts
@@ -0,0 +1,70 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import { ApiResponseError, http } from '@/shared/api/http'
+import { parseApiJsonResponse } from '@chongchong/shared'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
+import * as api from '../api/dispatches'
+import type { DispatchEvidenceFile } from '../dispatchContracts'
+vi.mock('../api/dispatches', () => ({ getDispatchEvidence: vi.fn(), getDispatchEvidenceContent: vi.fn(), uploadDispatchEvidence: vi.fn() }))
+const metadata = (fileId = '301', contentType = 'image/png'): DispatchEvidenceFile => ({ fileId, fileName: contentType === 'application/pdf' ? '本车证照.pdf' : '本车证据.png', contentType, sizeBytes: 3 })
+const options = { props: { modelValue: ['301'], dispatchNo: 'PC/1', kind: 'VEHICLE' as const }, global: { stubs: { ElButton: { props: ['disabled'], template: '' }, AppDialog: { name: 'AppDialog', props: ['modelValue', 'title'], template: ', label: string) => wrapper.findAll('button').find(value => value.text() === label)!
+async function selectFile(wrapper: ReturnType, file: File) { const input = wrapper.get('input[type="file"]'); Object.defineProperty(input.element, 'files', { configurable: true, value: [file] }); await input.trigger('change'); await flushPromises() }
+beforeEach(() => { vi.resetAllMocks(); vi.mocked(api.getDispatchEvidence).mockResolvedValue(metadata()); vi.mocked(api.uploadDispatchEvidence).mockResolvedValue(metadata('302')); vi.mocked(api.getDispatchEvidenceContent).mockResolvedValue(new Blob(['png'], { type: 'image/png' })); URL.createObjectURL = vi.fn().mockReturnValue('blob:authenticated'); URL.revokeObjectURL = vi.fn() })
+it('previews and replaces real string-size metadata through the JSON parser and API boundary', async () => {
+ const actual = await vi.importActual('../api/dispatches')
+ const envelope = (fileId: string) => parseApiJsonResponse(JSON.stringify({ code: '200', data: { ...metadata(fileId), sizeBytes: '3' } }))
+ const get = vi.spyOn(http, 'get').mockResolvedValue(envelope('9007199254740993'))
+ const post = vi.spyOn(http, 'post').mockResolvedValue(envelope('9007199254740994'))
+ vi.mocked(api.getDispatchEvidence).mockImplementation(actual.getDispatchEvidence); vi.mocked(api.uploadDispatchEvidence).mockImplementation(actual.uploadDispatchEvidence)
+ const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, modelValue: ['9007199254740993'] } })
+ try {
+ await flushPromises(); expect(wrapper.text()).toContain('本车证据.png')
+ await button(wrapper, '预览').trigger('click'); await flushPromises(); expect(wrapper.get('img').attributes('src')).toBe('blob:authenticated')
+ await button(wrapper, '关闭预览').trigger('click'); await button(wrapper, '替换').trigger('click'); await selectFile(wrapper, new File(['png'], 'new.png', { type: 'image/png' }))
+ expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([['9007199254740994']]); expect(post).toHaveBeenCalledOnce()
+ } finally { wrapper.unmount(); get.mockRestore(); post.mockRestore() }
+})
+it('reads owned metadata without displaying IDs or downloading content until explicitly previewed, including read-only mode', async () => {
+ const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, readonly: true } }); await flushPromises()
+ expect(api.getDispatchEvidence).toHaveBeenCalledWith('PC/1', 'VEHICLE', '301'); expect(api.getDispatchEvidenceContent).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('本车证据.png'); expect(wrapper.text()).not.toContain('301'); expect(wrapper.find('input').exists()).toBe(false)
+ await button(wrapper, '预览').trigger('click'); await flushPromises(); expect(api.getDispatchEvidenceContent).toHaveBeenCalledWith('PC/1', 'VEHICLE', '301'); expect(wrapper.get('img').attributes('src')).toBe('blob:authenticated')
+ await button(wrapper, '关闭预览').trigger('click'); expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:authenticated'); wrapper.unmount()
+})
+it('retains original references when metadata or replacement upload fails and preserves request diagnostics', async () => {
+ vi.mocked(api.getDispatchEvidence).mockRejectedValueOnce(new ApiResponseError('Forbidden', 'A0403', 403, undefined, 'request-1', 'trace-1'))
+ const failed = mount(DispatchEvidenceFiles, options); await flushPromises(); expect(failed.emitted('update:modelValue')).toBeUndefined(); expect(failed.getComponent(ApiErrorMeta).props('details')).toMatchObject({ requestId: 'request-1', traceId: 'trace-1' }); failed.unmount()
+ const wrapper = mount(DispatchEvidenceFiles, options); await flushPromises(); vi.mocked(api.uploadDispatchEvidence).mockRejectedValueOnce(new Error('unknown upload'))
+ await button(wrapper, '替换').trigger('click'); await selectFile(wrapper, new File(['png'], 'new.png', { type: 'image/png' })); expect(wrapper.emitted('update:modelValue')).toBeUndefined(); expect(wrapper.text()).toContain('原附件引用保留'); wrapper.unmount()
+})
+it('replaces the selected reference only after a valid successful upload and rejects unsupported types locally', async () => {
+ const wrapper = mount(DispatchEvidenceFiles, options); await flushPromises(); await selectFile(wrapper, new File(['exe'], 'file.exe', { type: 'application/octet-stream' })); expect(api.uploadDispatchEvidence).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('10MiB以内')
+ await button(wrapper, '替换').trigger('click'); const file = new File(['png'], 'new.png', { type: 'image/png' }); await selectFile(wrapper, file)
+ expect(api.uploadDispatchEvidence).toHaveBeenCalledWith('PC/1', 'VEHICLE', file); expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([['302']]); expect(wrapper.emitted('busy')?.slice(-2)).toEqual([[true], [false]]); wrapper.unmount()
+})
+it('ignores a late upload after switching dispatches instead of binding the file to the new vehicle', async () => {
+ let resolve!: (value: DispatchEvidenceFile) => void; vi.mocked(api.uploadDispatchEvidence).mockImplementationOnce(() => new Promise(done => { resolve = done }))
+ const wrapper = mount(DispatchEvidenceFiles, options); await flushPromises(); await button(wrapper, '替换').trigger('click'); await selectFile(wrapper, new File(['png'], 'new.png', { type: 'image/png' }))
+ await wrapper.setProps({ dispatchNo: 'PC/2' }); resolve(metadata('302')); await flushPromises(); expect(wrapper.emitted('update:modelValue')).toBeUndefined(); wrapper.unmount()
+})
+it('does not turn business-error JSON into an image and retains diagnostic evidence', async () => {
+ vi.mocked(api.getDispatchEvidenceContent).mockResolvedValueOnce({ type: 'application/json', size: 100, text: async () => JSON.stringify({ code: 'A0403', message: 'Forbidden', requestId: 'request-content', traceId: 'trace-content' }) } as Blob)
+ const wrapper = mount(DispatchEvidenceFiles, options); await flushPromises(); await button(wrapper, '预览').trigger('click'); await flushPromises(); expect(URL.createObjectURL).not.toHaveBeenCalled(); expect(wrapper.find('img').exists()).toBe(false); expect(wrapper.getComponent(ApiErrorMeta).props('details')).toMatchObject({ requestId: 'request-content', traceId: 'trace-content' }); wrapper.unmount()
+})
+it('ignores content arriving after preview close and cleans up object URLs on unmount', async () => {
+ let resolve!: (value: Blob) => void; vi.mocked(api.getDispatchEvidenceContent).mockImplementationOnce(() => new Promise(done => { resolve = done }))
+ const wrapper = mount(DispatchEvidenceFiles, options); await flushPromises(); await button(wrapper, '预览').trigger('click'); await button(wrapper, '关闭预览').trigger('click'); resolve(new Blob(['png'], { type: 'image/png' })); await flushPromises(); expect(URL.createObjectURL).not.toHaveBeenCalled()
+ await button(wrapper, '预览').trigger('click'); await flushPromises(); expect(URL.createObjectURL).toHaveBeenCalledTimes(1); wrapper.unmount(); expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:authenticated')
+})
+it('opens PDF in a user-requested window using owned blob content and never an anonymous URL', async () => {
+ vi.mocked(api.getDispatchEvidence).mockResolvedValueOnce(metadata('301', 'application/pdf')); vi.mocked(api.getDispatchEvidenceContent).mockResolvedValueOnce(new Blob(['pdf'], { type: 'application/pdf' }))
+ const popup = { location: { href: '' }, close: vi.fn() }; const open = vi.spyOn(window, 'open').mockReturnValueOnce(popup as unknown as Window)
+ const wrapper = mount(DispatchEvidenceFiles, options); await flushPromises(); await button(wrapper, '预览').trigger('click'); await flushPromises(); expect(open).toHaveBeenCalledWith('', '_blank'); expect(popup.location.href).toBe('blob:authenticated'); expect(wrapper.find('img').exists()).toBe(false); wrapper.unmount(); expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:authenticated'); open.mockRestore()
+})
+it('rejects mismatched file identity and a blocked PDF popup without fetching content', async () => {
+ vi.mocked(api.getDispatchEvidence).mockResolvedValueOnce(metadata('wrong-file'))
+ const mismatch = mount(DispatchEvidenceFiles, options); await flushPromises(); expect(button(mismatch, '预览').attributes('disabled')).toBeDefined(); expect(api.getDispatchEvidenceContent).not.toHaveBeenCalled(); mismatch.unmount()
+ vi.mocked(api.getDispatchEvidence).mockResolvedValueOnce(metadata('301', 'application/pdf')); const open = vi.spyOn(window, 'open').mockReturnValueOnce(null)
+ const blocked = mount(DispatchEvidenceFiles, options); await flushPromises(); await button(blocked, '预览').trigger('click'); await flushPromises(); expect(blocked.text()).toContain('请允许本站打开PDF预览窗口'); expect(api.getDispatchEvidenceContent).not.toHaveBeenCalled(); blocked.unmount(); open.mockRestore()
+})
diff --git a/src/modules/overseas-warehouse/components/DispatchEvidenceFiles.vue b/src/modules/overseas-warehouse/components/DispatchEvidenceFiles.vue
new file mode 100644
index 00000000..2411f091
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/DispatchEvidenceFiles.vue
@@ -0,0 +1,85 @@
+
+
+ 上传{{ label }} ![]()
; searchDrivers(): Promise }; await state.searchVehicles(); await state.searchDrivers()
+ expect(listVehicles).not.toHaveBeenCalled(); expect(listDrivers).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('缺少司机档案读取权限'); wrapper.unmount()
+})
diff --git a/src/modules/overseas-warehouse/components/DispatchResourceFields.vue b/src/modules/overseas-warehouse/components/DispatchResourceFields.vue
new file mode 100644
index 00000000..6ce8a6c2
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/DispatchResourceFields.vue
@@ -0,0 +1,53 @@
+
+
+ ; measurements: Array<{ weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null; palletSpaces: number | null }>; form: { reason: string; decision: string }; detail: DispatchDetail }
+it.each([0, '0', '9007199254740993'])('adds cargo with original batch version %s while keeping the parent dispatch version independent', async recordVersion => {
+ const value = candidate({ appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'C1', recordVersion, sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2 }] }] })
+ vi.mocked(api.listDispatches).mockResolvedValue(page()); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [value], complete: true, snapshotAt: '' })
+ const { wrapper, state } = await open('ADD_CARGO')
+ try {
+ (wrapper.vm as unknown as { selected: string[] }).selected = [value.sourceKey]
+ vi.mocked(api.addDispatchCargo).mockImplementation(async (_, request) => command('ADD_CARGO', request.idempotencyKey)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
+ await state.submit()
+ expect(api.addDispatchCargo).toHaveBeenCalledWith('PC/1', expect.objectContaining({ recordVersion: 0, batchAllocations: [{ planPalletId: '11', batchKey: 'FBA_APPOINTMENT:1', customerId: 'C1', sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2, recordVersion }] }))
+ } finally { wrapper.unmount() }
+})
+it('blocks cargo addition when the authoritative batch version is absent', async () => {
+ const value = candidate({ appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'C1', recordVersion: undefined as unknown as number, sources: [] }] })
+ vi.mocked(api.listDispatches).mockResolvedValue(page()); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [value], complete: true, snapshotAt: '' })
+ const { wrapper, state } = await open('ADD_CARGO')
+ try {
+ (wrapper.vm as unknown as { selected: string[] }).selected = [value.sourceKey]; await state.submit()
+ expect(api.addDispatchCargo).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('预约批次版本缺失或无效，请重新读取候选')
+ } finally { wrapper.unmount() }
+})
+it('removes an unpicked authoritative item after real JSON and API normalization of pickedPackages string zero', async () => {
+ const actual = await vi.importActual('../api/dispatches')
+ const source = candidate()
+ const data = { dispatchNo: 'PC/1', recordVersion: '0', status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...source.selection, dispatchItemId: '9007199254740993', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: '2', pickedPackages: '0', remove: { allowed: true, blockCode: null, blockReason: null } }] }
+ const get = vi.spyOn(http, 'get').mockResolvedValue(parseApiJsonResponse(JSON.stringify({ code: '200', data })))
+ vi.mocked(api.getDispatchItems).mockImplementation(actual.getDispatchItems)
+ const { wrapper, state } = await open('REMOVE_CARGO')
+ try {
+ (wrapper.vm as unknown as { itemId: string }).itemId = '9007199254740993'; state.form.reason = '本车计划调整'
+ vi.mocked(api.removeDispatchItem).mockImplementation(async (_, __, request) => command('REMOVE_CARGO', request.idempotencyKey)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
+ await state.submit()
+ expect(api.removeDispatchItem).toHaveBeenCalledWith('PC/1', '9007199254740993', expect.objectContaining({ recordVersion: '0', reason: '本车计划调整' })); expect(wrapper.emitted('saved')).toHaveLength(1)
+ } finally { wrapper.unmount(); get.mockRestore() }
+})
+async function open(action: DispatchAction, allowed = true) {
+ vi.mocked(api.getDispatch).mockResolvedValue(detail({ actions: { [action]: { allowed, blockCode: null, blockReason: allowed ? null : '前置审核未通过' } } }))
+ const wrapper = mount(DispatchWorkflowDialog, { props: { modelValue: true, dispatchNo: 'PC/1', action }, global: { plugins: [ElementPlus] } }); await flushPromises()
+ return { wrapper, state: wrapper.vm as unknown as State }
+}
+beforeEach(() => { vi.clearAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID(); vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} }); vi.mocked(api.getDispatchLoading).mockResolvedValue(loadingPreview()) })
+it('keeps order allocation references out of actual measurements and submits native version zero only after real input', async () => {
+ const value = loadingPreview(); value.pallets[0]!.weightKg = 100; value.pallets[0]!.volumeCbm = 2
+ vi.mocked(api.getDispatchLoading).mockResolvedValue(value)
+ const { wrapper, state } = await open('LOADING_COMPLETE')
+ expect(state.measurements[0]).toMatchObject({ weightKg: null, volumeCbm: null })
+ await state.submit(); expect(api.completeDispatchLoading).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('真实托位')
+ state.measurements[0]!.weightKg = 92; state.measurements[0]!.volumeCbm = 1.5
+ vi.mocked(api.completeDispatchLoading).mockImplementation(async (_, body) => command('LOADING_COMPLETE', body.idempotencyKey))
+ vi.mocked(api.getDispatch).mockResolvedValue(detail({ stage: 'AFTER_LOADING', recordVersion: 1 }))
+ await state.submit()
+ expect(api.completeDispatchLoading).toHaveBeenCalledWith('PC/1', expect.objectContaining({ recordVersion: 0, manifestHash: 'manifest', measurements: [{ warehousePalletId: '21', palletSpaces: 1, weightKg: 92, volumeCbm: 1.5, deliveryIndex: 1 }] }))
+ expect(api.departDispatch).not.toHaveBeenCalled(); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+})
+it('accepts actual evidence and a matching confirmed manifest while refusing an unknown unloading index', async () => {
+ const value = loadingPreview(); value.pallets[0]!.weightKg = 92; value.pallets[0]!.volumeCbm = 1.5; value.pallets[0]!.deliveryIndex = null
+ value.pallets[0]!.evidence.push({ field: 'weightKg', actual: true, value: 92, sourceType: 'MEASURED', sourceBusinessNo: 'PALLET-1', observedAt: null })
+ value.confirmedLoad = { manifestHash: 'manifest', operatorId: 'operator', confirmedAt: '2026-10-19T00:00:00Z', pallets: [{ warehousePalletId: '21', palletSpaces: 1, weightKg: 92, volumeCbm: 1.5, deliveryIndex: 1 }] }
+ vi.mocked(api.getDispatchLoading).mockResolvedValue(value)
+ const { wrapper, state } = await open('LOADING_COMPLETE'); expect(state.measurements[0]).toMatchObject({ weightKg: 92, volumeCbm: 1.5, deliveryIndex: null })
+ await state.submit(); expect(api.completeDispatchLoading).not.toHaveBeenCalled(); wrapper.unmount()
+})
+it('requires a rejection reason and retains the full original command after an unknown review result', async () => {
+ const { wrapper, state } = await open('DISPATCH_REVIEW'); state.form.decision = 'REJECTED'
+ await state.submit(); expect(api.reviewDispatch).not.toHaveBeenCalled()
+ state.form.reason = '预约未核实'; vi.mocked(api.reviewDispatch).mockRejectedValue(new Error('unknown result'))
+ await state.submit(); state.form.reason = 'later changed'
+ vi.mocked(api.getDispatchCommand).mockImplementation(async (_, key) => command('DISPATCH_REVIEW', key))
+ vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
+ await state.submit(); expect(api.reviewDispatch).toHaveBeenCalledTimes(1)
+ expect(vi.mocked(api.reviewDispatch).mock.calls[0]![1]).toMatchObject({ recordVersion: 0, decision: 'REJECTED', reason: '预约未核实' })
+ expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+})
+it('blocks an action without a literal service allowance', async () => {
+ const { wrapper, state } = await open('DEPART', false); await state.submit(); expect(api.departDispatch).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('前置审核未通过'); wrapper.unmount()
+})
+it('submits every customer destination group in one arrangement and does not waive another customer fee', async () => {
+ const previews: PreviewGroup[] = ['A', 'B'].map(customerId => ({ groupKey: `group-${customerId}`, customerId, customerName: `客户${customerId}`, destination: destination(), groupCargoHash: `cargo-${customerId}`, cargo: [{ customerId, sourceKey: `source-${customerId}`, inboundCode: `IN-${customerId}`, orderNo: `LM-${customerId}`, packages: 2 } as CargoLine], externalFreightHash: `external-${customerId}`, externalQuotes: customerId === 'A' ? [{ customerId: 'A', groupKey: 'group-A', bookingNo: 'BOOK-A', inboundCode: 'IN-A', currency: 'USD', amount: 100, sourceHash: 'quote-A' }] : [], feeCoverageCargoHash: `coverage-${customerId}`, feeSources: [], requiredServices: ['DELIVERY_FEE'], blockReasons: [] }))
+ vi.mocked(api.getDispatchArrangement).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'AFTER_LOADING', cargoHash: 'whole-cargo', loadingCompletionHash: 'load-hash', arrange: { allowed: true, blockCode: null, blockReason: null }, groups: previews, arrangement: null })
+ const { wrapper, state } = await open('ARRANGE_DELIVERY')
+ const groups = (wrapper.vm as unknown as { groups: ArrangeGroup[] }).groups
+ groups.forEach(group => Object.assign(group, { plannedDeliveryAt: '2026-10-20T00:00:00Z', deliveryMethod: 'TRUCK_PALLET', pickupMethod: 'ONE_PICKUP_MULTI_DROP', loadingType: 'PALLET' }))
+ await state.submit(); expect(api.transferDispatchToDelivery).not.toHaveBeenCalled()
+ groups[1]!.fees.find(fee => fee.feeType === 'DELIVERY_FEE')!.amount = 77
+ vi.mocked(api.transferDispatchToDelivery).mockImplementation(async (_, body): Promise => ({ ...command('ARRANGE_DELIVERY', body.idempotencyKey), action: 'ARRANGE_DELIVERY', result: { dispatchNo: 'PC/1', recordVersion: 1, arrangementKey: 'arrangement', cargoHash: 'whole-cargo', arrangedAt: '2026-10-19T00:00:00Z', outbounds: [], deliveries: [] } }))
+ vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1, stage: 'AFTER_LOADING' })); await state.submit()
+ const sent = vi.mocked(api.transferDispatchToDelivery).mock.calls[0]![1]
+ expect(sent).toMatchObject({ recordVersion: 0, cargoHash: 'whole-cargo', loadingCompletionHash: 'load-hash' })
+ expect(sent.groups).toHaveLength(2); expect(sent.groups[0]!.fees).toEqual([]); expect(sent.groups[1]!.fees).toEqual([expect.objectContaining({ feeType: 'DELIVERY_FEE', amount: 77 })])
+ expect(api.getDispatchArrangement).toHaveBeenCalledTimes(1); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+})
+it('does not reuse another dispatch detail when the target changes while its dialog remains open', async () => {
+ const { wrapper, state } = await open('DEPART')
+ let resolve!: (value: DispatchDetail) => void
+ vi.mocked(api.getDispatch).mockImplementationOnce(() => new Promise(done => { resolve = done }))
+ await wrapper.setProps({ dispatchNo: 'PC/2' }); await state.submit(); expect(api.departDispatch).not.toHaveBeenCalled()
+ resolve(detail({ dispatchNo: 'PC/2', actions: { DEPART: { allowed: false, blockCode: 'NOT_READY', blockReason: '另一车尚未就绪' } } })); await flushPromises()
+ await state.submit(); expect(api.departDispatch).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('另一车尚未就绪'); wrapper.unmount()
+})
+it('removes only the authoritative unpicked item using its item ID as path identity and retains that original target on recovery', async () => {
+ const source = candidate()
+ vi.mocked(api.getDispatchItems).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...source.selection, dispatchItemId: '9007199254740993', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: 2, pickedPackages: 0, remove: { allowed: true, blockCode: null, blockReason: null } }] })
+ const { wrapper, state } = await open('REMOVE_CARGO'); const target = wrapper.vm as unknown as { itemId: string }; target.itemId = '9007199254740993'
+ await state.submit(); expect(api.removeDispatchItem).not.toHaveBeenCalled()
+ state.form.reason = '本车计划调整'; vi.mocked(api.removeDispatchItem).mockRejectedValueOnce(new Error('unknown')); await state.submit()
+ target.itemId = 'another-item'; state.form.reason = 'later changed'
+ vi.mocked(api.getDispatchCommand).mockImplementation(async (_, key) => command('REMOVE_CARGO', key)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
+ await state.submit(); expect(api.removeDispatchItem).toHaveBeenCalledExactlyOnceWith('PC/1', '9007199254740993', expect.objectContaining({ recordVersion: 0, reason: '本车计划调整' })); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+})
+it('preserves external destinations and retries route EDIT through its original route endpoint instead of a resource update', async () => {
+ const toast = vi.spyOn(ElMessage, 'success')
+ vi.mocked(api.getDispatchRoute).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, edit: { allowed: true, blockCode: null, blockReason: null }, stops: [{ index: 0, name: '起运仓', address: '实际起点', destinationKey: null }, { index: 1, name: 'ONT8', address: '实际地址A', destinationKey: 'CODE:ONT8' }, { index: 2, name: '外接卸货点', address: '实际地址B', destinationKey: 'PRIVATE:actual' }] })
+ const { wrapper, state } = await open('EDIT'); await wrapper.setProps({ operation: 'ROUTE' }); await flushPromises()
+ const routeState = wrapper.vm as unknown as { moveStop(index: number, offset: number): void }; routeState.moveStop(1, -1); state.form.reason = '按本车现场顺序卸货'
+ vi.mocked(api.reorderDispatchRoute).mockRejectedValueOnce(new Error('unknown route')).mockImplementationOnce(async (_, body) => command('EDIT', body.idempotencyKey))
+ await state.submit(); vi.mocked(api.getDispatchCommand).mockRejectedValueOnce(new ApiResponseError('not found', 'HTTP_404'))
+ vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 })); await state.submit()
+ const first = vi.mocked(api.reorderDispatchRoute).mock.calls[0]![1]
+ expect(first).toMatchObject({ recordVersion: 0, destinationKeys: ['PRIVATE:actual', 'CODE:ONT8'], reason: '按本车现场顺序卸货' }); expect(api.reorderDispatchRoute).toHaveBeenNthCalledWith(2, 'PC/1', first); expect(api.updateDispatch).not.toHaveBeenCalled(); expect(toast).toHaveBeenLastCalledWith('卸货顺序调整已确认，请重新核对两级审核'); toast.mockRestore(); wrapper.unmount()
+})
+it('refuses already picked item removal and a route that drops an authoritative destination', async () => {
+ const source = candidate()
+ vi.mocked(api.getDispatchItems).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...source.selection, dispatchItemId: 'item-picked', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: 2, pickedPackages: 1, remove: { allowed: false, blockCode: 'PICKED', blockReason: '本来源已经真实扫码' } }] })
+ const removed = await open('REMOVE_CARGO'); (removed.wrapper.vm as unknown as { itemId: string }).itemId = 'item-picked'; removed.state.form.reason = '调整'; await removed.state.submit(); expect(api.removeDispatchItem).not.toHaveBeenCalled(); expect(removed.wrapper.text()).toContain('已经真实扫码'); removed.wrapper.unmount()
+ vi.mocked(api.getDispatchRoute).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, edit: { allowed: true, blockCode: null, blockReason: null }, stops: [{ index: 0, name: '起运仓', address: null, destinationKey: null }, { index: 1, name: 'ONT8', address: null, destinationKey: 'CODE:ONT8' }, { index: 2, name: '外接点', address: null, destinationKey: 'EXTERNAL:destination' }] })
+ const route = await open('EDIT'); await route.wrapper.setProps({ operation: 'ROUTE' }); await flushPromises(); (route.wrapper.vm as unknown as { stops: unknown[] }).stops.pop(); route.state.form.reason = '调整'; await route.state.submit(); expect(api.reorderDispatchRoute).not.toHaveBeenCalled(); expect(route.wrapper.text()).toContain('完整保留'); route.wrapper.unmount()
+})
diff --git a/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.vue b/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.vue
new file mode 100644
index 00000000..307739b2
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.vue
@@ -0,0 +1,216 @@
+
+
+
+ 按明确驳回结果重新核对
+
+ 移除此项 {{ row.remove.blockReason || '可移除' }} 审核通过 驳回 查询 {{ row.destination.warehouseCode || row.destination.address || '—' }} {{ row.deliveryIndex ?? '尚未匹配，请调度核对' }}
+
+
+
diff --git a/src/modules/overseas-warehouse/components/SmartDispatchDialog.test.ts b/src/modules/overseas-warehouse/components/SmartDispatchDialog.test.ts
index 37874b72..f0adfbe6 100644
--- a/src/modules/overseas-warehouse/components/SmartDispatchDialog.test.ts
+++ b/src/modules/overseas-warehouse/components/SmartDispatchDialog.test.ts
@@ -1,338 +1,107 @@
-import { flushPromises, shallowMount } from '@vue/test-utils'
-import { defineComponent, h } from 'vue'
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
import { beforeEach, expect, it, vi } from 'vitest'
-import { ElMessage, ElMessageBox } from 'element-plus'
import SmartDispatchDialog from './SmartDispatchDialog.vue'
-import { listDispatchCandidates, listDispatchDrafts, preArrangeDispatch, preArrangeDraftDispatch, lockDispatchDraftPallet, unlockDispatchDraftPallet, releaseDispatchDraft, deleteDispatchDraftContainer, type DispatchPalletCandidateDto, type DispatchDraftDto } from '../api/dispatches'
-
-vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
-vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn(), error: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
-vi.mock('../api/dispatches', () => ({
- listDispatchCandidates: vi.fn(), listDispatchDrafts: vi.fn(), preArrangeDispatch: vi.fn(), preArrangeDraftDispatch: vi.fn(),
- createDispatchDraftContainer: vi.fn(), deleteDispatchDraftContainer: vi.fn(),
- lockDispatchDraftPallet: vi.fn(), unlockDispatchDraftPallet: vi.fn(),
- releaseDispatchDraft: vi.fn(),
-}))
-
-const shell = defineComponent({ setup(_, { slots }) { return () => h('section', [slots.default?.(), slots.footer?.()]) } })
-const button = defineComponent({ props: { disabled: Boolean }, emits: ['click'], setup(props, { slots, emit }) {
- return () => h('button', { disabled: props.disabled, onClick: () => emit('click') }, slots.default?.())
-} })
-const retry = defineComponent({ emits: ['retry'], setup(_, { emit }) {
- return () => h('button', { 'data-test': 'retry', onClick: () => emit('retry') }, '重试加载')
-} })
-const plan: DispatchPalletCandidateDto = { orderId: '1', orderNo: 'LM-A', planPalletId: '11', sourceType: 'INBOUND_PLAN',
- warehousePalletId: '101', overseasWarehouseId: '92', customerId: 'A', palletNo: 'PAL-A', packageCount: 2, sourceStage: 'RECEIVED' }
-const returned: DispatchPalletCandidateDto = { orderId: '2', orderNo: 'LM-B', returnReceiptId: '22', returnReceiptNo: 'RSR-B', sourceType: 'RETURN_RECEIPT',
- warehousePalletId: '102', overseasWarehouseId: '92', customerId: 'A', palletNo: 'PAL-B', packageCount: 2, sourceStage: 'RECEIVED' }
-
-beforeEach(() => vi.resetAllMocks())
-
-function mountDraft() {
- return shallowMount(SmartDispatchDialog, { props: { modelValue: true, orders: [] }, global: {
- stubs: { AppDialog: shell, ElButton: button, LoadErrorState: retry, ElDialog: true,
- ElInput: true, ElOption: true, ElSelect: true, ElTable: true, ElTableColumn: true,
- ElTag: shell, ElDropdown: true, ElDropdownMenu: true, ElDropdownItem: true,
- ElEmpty: true, ElRadio: true, ElRadioGroup: true },
- } })
-}
-const secondPlan = { ...plan, orderId: '3', orderNo: 'LM-C', planPalletId: '13', warehousePalletId: '103', palletNo: 'PAL-C' }
-const thirdPlan = { ...plan, orderId: '4', orderNo: 'LM-D', planPalletId: '14', warehousePalletId: '104', palletNo: 'PAL-D' }
-const twoGroups: DispatchDraftDto = { draftToken: 'original-draft', containers: [
- { id: 'container-1', capacity: 30, palletIds: ['11', '13'] },
- { id: 'container-2', capacity: 30, palletIds: ['14', 'RETURN:22'] },
- { id: 'empty-container', capacity: 15, palletIds: [] },
-] }
-const expectedBatch = { draftToken: 'original-draft', groups: [
- { draftContainerId: 'container-1', planPalletIds: ['11', '13'], returnReceiptIds: [] },
- { draftContainerId: 'container-2', planPalletIds: ['14'], returnReceiptIds: ['22'] },
-] }
-const goodResult = [{ draftContainerId: 'container-2', dispatch: { id: '102', dispatchNo: 'DS-2', appointmentBatches: [] } },
- { draftContainerId: 'container-1', dispatch: { id: '101', dispatchNo: 'DS-1', appointmentBatches: [] } }]
-async function submitDraft(wrapper: ReturnType) {
- await wrapper.findAll('button').find(node => node.text() === '预排车')!.trigger('click')
- await flushPromises()
-}
-
-it('keeps two explicit groups in one atomic request, omits empty containers and accepts reordered matching results', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue(goodResult)
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).toHaveBeenCalledExactlyOnceWith(expectedBatch)
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(wrapper.emitted('created')).toHaveLength(1)
- expect(wrapper.emitted('update:modelValue')).toEqual([[false]])
- wrapper.unmount()
+import AppDialog from '@/shared/components/AppDialog.vue'
+import { listAllPlatformWarehouses } from '@/modules/warehouses'
+import * as api from '../api/dispatches'
+import { candidate, command, detail } from '../dispatchTestFixtures'
+import type { ConvertDraft, DispatchDraft, Version } from '../dispatchContracts'
+import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
+const identity = vi.hoisted(() => ({ id: 'smart-operator' }))
+const push = vi.hoisted(() => vi.fn())
+vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push }) }))
+vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
+vi.mock('./DispatchResourceFields.vue', () => ({ default: { template: '' } }))
+vi.mock('../api/dispatches', () => ({ listDispatchDrafts: vi.fn(), listDispatchCandidates: vi.fn(), createDispatchDraft: vi.fn(), createDispatchDraftContainer: vi.fn(), lockDispatchDraftPallet: vi.fn(), unlockDispatchDraftPallet: vi.fn(), deleteDispatchDraftContainer: vi.fn(), releaseDispatchDraft: vi.fn(), convertDispatchDraft: vi.fn(), createDispatch: vi.fn(), getDispatch: vi.fn(), getDispatchCommand: vi.fn() }))
+const source = () => candidate(), draft = (): DispatchDraft => ({ draftToken: 'server-token', recordVersion: 0, status: 'ACTIVE', warehouseId: '321', containers: [{ draftContainerId: '100000000000000001', sequenceNo: 1, capacity: 30, sourceKeys: ['source-1'] }], sources: [source()], expiresAt: '2026-12-01T00:00:00Z' })
+const options = { props: { modelValue: true, orders: [] }, global: { plugins: [ElementPlus] } }
+beforeEach(() => { vi.clearAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID(); vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} }); vi.mocked(listAllPlatformWarehouses).mockResolvedValue([{ id: '321', warehouseName: '洛杉矶仓' }] as Awaited>); vi.mocked(api.listDispatchDrafts).mockResolvedValue([draft()]); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [source()], complete: true, snapshotAt: '2026-10-19T00:00:00Z' }); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 })) })
+it.each([0, '0', '9007199254740993'])('transmits original authoritative batch version %s in complete draft conversion and exact retries', async recordVersion => {
+ const original = draft()
+ original.sources[0]!.appointmentBatches = [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'C1', recordVersion, sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2 }] }]
+ vi.mocked(api.listDispatchDrafts).mockResolvedValue([original])
+ vi.mocked(api.convertDispatchDraft).mockRejectedValueOnce(new Error('unknown')).mockImplementationOnce(async request => ({ draftToken: request.draftToken, replayed: true, vehicles: request.groups.map(group => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey) })) }))
+ const wrapper = mount(SmartDispatchDialog, options)
+ try {
+ await flushPromises(); const state = wrapper.vm as unknown as { restoreDraft(token: string): void; submit(): Promise }
+ state.restoreDraft('server-token'); await flushPromises(); await state.submit()
+ const request = JSON.parse(JSON.stringify(vi.mocked(api.convertDispatchDraft).mock.calls[0]![0])) as ConvertDraft
+ expect(request.groups[0]!.dispatch.batchAllocations).toEqual([{ planPalletId: '11', batchKey: 'FBA_APPOINTMENT:1', customerId: 'C1', sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2, recordVersion }])
+ original.sources[0]!.appointmentBatches[0]!.recordVersion = '9007199254740994'
+ await state.submit(); expect(api.convertDispatchDraft).toHaveBeenNthCalledWith(2, request)
+ } finally { wrapper.unmount() }
})
-
-it.each([
- ['one collapsed result', goodResult.slice(0, 1)],
- ['foreign container', [{ ...goodResult[0], draftContainerId: 'foreign' }, goodResult[1]]],
- ['duplicate container', [goodResult[0], goodResult[0]]],
- ['duplicate dispatch', [goodResult[0], { ...goodResult[1], dispatch: goodResult[0].dispatch }]],
- ['missing business number', [goodResult[0], { ...goodResult[1], dispatch: { id: '101', dispatchNo: '', appointmentBatches: [] } }]],
-])('retains the original groups and token after %s', async (_label, result) => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue(result)
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(wrapper.emitted('created')).toBeUndefined()
- expect(wrapper.emitted('update:modelValue')).toBeUndefined()
- expect(wrapper.text()).toContain('托盘 4 · 箱数 8')
- await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).toHaveBeenNthCalledWith(2, expectedBatch)
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- wrapper.unmount()
+it.each([undefined, null, 'bad', 9007199254740992])('requires rereading a restored candidate with missing or invalid batch version %s', async recordVersion => {
+ const original = draft()
+ original.sources[0]!.appointmentBatches = [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'C1', recordVersion: recordVersion as Version, sources: [] }]
+ vi.mocked(api.listDispatchDrafts).mockResolvedValue([original])
+ const wrapper = mount(SmartDispatchDialog, options)
+ try {
+ await flushPromises(); const state = wrapper.vm as unknown as { restoreDraft(token: string): void; submit(): Promise }
+ state.restoreDraft('server-token'); await flushPromises(); await state.submit()
+ expect(api.convertDispatchDraft).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('预约批次版本缺失或无效，请重新读取候选')
+ } finally { wrapper.unmount() }
})
-
-it('retains all groups on batch rejection without issuing a flat request', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- vi.mocked(preArrangeDraftDispatch).mockRejectedValue(new Error('草稿来源已变化'))
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).toHaveBeenCalledTimes(1)
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(wrapper.emitted('created')).toBeUndefined()
- expect(wrapper.text()).toContain('托盘 4 · 箱数 8')
- wrapper.unmount()
+it('requires an explicit warehouse and allows saving a true empty dispatch with no fake cargo', async () => {
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
+ const state = wrapper.vm as unknown as { mode: string; warehouseId: string; submit: () => Promise }
+ state.mode = 'empty'; await wrapper.getComponent(AppDialog).vm.$emit('confirm'); await flushPromises(); expect(api.createDispatch).not.toHaveBeenCalled()
+ state.warehouseId = '321'; vi.mocked(api.createDispatch).mockImplementation(async body => command('CREATE', body.idempotencyKey))
+ await state.submit(); await flushPromises()
+ expect(api.createDispatch).toHaveBeenCalledWith(expect.objectContaining({ warehouseId: '321', cargo: [], vehicle: null, driver: null }))
+ expect(wrapper.emitted('created')).toHaveLength(1); wrapper.unmount()
})
-
-it('does not submit a physical pallet fallback when its actual plan source identity is missing', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'original-draft', containers: [
- { id: 'container', capacity: 30, palletIds: ['101'] },
- ] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([{ ...plan, planPalletId: undefined }])
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(ElMessage.warning).toHaveBeenCalledWith(expect.stringContaining('来源标识缺失'))
- expect(wrapper.emitted('update:modelValue')).toBeUndefined()
- wrapper.unmount()
+it('restores an explicit draft and submits complete server source versions in each container', async () => {
+ const original = draft(); original.sources.push(candidate({ sourceKey: 'source-B', customerId: 'B', customerName: '客户乙' })); original.containers[0]!.sourceKeys.push('source-B')
+ vi.mocked(api.listDispatchDrafts).mockResolvedValue([original])
+ vi.mocked(api.convertDispatchDraft).mockImplementation(async request => ({ draftToken: request.draftToken, replayed: false, vehicles: request.groups.map(group => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey, 'PC/1') })) }))
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises(); const state = wrapper.vm as unknown as { restoreDraft: (token: string) => void; submit: () => Promise }
+ state.restoreDraft('server-token'); await flushPromises(); await state.submit(); await flushPromises()
+ expect(api.convertDispatchDraft).toHaveBeenCalledWith(expect.objectContaining({ recordVersion: 0, draftToken: 'server-token', groups: [expect.objectContaining({ draftContainerId: '100000000000000001', dispatch: expect.objectContaining({ cargo: [source().selection, source().selection] }) })] }))
+ expect(wrapper.emitted('created')).toHaveLength(1); wrapper.unmount()
})
-
-it('submits relabel physical pallet identity without requiring an inbound plan pallet', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'relabel-draft', containers: [
- { id: 'container', capacity: 30, palletIds: ['101'] },
- ] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([{ ...plan, planPalletId: null, sourceStage: 'RELABEL', orderRefs: 'RL-1' }])
- vi.mocked(preArrangeDispatch).mockResolvedValue({ id: '1', dispatchNo: 'DS-1', appointmentBatches: [] })
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDispatch).toHaveBeenCalledExactlyOnceWith({ planPalletIds: ['101'], returnReceiptIds: [], relabelNo: 'RL-1' })
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(wrapper.emitted('created')).toHaveLength(1)
- wrapper.unmount()
+it('retains conversion payload and key after an unknown result instead of rebuilding from fresh versions', async () => {
+ vi.mocked(api.convertDispatchDraft).mockRejectedValueOnce(new Error('network unknown')).mockImplementationOnce(async request => ({ draftToken: request.draftToken, replayed: true, vehicles: request.groups.map(group => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey) })) }))
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises(); const state = wrapper.vm as unknown as { restoreDraft: (token: string) => void; submit: () => Promise }
+ state.restoreDraft('server-token'); await flushPromises(); await state.submit(); await state.submit()
+ expect(api.convertDispatchDraft).toHaveBeenCalledTimes(2); expect(vi.mocked(api.convertDispatchDraft).mock.calls[1]![0]).toEqual(vi.mocked(api.convertDispatchDraft).mock.calls[0]![0]); wrapper.unmount()
})
-
-it('does not send a second batch while the original command is pending', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- let resolveCommand!: (result: typeof goodResult) => void
- vi.mocked(preArrangeDraftDispatch).mockReturnValue(new Promise(resolve => { resolveCommand = resolve }))
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper); await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).toHaveBeenCalledExactlyOnceWith(expectedBatch)
- expect(wrapper.emitted('created')).toBeUndefined()
- resolveCommand(goodResult); await flushPromises()
- expect(wrapper.emitted('created')).toHaveLength(1)
- wrapper.unmount()
+it('does not discard draft selections when recovery fails and never submits an incomplete source list', async () => {
+ vi.mocked(api.listDispatchDrafts).mockRejectedValue(new Error('draft unavailable'))
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises(); expect(wrapper.text()).toContain('排车候选或草稿恢复失败'); expect(api.convertDispatchDraft).not.toHaveBeenCalled(); wrapper.unmount()
})
-
-it('keeps group membership frozen while the submitted batch is awaiting its response', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- let resolveCommand!: (result: typeof goodResult) => void
- vi.mocked(preArrangeDraftDispatch).mockReturnValue(new Promise(resolve => { resolveCommand = resolve }))
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- await wrapper.findAll('button').find(node => node.text() === '移除')!.trigger('click')
- await wrapper.findAll('button').find(node => node.attributes('aria-label') === '删除装车车型1')!.trigger('click')
- await flushPromises()
- expect(unlockDispatchDraftPallet).not.toHaveBeenCalled()
- expect(deleteDispatchDraftContainer).not.toHaveBeenCalled()
- expect(wrapper.text()).toContain('托盘 4 · 箱数 8')
- resolveCommand(goodResult); await flushPromises()
- expect(wrapper.emitted('created')).toHaveLength(1)
- wrapper.unmount()
+it('refuses an incomplete candidate page without pretending its filtered rows are all available cargo', async () => {
+ vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [], complete: false, snapshotAt: '' })
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises(); const state = wrapper.vm as unknown as { restoreDraft: (token: string) => void }; state.restoreDraft('server-token'); await flushPromises(); expect(wrapper.text()).toContain('尚未完整返回'); wrapper.unmount()
})
-
-it('retains unresolved sources when retry hydration still cannot recover the complete original draft', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, returned])
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(ElMessage.warning).toHaveBeenCalledWith(expect.stringContaining('原选择已保留'))
- expect(wrapper.emitted('update:modelValue')).toBeUndefined()
- wrapper.unmount()
+it('keeps vehicle assignments independent between containers and reuses a proven conversion after a detail read fails', async () => {
+ const original = draft(); original.containers.push({ draftContainerId: 'container-B', sequenceNo: 2, capacity: 15, sourceKeys: ['source-B'] }); original.sources.push(candidate({ sourceKey: 'source-B', customerId: 'B' }))
+ vi.mocked(api.listDispatchDrafts).mockResolvedValue([original])
+ vi.mocked(api.convertDispatchDraft).mockImplementation(async request => ({ draftToken: request.draftToken, replayed: false, vehicles: request.groups.map((group, index) => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey, `PC/${index + 1}`) })) }))
+ vi.mocked(api.getDispatch).mockRejectedValueOnce(new Error('detail unavailable')).mockImplementation(async no => detail({ dispatchNo: no, recordVersion: 1 }))
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
+ const state = wrapper.vm as unknown as { restoreDraft(token: string): void; submit(): Promise; activeContainerId: string; vehicle: { vehicleId: string | null }; form: { remark: string } }
+ state.restoreDraft('server-token'); await flushPromises(); state.vehicle.vehicleId = 'vehicle-A'; state.form.remark = '车甲'
+ state.activeContainerId = 'container-B'; state.vehicle.vehicleId = 'vehicle-B'; state.form.remark = '车乙'
+ await state.submit(); expect(wrapper.emitted('created')).toBeUndefined()
+ await state.submit(); expect(api.convertDispatchDraft).toHaveBeenCalledTimes(1)
+ const groups = vi.mocked(api.convertDispatchDraft).mock.calls[0]![0].groups
+ expect(groups.map(group => [group.dispatch.vehicle?.vehicleId, group.dispatch.remark])).toEqual([['vehicle-A', '车甲'], ['vehicle-B', '车乙']])
+ expect(wrapper.emitted('created')).toHaveLength(1); wrapper.unmount()
})
-
-it.each([
- { ...twoGroups, containers: [{ id: 'c1', capacity: 30, palletIds: ['11'] }, { id: 'c2', capacity: 30, palletIds: ['11'] }] },
- { ...twoGroups, containers: [{ id: 'c1', capacity: 30, palletIds: ['11'] }, { id: 'c1', capacity: 30, palletIds: ['13'] }] },
- { ...twoGroups, containers: [{ id: '', capacity: 30, palletIds: ['11'] }] },
-])('rejects duplicate sources or invalid container identities before writing', async draft => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([draft])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan])
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(wrapper.emitted('update:modelValue')).toBeUndefined()
- wrapper.unmount()
+it('never sends an existing departure command through the empty creation transport', async () => {
+ useDispatchCommandRecovery(() => identity.id).begin('PC/1', 'DEPART', { recordVersion: 0, idempotencyKey: 'original-key' })
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
+ await (wrapper.vm as unknown as { submit(): Promise }).submit()
+ expect(api.createDispatch).not.toHaveBeenCalled(); expect(api.convertDispatchDraft).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('从列表的原请求恢复入口'); wrapper.unmount()
})
-
-it('rejects a relabel order split across multiple containers before either API command', async () => {
- const relabel: DispatchPalletCandidateDto = { ...plan, sourceStage: 'RELABEL', orderRefs: 'RL-1' }
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'original-draft', containers: [
- { id: 'c1', capacity: 30, palletIds: ['101'] }, { id: 'c2', capacity: 30, palletIds: ['103'] },
- ] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([relabel, { ...secondPlan, sourceStage: 'RELABEL', orderRefs: 'RL-1' }])
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(ElMessage.warning).toHaveBeenCalledWith(expect.stringContaining('一组排车'))
- expect(wrapper.emitted('update:modelValue')).toBeUndefined()
- wrapper.unmount()
-})
-
-it('keeps one complete relabel order on the single-dispatch endpoint', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'original-draft', containers: [
- { id: 'c1', capacity: 30, palletIds: ['101', '103'] },
- ] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan].map(p => ({ ...p, sourceStage: 'RELABEL', orderRefs: 'RL-1' })))
- vi.mocked(preArrangeDispatch).mockResolvedValue({ id: '1', dispatchNo: 'DS-RL', appointmentBatches: [] })
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(preArrangeDispatch).toHaveBeenCalledExactlyOnceWith({ planPalletIds: ['101', '103'], returnReceiptIds: [], relabelNo: 'RL-1' })
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(wrapper.emitted('created')).toHaveLength(1)
- wrapper.unmount()
-})
-
-it('retains every restored selection on candidate failure and submits both sources only after retry hydration', async () => {
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue([{ draftContainerId: 'container', dispatch: { id: '1', dispatchNo: 'DS-1', appointmentBatches: [] } }])
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'original-draft', containers: [{ id: 'container', capacity: 30, palletIds: ['11', 'RETURN:22'] }] }])
- vi.mocked(listDispatchCandidates)
- .mockResolvedValueOnce([plan])
- .mockRejectedValueOnce(new Error('恢复来源失败'))
- .mockResolvedValueOnce([plan])
- .mockResolvedValueOnce([plan, returned])
- const wrapper = shallowMount(SmartDispatchDialog, { props: { modelValue: true, orders: [] }, global: {
- stubs: { AppDialog: shell, ElButton: button, LoadErrorState: retry, ElDialog: true,
- ElInput: true, ElOption: true, ElSelect: true, ElTable: true, ElTableColumn: true,
- ElTag: true, ElDropdown: true, ElDropdownMenu: true, ElDropdownItem: true,
- ElEmpty: true, ElRadio: true, ElRadioGroup: true },
- } })
- await flushPromises()
- const submit = () => wrapper.findAll('button').find(node => node.text() === '预排车')!
- await submit().trigger('click')
- await flushPromises()
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(ElMessage.warning).toHaveBeenCalledWith(expect.stringContaining('原选择已保留'))
- expect(wrapper.emitted('update:modelValue')).toBeUndefined()
- await wrapper.get('[data-test="retry"]').trigger('click')
- await flushPromises()
- await submit().trigger('click')
- await flushPromises()
- expect(preArrangeDraftDispatch).toHaveBeenCalledExactlyOnceWith({ draftToken: 'original-draft', groups: [{ draftContainerId: 'container', planPalletIds: ['11'], returnReceiptIds: ['22'] }] })
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(listDispatchCandidates).toHaveBeenLastCalledWith({ draftToken: 'original-draft' })
- expect(wrapper.emitted('created')).toHaveLength(1)
- wrapper.unmount()
-})
-
-it('shows a draft recovery error and only loads candidates after a successful retry with the original token', async () => {
- vi.mocked(listDispatchDrafts).mockRejectedValueOnce(new Error('草稿查询超时')).mockResolvedValueOnce([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue(goodResult)
- const wrapper = mountDraft(); await flushPromises()
- expect(wrapper.get('[data-test="retry"]').attributes('title')).toBe('排车草稿恢复失败')
- expect(listDispatchCandidates).not.toHaveBeenCalled()
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- await wrapper.get('[data-test="retry"]').trigger('click'); await flushPromises()
- expect(wrapper.text()).toContain('托盘 4 · 箱数 8')
- await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).toHaveBeenCalledExactlyOnceWith(expectedBatch)
- wrapper.unmount()
-})
-
-it('keeps local relabel choices on close and reopen while describing their actual unlocked state', async () => {
- const relabel: DispatchPalletCandidateDto = { ...plan, sourceStage: 'RELABEL', orderRefs: 'RL-1' }
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'local-relabel', containers: [{ id: 'c1', capacity: 30, palletIds: [] }] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([relabel])
- const wrapper = mountDraft(); await flushPromises()
- wrapper.getComponent({ name: 'ElDropdown' }).vm.$emit('command', 'c1'); await flushPromises()
- expect(lockDispatchDraftPallet).not.toHaveBeenCalled()
- expect(wrapper.text()).toContain('已选择，尚未锁定')
- await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
- expect(wrapper.text()).toContain('托盘 1 · 箱数 2')
- expect(wrapper.text()).toContain('已选择，尚未锁定')
- expect(listDispatchDrafts).toHaveBeenCalledTimes(2)
- await wrapper.findAll('button').find(node => node.text() === '移除')!.trigger('click'); await flushPromises()
- expect(unlockDispatchDraftPallet).not.toHaveBeenCalled()
- expect(wrapper.text()).toContain('托盘 0 · 箱数 0')
- wrapper.unmount()
-})
-
-it.each(['RELABEL_APPLICATION', 'RETURN_RELABEL'])('rejects a partial %s application after refreshing its complete candidate set', async orderType => {
- const relabel = { ...plan, sourceStage: 'RELABEL' as const, orderRefs: 'RL-1', orderType }
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'local-relabel', containers: [{ id: 'c1', capacity: 30, palletIds: ['101'] }] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([relabel, { ...relabel, planPalletId: '13', warehousePalletId: '103' }])
- const wrapper = mountDraft(); await flushPromises(); await submitDraft(wrapper)
- expect(listDispatchCandidates).toHaveBeenLastCalledWith({ sourceStage: 'RELABEL', orderNo: 'RL-1', draftToken: 'local-relabel' })
- expect(preArrangeDispatch).not.toHaveBeenCalled()
- expect(preArrangeDraftDispatch).not.toHaveBeenCalled()
- expect(wrapper.getComponent({ name: 'OperationErrorToast' }).props('details')?.message).toContain('全部应排托盘')
- expect(wrapper.text()).toContain('托盘 1 · 箱数 2')
- expect(wrapper.emitted('created')).toBeUndefined()
- wrapper.unmount()
-})
-
-it('preserves all previous selections when reopening fails to read drafts, then recovers the same groups on retry', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValueOnce([twoGroups]).mockRejectedValueOnce(new Error('查询超时')).mockResolvedValueOnce([twoGroups])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- vi.mocked(preArrangeDraftDispatch).mockResolvedValue(goodResult)
- const wrapper = mountDraft(); await flushPromises()
- await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
- expect(wrapper.get('[data-test="retry"]').attributes('title')).toBe('排车草稿恢复失败')
- expect(listDispatchCandidates).toHaveBeenCalledTimes(1)
- expect(wrapper.findAll('button').find(button => button.text() === '预排车')!.attributes('disabled')).toBeDefined()
- await wrapper.get('[data-test="retry"]').trigger('click'); await flushPromises()
- expect(wrapper.text()).toContain('托盘 4 · 箱数 8')
- await submitDraft(wrapper)
- expect(preArrangeDraftDispatch).toHaveBeenCalledExactlyOnceWith(expectedBatch)
- wrapper.unmount()
-})
-
-it('requires explicit release to restart an expired draft and keeps choices when release fails', async () => {
- vi.mocked(listDispatchDrafts).mockResolvedValueOnce([twoGroups]).mockResolvedValue([])
- vi.mocked(listDispatchCandidates).mockResolvedValue([plan, secondPlan, thirdPlan, returned])
- vi.mocked(ElMessageBox.confirm).mockResolvedValue('confirm' as Awaited>)
- vi.mocked(releaseDispatchDraft).mockRejectedValueOnce(new Error('释放超时')).mockResolvedValueOnce(null)
- const wrapper = mountDraft(); await flushPromises()
- await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
- expect(wrapper.get('[data-test="retry"]').attributes('message')).toContain('原草稿已失效')
- expect(releaseDispatchDraft).not.toHaveBeenCalled()
- const restart = () => wrapper.findAll('button').find(button => button.text() === '释放草稿并重新选择')!
- await restart().trigger('click'); await flushPromises()
- expect(releaseDispatchDraft).toHaveBeenLastCalledWith('original-draft')
- expect(wrapper.get('[data-test="retry"]').attributes('message')).toContain('原选择已保留')
- await restart().trigger('click'); await flushPromises()
- expect(releaseDispatchDraft).toHaveBeenNthCalledWith(2, 'original-draft')
- expect(wrapper.find('[data-test="retry"]').exists()).toBe(false)
- expect(wrapper.text()).toContain('托盘 0 · 箱数 0')
- wrapper.unmount()
-})
-
-it.each([plan, returned])('does not claim a failed source lock succeeded for $sourceType', async candidate => {
- vi.mocked(listDispatchDrafts).mockResolvedValue([{ draftToken: 'lock-draft', containers: [{ id: 'c1', capacity: 30, palletIds: [] }] }])
- vi.mocked(listDispatchCandidates).mockResolvedValue([candidate])
- vi.mocked(lockDispatchDraftPallet).mockRejectedValueOnce({ isAxiosError: true, response: { status: 409, data: { code: 'A0409', message: '来源已被其他草稿锁定', requestId: 'lock-request', traceId: 'lock-trace' } } }).mockResolvedValueOnce(null)
- const wrapper = mountDraft(); await flushPromises()
- wrapper.getComponent({ name: 'ElDropdown' }).vm.$emit('command', 'c1'); await flushPromises()
- expect(wrapper.text()).toContain('托盘 0 · 箱数 0')
- expect(wrapper.getComponent({ name: 'OperationErrorToast' }).props('details')).toMatchObject({ message: '来源已被其他草稿锁定', requestId: 'lock-request', traceId: 'lock-trace' })
- wrapper.getComponent({ name: 'ElDropdown' }).vm.$emit('command', 'c1'); await flushPromises()
- expect(wrapper.text()).toContain('托盘 1 · 箱数 2')
- expect(wrapper.text()).toContain('已锁定')
- expect(lockDispatchDraftPallet).toHaveBeenLastCalledWith(candidate.sourceType === 'RETURN_RECEIPT' ? 'RETURN:22' : '11', 'lock-draft', 'c1')
- wrapper.unmount()
+it('rejects a restored source whose batch customer differs from its real cargo owner', async () => {
+ const original = draft(); original.sources[0]!.appointmentBatches = [{ batchKey: 'batch-1', batchNo: 'BATCH-1', recordVersion: 0, customerId: 'other-customer', sources: [{ sourceKey: 'source-1', destinationKey: 'CODE:ONT8', packageCount: 2 }] }]
+ vi.mocked(api.listDispatchDrafts).mockResolvedValue([original])
+ const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
+ const state = wrapper.vm as unknown as { restoreDraft(token: string): void; submit(): Promise }; state.restoreDraft('server-token'); await flushPromises(); await state.submit()
+ expect(api.convertDispatchDraft).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('预约客户不一致'); wrapper.unmount()
})
diff --git a/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue b/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue
index ad34824b..300670c3 100644
--- a/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue
+++ b/src/modules/overseas-warehouse/components/SmartDispatchDialog.vue
@@ -1,915 +1,185 @@
-
-
-
- 查询 重置
-
-
-
+ 按明确驳回结果重新核对
+ 先选货建单 先建空单后加货 新建草稿 添加装车组 释放本草稿
+ 查询
+ 加入本组 {{ ({ INBOUND_PLAN: '计划托盘', RETURN_RECEIPT: '退回实收', RELABEL: '换标' } as Record)[row.selection.sourceType] || '—' }}
{{ row.selection.relabelNo || row.planNo || '—' }} {{ [row.destination.warehouseCode || row.destination.address, row.destination.postalCode].filter(Boolean).join(' · ') || '—' }} {{ row.suggestedWeightKg ?? '—' }}kg／{{ row.suggestedVolumeCbm ?? '—' }}m³
仅供预排参考 {{ row.blockReasons.join('；') || '可排' }} 装车组 {{ container.sequenceNo }} · {{ container.capacity }}托位 移除本组
-
-
- {{ spec.label }} · 限重 {{ spec.maxWeightLb }}LB
-
- 取消 确定
-
-
diff --git a/src/modules/overseas-warehouse/dispatchCommandRecovery.test.ts b/src/modules/overseas-warehouse/dispatchCommandRecovery.test.ts
new file mode 100644
index 00000000..e4de207d
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchCommandRecovery.test.ts
@@ -0,0 +1,63 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import { ApiResponseError } from '@/shared/api/http'
+import { useDispatchCommandRecovery } from './dispatchCommandRecovery'
+import { command } from './dispatchTestFixtures'
+beforeEach(() => sessionStorage.clear())
+it('retains the exact original version and body when POST outcome is unknown and a newer detail was read', async () => {
+ const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
+ recovery.begin('PC/1', 'DEPART', { recordVersion: 0, idempotencyKey: 'key', remark: 'original' })
+ const send = vi.fn().mockRejectedValueOnce(new Error('network unknown')).mockResolvedValueOnce(command('DEPART'))
+ const read = vi.fn().mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 50 }), find = vi.fn().mockRejectedValue(new ApiResponseError('not found', 'HTTP_404'))
+ await expect(recovery.execute(send, read, find)).rejects.toThrow('network unknown')
+ await recovery.execute(send, read, find)
+ expect(send.mock.calls[1]![0].body).toEqual({ recordVersion: 0, idempotencyKey: 'key', remark: 'original' })
+ expect(recovery.pending.value).toBeNull()
+})
+it('keeps a proven result across GET failure and does not send the command a second time', async () => {
+ const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
+ recovery.begin('PC/1', 'LOADING_COMPLETE', { recordVersion: 0, idempotencyKey: 'key' })
+ const send = vi.fn().mockResolvedValue(command('LOADING_COMPLETE')), read = vi.fn().mockRejectedValueOnce(new Error('read failed')).mockResolvedValueOnce({ dispatchNo: 'PC/1', recordVersion: 1 }), find = vi.fn()
+ await expect(recovery.execute(send, read, find)).rejects.toThrow('read failed')
+ expect(recovery.pending.value?.result?.stage).toBe('AFTER_LOADING')
+ await recovery.execute(send, read, find)
+ expect(send).toHaveBeenCalledTimes(1); expect(find).not.toHaveBeenCalled()
+})
+it('shares one pending command between empty-create and workflow dialogs and refuses a new command', () => {
+ const owner = crypto.randomUUID(), first = useDispatchCommandRecovery(() => owner), second = useDispatchCommandRecovery(() => owner)
+ first.begin('PC/1', 'EDIT', { recordVersion: 0, idempotencyKey: 'key' })
+ expect(second.pending.value?.dispatchNo).toBe('PC/1')
+ expect(() => second.begin('', 'CREATE', { idempotencyKey: 'new' })).toThrow('原请求')
+})
+it('does not discard an earlier unknown write on a later business rejection', async () => {
+ const recovery = useDispatchCommandRecovery(() => crypto.randomUUID())
+ expect(() => recovery.begin('PC/1', 'EDIT', { recordVersion: 0, idempotencyKey: 'key' })).toThrow('账号')
+ const owner = crypto.randomUUID(), stable = useDispatchCommandRecovery(() => owner)
+ stable.begin('PC/1', 'EDIT', { recordVersion: 0, idempotencyKey: 'key' })
+ const send = vi.fn().mockRejectedValueOnce(new Error('unknown')).mockRejectedValueOnce(new ApiResponseError('version conflict', 'A0409'))
+ const find = vi.fn().mockRejectedValue(new ApiResponseError('not found', 'HTTP_404'))
+ await expect(stable.execute(send, vi.fn(), find)).rejects.toThrow('unknown')
+ await expect(stable.execute(send, vi.fn(), find)).rejects.toThrow('version conflict')
+ stable.discardRejected(); expect(stable.pending.value).not.toBeNull()
+})
+it('rejects a mismatched business number/action/key instead of treating it as successful', async () => {
+ const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
+ recovery.begin('PC/1', 'DEPART', { recordVersion: 0, idempotencyKey: 'key' })
+ const read = vi.fn()
+ await expect(recovery.execute(vi.fn().mockResolvedValue(command('DEPART', 'different')), read, vi.fn())).rejects.toThrow('不一致')
+ expect(read).not.toHaveBeenCalled(); expect(recovery.pending.value).not.toBeNull()
+})
+it('does not release a proven result for an older detail version, including versions beyond safe integer precision', async () => {
+ const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
+ recovery.begin('PC/1', 'DEPART', { recordVersion: '9007199254740992', idempotencyKey: 'key' })
+ const send = vi.fn().mockResolvedValue({ ...command('DEPART'), recordVersion: '9007199254740993' }), find = vi.fn()
+ await expect(recovery.execute(send, vi.fn().mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: '9007199254740992' }), find)).rejects.toThrow('详情版本早于')
+ expect(recovery.pending.value?.result).not.toBeNull()
+ await recovery.execute(send, vi.fn().mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: '9007199254740994' }), find)
+ expect(send).toHaveBeenCalledTimes(1); expect(recovery.pending.value).toBeNull()
+})
+it('treats an internal server error as unknown instead of authorizing a new command', async () => {
+ const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
+ recovery.begin('PC/1', 'EDIT', { recordVersion: 0, idempotencyKey: 'key' })
+ await expect(recovery.execute(vi.fn().mockRejectedValue(new ApiResponseError('server failure', 'A0500', 500)), vi.fn(), vi.fn())).rejects.toThrow('server failure')
+ recovery.discardRejected(); expect(recovery.pending.value?.rejected).toBe(false)
+})
diff --git a/src/modules/overseas-warehouse/dispatchCommandRecovery.ts b/src/modules/overseas-warehouse/dispatchCommandRecovery.ts
new file mode 100644
index 00000000..2d3bed5a
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchCommandRecovery.ts
@@ -0,0 +1,82 @@
+import { ref } from 'vue'
+import { ApiResponseError } from '@/shared/api/http'
+import type { CommandResult, DispatchAction } from './dispatchContracts'
+import { requireVersion } from './dispatchContracts'
+
+export interface PendingDispatchCommand { dispatchNo: string; action: DispatchAction; body: Record; attempted: boolean; result: CommandResult | null; rejected: boolean; operation?: 'ROUTE'; itemId?: string }
+const storageKey = (scope: string) => `dispatch-command:${scope}`
+const snapshot = (value: T): T => JSON.parse(JSON.stringify(value)) as T
+const sessions = new Map>; busy: ReturnType> }>()
+export function isDefiniteDispatchRejection(error: unknown) {
+ return error instanceof ApiResponseError && /^(?:A0|HTTP_)?(?:400|401|403|404|409|410|422)$/.test(String(error.code))
+}
+export function validateCommandResult(result: CommandResult, pending: PendingDispatchCommand) {
+ if (!result || result.dispatchNo !== pending.dispatchNo && pending.action !== 'CREATE'
+ || result.action !== pending.action || result.idempotencyKey !== pending.body.idempotencyKey
+ || !result.dispatchNo || !result.result) throw new Error('操作结果与原排车请求不一致，请保留原请求核对')
+ requireVersion(result.recordVersion)
+ if (pending.action === 'DEPART' && result.stage !== 'DELIVERING') throw new Error('发车结果未确认派送中，请核对原请求')
+ if (pending.action === 'LOADING_COMPLETE' && result.stage !== 'AFTER_LOADING') throw new Error('装车结果未确认装车后，请核对原请求')
+}
+export function validateCurrentDispatch(value: unknown, result: CommandResult) {
+ const current = value as { dispatchNo?: string; recordVersion?: unknown } | null
+ if (current?.dispatchNo !== result.dispatchNo) throw new Error('恢复详情与原排车单不一致')
+ const latest = String(requireVersion(current.recordVersion)).replace(/^0+(?=\d)/, '')
+ const confirmed = String(requireVersion(result.recordVersion)).replace(/^0+(?=\d)/, '')
+ if (latest.length < confirmed.length || latest.length === confirmed.length && latest < confirmed) throw new Error('详情版本早于已确认操作，请保留原请求重读')
+}
+
+/** A response proves the original command; a subsequent GET supplies current UI facts. */
+export function useDispatchCommandRecovery(scope: () => string) {
+ const owner = scope()
+ const saved = owner ? sessionStorage.getItem(storageKey(owner)) : null
+ const existing = sessions.get(owner)
+ const pending = existing?.pending || ref(null)
+ const busy = existing?.busy || ref(false)
+ if (!existing && saved) {
+ try { pending.value = JSON.parse(saved) as PendingDispatchCommand }
+ catch { throw new Error('本次排车请求记录损坏，请保留现场核对') }
+ }
+ if (!existing) sessions.set(owner, { pending, busy })
+ function persist() {
+ if (!owner || owner !== scope()) throw new Error('账号已变化，请重新进入排车列表')
+ if (pending.value) sessionStorage.setItem(storageKey(owner), JSON.stringify(pending.value))
+ else sessionStorage.removeItem(storageKey(owner))
+ }
+ function begin(dispatchNo: string, action: DispatchAction, body: object, target: Pick = {}) {
+ if (pending.value) throw new Error('上次排车操作结果尚未核对，请先恢复原请求')
+ pending.value = { dispatchNo, action, body: snapshot(body) as Record, attempted: false, result: null, rejected: false, ...target }
+ persist()
+ }
+ async function execute(send: (command: PendingDispatchCommand) => Promise, read: (dispatchNo: string) => Promise, find: (dispatchNo: string, key: string) => Promise) {
+ if (busy.value || !pending.value) return
+ const command = pending.value
+ const previouslyAttempted = command.attempted
+ busy.value = true
+ try {
+ persist()
+ if (!command.result && previouslyAttempted && command.dispatchNo) {
+ try { const found = await find(command.dispatchNo, String(command.body.idempotencyKey)); validateCommandResult(found, command); command.result = found }
+ catch (error) { if (!(error instanceof ApiResponseError) || !['404', 'A0404', 'HTTP_404'].includes(String(error.code))) throw error }
+ }
+ if (!command.result) {
+ command.attempted = true; persist()
+ try { const sent = await send(snapshot(command)); validateCommandResult(sent, command); command.result = sent }
+ catch (error) {
+ // A later rejection cannot erase an earlier unknown write result.
+ if (!previouslyAttempted && isDefiniteDispatchRejection(error)) command.rejected = true
+ persist(); throw error
+ }
+ }
+ validateCommandResult(command.result, command); persist()
+ validateCurrentDispatch(await read(command.result.dispatchNo), command.result)
+ pending.value = null; persist()
+ return command.result
+ } finally { busy.value = false }
+ }
+ function discardRejected() {
+ if (busy.value || !pending.value?.rejected) return
+ pending.value = null; persist()
+ }
+ return { pending, busy, begin, execute, discardRejected }
+}
diff --git a/src/modules/overseas-warehouse/dispatchContracts.ts b/src/modules/overseas-warehouse/dispatchContracts.ts
new file mode 100644
index 00000000..0d28d2ab
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchContracts.ts
@@ -0,0 +1,100 @@
+// Models after the dispatch API boundary: Long quantities are validated safe numbers.
+// dispatchWire.ts declares their HTTP string/number representation; IDs/versions remain lossless.
+export type Version = string | number
+export class DispatchInputError extends Error {}
+export type DispatchStatus = 'ACTIVE' | 'CANCELLED'
+export type DispatchStage = 'BEFORE_LOADING' | 'LOADING' | 'AFTER_LOADING' | 'DELIVERING' | 'DELIVERED'
+export type DispatchAction = 'CREATE' | 'EDIT' | 'ADD_CARGO' | 'REMOVE_CARGO' | 'CANCEL' | 'SUBMIT_REVIEW' | 'DISPATCH_REVIEW' | 'LOADING_REVIEW' | 'RETURN_TO_REVIEW' | 'PICK' | 'LOADING_COMPLETE' | 'ARRANGE_DELIVERY' | 'DEPART'
+export type ReviewStatus = 'NOT_SUBMITTED' | 'PENDING' | 'APPROVED' | 'REJECTED'
+export type BeforeLoadingSection = 'VEHICLE_INFO' | 'DISPATCH_REVIEW' | 'LOADING_REVIEW'
+export interface Gate { allowed: boolean; blockCode: string | null; blockReason: string | null }
+export type DispatchActions = Partial>
+export interface Counts { itemCount: number; palletCount: number; packageCount: number; pickedPackageCount: number; shippedPackageCount: number }
+export interface Capacity { palletSpaces: number | null; maxLoadKg: number | null; maxVolumeCbm: number | null }
+export interface DriverEvidence { licenseNo: string | null; licenseExpiresOn: string | null; fileIds: string[]; expectedTaskEndAt: string | null }
+export interface Vehicle { mode: 'MASTER' | 'EXTERNAL'; vehicleId: string | null; plate: string | null; carrierName: string | null; capacity: Capacity | null; evidenceFileIds: string[] }
+export interface Driver { mode: 'MASTER' | 'EXTERNAL'; driverId: string | null; name: string | null; phone: string | null; evidence: DriverEvidence | null }
+export interface VehicleSnapshot extends Vehicle { vehicleStatus: string | null }
+export interface Resources { vehicle: VehicleSnapshot | null; driver: Driver | null }
+export interface Destination { key: string; type: string; warehouseId: string | null; warehouseCode: string | null; warehouseName: string | null; address: string | null; postalCode: string | null; contactName: string | null; contactPhone: string | null }
+export interface Review { status: ReviewStatus; reason: string | null; reviewerId: string | null; reviewedAt: string | null; reviewRound: Version; basisHash: string | null; invalidatedReason: string | null }
+export interface Reviews { dispatchReview: Review; loadingReview: Review }
+export interface DispatchBatchReference { batchKey: string; batchNo: string | null; customerId: string; sources: Array<{ sourceKey: string; destinationKey: string; packageCount: number }>; recordVersion: Version }
+export interface DispatchBatchAllocation { planPalletId: string; batchKey: string; customerId: string; sourceKey: string; destinationKey: string; packageCount: number; recordVersion: Version }
+export interface DispatchQuery { page: number; size: number; dispatchNo?: string; vehiclePlate?: string; warehouseId?: string; customerId?: string; fbaAppointmentNo?: string; status?: DispatchStatus | 'ALL'; stage?: DispatchStage; beforeLoadingSection?: BeforeLoadingSection; reviewStatus?: ReviewStatus }
+export interface ReviewCounts { notSubmitted: number; pending: number; approved: number; rejected: number }
+export interface DispatchStatistics { matchedTotal: number; activeTotal: number; cancelledTotal: number; stageCounts: Record; beforeLoadingReviewCounts: { vehicleInfoTotal: number; dispatchReview: ReviewCounts; loadingReview: ReviewCounts } }
+export interface DispatchListRow { dispatchNo: string; status: DispatchStatus; stage: DispatchStage; recordVersion: Version; reviewState: string; reviews: Reviews; resources: Resources; warehouseId: string; warehouseCode: string; warehouseName: string; plannedDepartureAt: string | null; departedAt: string | null; counts: Counts; pickingReconciled: boolean; arranged: boolean; actions: DispatchActions }
+export interface DispatchPage { records: DispatchListRow[]; total: number; page: number; size: number; pages: number; statistics: DispatchStatistics; snapshotAt: string }
+export interface OutboundReference { customerId: string; customerName: string; outboundNo: string; status: string; packageCount: number; palletCount: number }
+export interface DeliveryReference { groupKey: string; customerId: string; customerName: string; outboundNo: string; deliveryNo: string; destination: Destination; status: string; packageCount: number; palletCount: number }
+export interface VehicleAppointment { referenceNo: string; status: string; appointmentAt: string | null }
+export interface FbaAppointment { batchKey: string; batchNo: string | null; appointmentNo: string | null; destinationKey: string; destinationWarehouseCode: string | null; status: string; confirmedAt: string | null; blockReason: string | null }
+export interface OrderDetail { customerId: string; customerName: string; orderNo: string; inboundCode: string | null; grossWeightKg: number | null; palletCount: number | null; destinationFbaWarehouse: string | null; volumeCbm: number | null; containerNo: string | null; sourceKey: string }
+export interface DispatchDetail { dispatchNo: string; status: DispatchStatus; stage: DispatchStage; recordVersion: Version; reviewState: string; reviews: Reviews; counts: Counts; pickingReconciled: boolean; actions: DispatchActions; vehicleInfo: Resources; dispatchInfo: { route: string | null; plannedDepartureAt: string | null; departedAt: string | null; estimatedArrivalAt: string | null; fbaAppointments: FbaAppointment[]; vehicleAppointment: VehicleAppointment | null; appointmentBatches: DispatchBatchReference[] }; documents: { dispatchNo: string; outbounds: OutboundReference[]; deliveries: DeliveryReference[]; createdAt: string; updatedAt: string; remark: string | null }; orderDetails: OrderDetail[] }
+export interface CargoSelection { sourceType: 'INBOUND_PLAN' | 'RETURN_RECEIPT' | 'RELABEL'; planPalletId: string | null; returnReceiptId: string | null; relabelNo: string | null; warehousePalletId: string | null; sourceVersion: string }
+export interface CreateDispatch { idempotencyKey: string; warehouseId: string; vehicle: Vehicle | null; driver: Driver | null; plannedDepartureAt: string | null; estimatedArrivalAt: string | null; remark: string | null; cargo: CargoSelection[]; batchAllocations: DispatchBatchAllocation[] }
+export interface VersionCommand { recordVersion: Version; idempotencyKey: string }
+export interface UpdateDispatch extends VersionCommand { vehicle: Vehicle | null; driver: Driver | null; plannedDepartureAt: string | null; estimatedArrivalAt: string | null; vehicleAppointment?: { referenceNo: string; recordVersion: Version } | null; remark: string | null }
+export interface AddCargo extends VersionCommand { cargo: CargoSelection[]; batchAllocations: DispatchBatchAllocation[] }
+export interface ReasonCommand extends VersionCommand { reason: string }
+export interface ReviewCommand extends VersionCommand { decision: 'APPROVED' | 'REJECTED'; reason: string | null }
+export interface LoadingMeasurement { warehousePalletId: string; palletSpaces: number; weightKg: number; volumeCbm: number; deliveryIndex: number }
+export interface ConfirmedLoad { manifestHash: string; pallets: LoadingMeasurement[]; operatorId: string; confirmedAt: string }
+export interface LoadingComplete extends VersionCommand { manifestHash: string; measurements: LoadingMeasurement[]; remark: string | null }
+export interface LoadingPreview { dispatchNo: string; recordVersion: Version; status: DispatchStatus; stage: DispatchStage; manifestHash: string; pickingReconciled: boolean; resources: Resources; pallets: Array<{ warehousePalletId: string; palletNo: string; scheduledPackages: number; pickedPackages: number; palletSpaces: number | null; weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null; missingFields: string[]; evidence: Array<{ field: string; sourceType: string; sourceBusinessNo: string | null; observedAt: string | null; value: number | null; actual: boolean }> }>; confirmedLoad: ConfirmedLoad | null; loadingComplete: Gate; missingFields: string[] }
+export interface Candidate { selection: CargoSelection; sourceKey: string; sourceVersion: string; customerId: string; customerName: string; warehouseId: string; warehouseCode: string; warehouseName: string; orderNo: string | null; inboundCode: string | null; planNo: string | null; palletNo: string | null; containerNo: string | null; destination: Destination; availablePackages: number; suggestedWeightKg: number | null; suggestedVolumeCbm: number | null; measurementSource: string | null; appointmentBatches: DispatchBatchReference[]; blockReasons: string[] }
+export interface CandidateQuery { warehouseId?: string; planIds?: string[]; orderNo?: string; destinationWarehouseCode?: string; sourceStage?: string; draftToken?: string }
+export interface DispatchCargoItem { dispatchItemId: string; customerId: string; customerName: string; sourceKey: string; sourceVersion: string; sourceType: CargoSelection['sourceType']; planPalletId: string | null; returnReceiptId: string | null; relabelNo: string | null; warehousePalletId: string | null; palletNo: string | null; orderNo: string | null; inboundCode: string | null; destination: Destination; scheduledPackages: number; pickedPackages: number; remove: Gate }
+export interface DispatchItems { dispatchNo: string; recordVersion: Version; status: DispatchStatus; stage: DispatchStage; items: DispatchCargoItem[] }
+export interface DispatchRouteStop { index: number; name: string; address: string | null; destinationKey: string | null }
+export interface DispatchRoute { dispatchNo: string; recordVersion: Version; stops: DispatchRouteStop[]; edit: Gate }
+export interface DispatchRouteCommand extends VersionCommand { destinationKeys: string[]; reason: string }
+export type DispatchEvidenceKind = 'VEHICLE' | 'DRIVER'
+export interface DispatchEvidenceFile { fileId: string; fileName: string; contentType: string; sizeBytes: number }
+export interface CandidateList { candidates: Candidate[]; snapshotAt: string; complete: boolean }
+export interface DraftContainer { draftContainerId: string; sequenceNo: number; capacity: number; sourceKeys: string[] }
+export interface DispatchDraft { draftToken: string; recordVersion: Version; status: string; warehouseId: string; containers: DraftContainer[]; sources: Candidate[]; expiresAt: string }
+export interface DraftSelection extends VersionCommand { draftToken: string; draftContainerId: string; source: CargoSelection }
+export interface ConvertDraft extends VersionCommand { draftToken: string; groups: Array<{ draftContainerId: string; dispatch: CreateDispatch }> }
+export interface ConvertedDraft { draftToken: string; vehicles: Array<{ draftContainerId: string; dispatch: CommandResult }>; replayed: boolean }
+export interface CoverageSelection { financeFeeId: string; sourceVersion: number; sourceHash: string; services: string[] }
+export interface FeeItem { feeType: string; feeName: string; direction: string; currency: string; amount: number | null; supplierId?: string | null; supplierName?: string | null; supplierCategory?: string | null; settlementMode?: string | null; paidAt?: string | null; paymentMethod?: string | null; paymentReferenceNo?: string | null; paymentVoucherFileIds?: string[]; chargeableQuantity?: number | null; quantityUnit?: string | null; unitPrice?: number | null; periodStart?: string | null; periodEnd?: string | null; remark?: string | null }
+export interface ArrangeGroup { groupKey: string; groupCargoHash: string; plannedDeliveryAt: string; deliveryMethod: string; waybillNo: string | null; carrierName: string | null; pickupMethod: string; loadingType: string; vehicleType: string | null; vehicleSize: string | null; appointmentAccount: string | null; sellerName: string | null; remark: string | null; externalFreightHash: string; feeCoverageCargoHash: string; feeCoverage: CoverageSelection[]; fees: FeeItem[] }
+export interface ArrangeDelivery extends VersionCommand { cargoHash: string; loadingCompletionHash: string; groups: ArrangeGroup[] }
+export interface ArrangementResult { dispatchNo: string; recordVersion: Version; arrangementKey: string; cargoHash: string; arrangedAt: string; outbounds: OutboundReference[]; deliveries: DeliveryReference[] }
+export interface CargoLine { dispatchItemId: string; customerId: string; customerName: string; orderId: string | null; orderNo: string | null; sourceKey: string; sourceStage: string; sourceRegion: string | null; sourceInboundId: string | null; inboundCode: string | null; planPalletId: string | null; warehousePalletId: string | null; palletNo: string | null; pickId: string | null; attributionId: string | null; inventoryPositionId: string | null; receiptId: string | null; returnReceiptId: string | null; returnCartonId: string | null; cartonMark: string | null; relabelNo: string | null; destination: Destination; packages: number; productQuantity: number; grossWeightKg: number | null; volumeCbm: number | null; batchAllocations: DispatchBatchAllocation[] }
+export interface PreviewGroup { groupKey: string; customerId: string; customerName: string; destination: Destination; groupCargoHash: string; cargo: CargoLine[]; externalFreightHash: string; externalQuotes: Array<{ customerId: string; groupKey: string; bookingNo: string; inboundCode: string; currency: string; amount: number; sourceHash: string }>; feeCoverageCargoHash: string; feeSources: Array<{ financeFeeId: string; customerId: string; currency: string; amount: number; sourceVersion: number; sourceHash: string; status: string; services: string[]; sourceKeys: string[] }>; requiredServices: string[]; blockReasons: string[] }
+export interface ArrangementPreview { dispatchNo: string; recordVersion: Version; status: DispatchStatus; stage: DispatchStage; cargoHash: string; loadingCompletionHash: string; arrange: Gate; groups: PreviewGroup[]; arrangement: ArrangementResult | null }
+interface CommandBase { dispatchNo: string; idempotencyKey: string; recordVersion: Version; status: DispatchStatus; stage: DispatchStage; occurredAt: string; effect: 'APPLIED' | 'EXISTING'; counts: Counts; replayed: boolean; alreadyArranged: boolean }
+export type CommandResult = CommandBase & (
+ { action: 'PICK'; result: { dispatchItemId: string; positionId: string | null; returnCartonId: string | null; packages: number; pickedPackages: number; pickingReconciled: boolean } }
+ | { action: 'LOADING_COMPLETE'; result: { loadingCompletionHash: string; loadingCompletedAt: string; confirmedLoad: ConfirmedLoad } }
+ | { action: 'DEPART'; result: { departedAt: string; shippedPackages: number; outbounds: OutboundReference[]; deliveries: DeliveryReference[] } }
+ | { action: 'ARRANGE_DELIVERY'; result: ArrangementResult }
+ | { action: Exclude; result: { dispatchNo: string; changedItemIds: string[] } }
+)
+
+export const dispatchStages: Array<{ value: DispatchStage; label: string }> = [
+ { value: 'BEFORE_LOADING', label: '装车前' }, { value: 'LOADING', label: '装车中' },
+ { value: 'AFTER_LOADING', label: '装车后' }, { value: 'DELIVERING', label: '派送中' }, { value: 'DELIVERED', label: '派送完成' },
+]
+export const stageLabel = (stage: DispatchStage) => dispatchStages.find(row => row.value === stage)?.label || '—'
+export const reviewLabels: Record = { NOT_SUBMITTED: '未提交', PENDING: '待审核', APPROVED: '已通过', REJECTED: '已驳回' }
+export function requireVersion(value: unknown): Version {
+ if (typeof value === 'number' && Number.isSafeInteger(value) && value >= 0) return value
+ if (typeof value === 'string' && /^\d+$/.test(value)) return value
+ throw new DispatchInputError('操作版本缺失或无效，请刷新单据')
+}
+
+export function requireBatchVersions(values: readonly { batchKey: string; recordVersion: Version }[]): void {
+ const versions = new Map()
+ for (const value of values) {
+ let version: Version
+ try { version = requireVersion(value.recordVersion) }
+ catch { throw new DispatchInputError('预约批次版本缺失或无效，请重新读取候选') }
+ const canonical = String(version).replace(/^0+(?=\d)/, '')
+ if (versions.has(value.batchKey) && versions.get(value.batchKey) !== canonical) throw new DispatchInputError('同一预约批次的版本不一致，请重新读取候选')
+ versions.set(value.batchKey, canonical)
+ }
+}
diff --git a/src/modules/overseas-warehouse/dispatchPresentation.ts b/src/modules/overseas-warehouse/dispatchPresentation.ts
new file mode 100644
index 00000000..674909f2
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchPresentation.ts
@@ -0,0 +1,16 @@
+import type { DispatchAction, DispatchActions } from './dispatchContracts'
+export const dispatchActionLabels: Record = {
+ CREATE: '新建排车', EDIT: '维护车辆信息', ADD_CARGO: '添加货物', REMOVE_CARGO: '移除货物', CANCEL: '取消排车',
+ SUBMIT_REVIEW: '提交调度审核', DISPATCH_REVIEW: '调度审核', LOADING_REVIEW: '理货员审核',
+ RETURN_TO_REVIEW: '退回装车前重审', PICK: '拣货', LOADING_COMPLETE: '确认装车完成', ARRANGE_DELIVERY: '安排派送', DEPART: '确认发车',
+}
+export const dispatchActionPermissions: Record = {
+ CREATE: 'platform:overseas-warehouse:dispatch:create', EDIT: 'platform:overseas-warehouse:dispatch:edit',
+ ADD_CARGO: 'platform:overseas-warehouse:dispatch:edit', REMOVE_CARGO: 'platform:overseas-warehouse:dispatch:edit',
+ CANCEL: 'platform:overseas-warehouse:dispatch:cancel', SUBMIT_REVIEW: 'platform:overseas-warehouse:dispatch:edit',
+ DISPATCH_REVIEW: 'platform:fleet:trip:dispatch-review', LOADING_REVIEW: 'platform:fleet:trip:loading-review',
+ RETURN_TO_REVIEW: 'platform:overseas-warehouse:dispatch:edit', PICK: 'lastleg:pda:operate',
+ LOADING_COMPLETE: 'platform:overseas-warehouse:dispatch:loading-complete', ARRANGE_DELIVERY: 'platform:overseas-warehouse:dispatch:transfer-delivery', DEPART: 'platform:overseas-warehouse:dispatch:depart',
+}
+export const canDispatchAction = (actions: DispatchActions | undefined, action: DispatchAction, can: (code: string) => boolean) => actions?.[action]?.allowed === true && can(dispatchActionPermissions[action])
+export const displayDispatchValue = (value: unknown) => value === null || value === undefined || value === '' ? '—' : String(value)
diff --git a/src/modules/overseas-warehouse/dispatchTestFixtures.ts b/src/modules/overseas-warehouse/dispatchTestFixtures.ts
new file mode 100644
index 00000000..497a01c9
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchTestFixtures.ts
@@ -0,0 +1,14 @@
+import type { Candidate, CommandResult, DispatchDetail, DispatchListRow, DispatchPage, Driver, LoadingPreview, VehicleSnapshot } from './dispatchContracts'
+export const counts = () => ({ itemCount: 1, palletCount: 1, packageCount: 2, pickedPackageCount: 0, shippedPackageCount: 0 })
+export const reviews = () => ({ dispatchReview: { status: 'NOT_SUBMITTED' as const, reason: null, reviewerId: null, reviewedAt: null, reviewRound: 0, basisHash: null, invalidatedReason: null }, loadingReview: { status: 'NOT_SUBMITTED' as const, reason: null, reviewerId: null, reviewedAt: null, reviewRound: 0, basisHash: null, invalidatedReason: null } })
+export const resources = (): { vehicle: VehicleSnapshot; driver: Driver } => ({ vehicle: { mode: 'EXTERNAL', vehicleId: null, plate: 'CA-100', carrierName: 'Carrier', capacity: { palletSpaces: 30, maxLoadKg: 18000, maxVolumeCbm: 70 }, evidenceFileIds: [], vehicleStatus: null }, driver: { mode: 'EXTERNAL', driverId: null, name: '司机甲', phone: '555-0100', evidence: { licenseNo: 'TEST-LICENSE', licenseExpiresOn: '2030-01-01', fileIds: [], expectedTaskEndAt: '2026-11-01T10:00:00Z' } } })
+export const destination = () => ({ key: 'CODE:ONT8', type: 'FBA', warehouseId: null, warehouseCode: 'ONT8', warehouseName: 'ONT8', address: null, postalCode: null, contactName: null, contactPhone: null })
+export function detail(overrides: Partial = {}): DispatchDetail { return { dispatchNo: 'PC/1', status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: 0, reviewState: 'DRAFT', reviews: reviews(), counts: counts(), pickingReconciled: false, actions: {}, vehicleInfo: resources(), dispatchInfo: { route: 'LAX → ONT8', plannedDepartureAt: null, departedAt: null, estimatedArrivalAt: null, fbaAppointments: [], vehicleAppointment: null, appointmentBatches: [] }, documents: { dispatchNo: 'PC/1', createdAt: '2026-10-19T10:00:00Z', updatedAt: '2026-10-19T11:00:00Z', remark: '真实备注', outbounds: [], deliveries: [] }, orderDetails: [{ customerId: 'C1', customerName: '客户甲', orderNo: 'LM-1', inboundCode: 'IN-1', grossWeightKg: null, palletCount: 1, destinationFbaWarehouse: 'ONT8', volumeCbm: null, containerNo: 'CSLU1234567', sourceKey: 'source-1' }], ...overrides } }
+export function listRow(overrides: Partial = {}): DispatchListRow { return { dispatchNo: 'PC/1', status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: 0, reviewState: 'DRAFT', reviews: reviews(), resources: resources(), warehouseId: '321', warehouseCode: 'LAX', warehouseName: '洛杉矶仓', plannedDepartureAt: null, departedAt: null, counts: counts(), pickingReconciled: false, arranged: false, actions: {}, ...overrides } }
+export function page(records = [listRow()]): DispatchPage { return { records, total: records.length, page: 1, size: 10, pages: 1, snapshotAt: '2026-10-19T10:00:00Z', statistics: { matchedTotal: 8, activeTotal: 7, cancelledTotal: 1, stageCounts: { BEFORE_LOADING: 3, LOADING: 1, AFTER_LOADING: 1, DELIVERING: 1, DELIVERED: 1 }, beforeLoadingReviewCounts: { vehicleInfoTotal: 3, dispatchReview: { notSubmitted: 1, pending: 1, approved: 1, rejected: 0 }, loadingReview: { notSubmitted: 2, pending: 0, approved: 1, rejected: 0 } } } } }
+export function candidate(overrides: Partial = {}): Candidate { return { selection: { sourceType: 'INBOUND_PLAN', planPalletId: '11', returnReceiptId: null, relabelNo: null, warehousePalletId: '21', sourceVersion: 'source-hash' }, sourceKey: 'source-1', sourceVersion: 'source-hash', customerId: 'C1', customerName: '客户甲', warehouseId: '321', warehouseCode: 'LAX', warehouseName: '洛杉矶仓', orderNo: 'LM-1', inboundCode: 'IN-1', planNo: 'PLAN-1', palletNo: 'PALLET-1', containerNo: 'CSLU1234567', destination: destination(), availablePackages: 2, suggestedWeightKg: 100, suggestedVolumeCbm: 1, measurementSource: 'ORDER_SNAPSHOT_ALLOCATION', appointmentBatches: [], blockReasons: [], ...overrides } }
+export function command(action: CommandResult['action'], key = 'key', no = 'PC/1'): CommandResult {
+ const base = { dispatchNo: no, action, idempotencyKey: key, recordVersion: 1, status: 'ACTIVE' as const, stage: action === 'DEPART' ? 'DELIVERING' as const : action === 'LOADING_COMPLETE' ? 'AFTER_LOADING' as const : 'BEFORE_LOADING' as const, occurredAt: '2026-10-19T10:00:00Z', effect: 'APPLIED' as const, counts: counts(), replayed: false, alreadyArranged: false }
+ return { ...base, result: action === 'DEPART' ? { departedAt: '2026-10-19T10:00:00Z', shippedPackages: 2, outbounds: [], deliveries: [] } : action === 'LOADING_COMPLETE' ? { loadingCompletionHash: 'load-hash', loadingCompletedAt: '2026-10-19T10:00:00Z', confirmedLoad: { manifestHash: 'manifest', pallets: [], operatorId: 'operator', confirmedAt: '2026-10-19T10:00:00Z' } } : { dispatchNo: no, changedItemIds: [] } } as CommandResult
+}
+export function loadingPreview(): LoadingPreview { return { dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'LOADING', manifestHash: 'manifest', pickingReconciled: true, resources: resources(), pallets: [{ warehousePalletId: '21', palletNo: 'PALLET-1', scheduledPackages: 2, pickedPackages: 2, palletSpaces: 1, weightKg: null, volumeCbm: null, deliveryIndex: 1, missingFields: ['weightKg', 'volumeCbm'], evidence: [{ field: 'weightKg', sourceType: 'ORDER_SNAPSHOT_ALLOCATION', sourceBusinessNo: 'IN-1', observedAt: null, value: 100, actual: false }] }], confirmedLoad: null, loadingComplete: { allowed: true, blockCode: null, blockReason: null }, missingFields: ['weightKg', 'volumeCbm'] } }
diff --git a/src/modules/overseas-warehouse/dispatchWire.test.ts b/src/modules/overseas-warehouse/dispatchWire.test.ts
new file mode 100644
index 00000000..649883fd
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchWire.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it } from 'vitest'
+import { parseApiJsonResponse } from '@chongchong/shared'
+import { candidate, command, detail, destination, loadingPreview, page } from './dispatchTestFixtures'
+import * as wire from './dispatchWire'
+
+// Exercise the same JSON parser as Axios; quoted Long values must reach the boundary intact.
+const parsed = (value: T): T => parseApiJsonResponse(JSON.stringify(value)) as T
+const id = '9007199254740993'
+const counts = { itemCount: '1', palletCount: '2', packageCount: '12', pickedPackageCount: '0', shippedPackageCount: '0' }
+const gate = { allowed: true, blockCode: null, blockReason: null }
+const source = () => ({ ...candidate(), customerId: id, availablePackages: '12' })
+const draft = (): wire.DispatchDraftWire => ({ draftToken: 'draft', recordVersion: id, warehouseId: id, status: 'ACTIVE', sources: [source()], containers: [{ draftContainerId: id, sequenceNo: 1, capacity: 30, sourceKeys: ['source-1'] }], expiresAt: '' })
+const references = () => ({ outbounds: [{ customerId: id, customerName: '客户甲', outboundNo: 'OUT-1', status: 'WAIT_OUTBOUND', packageCount: '12', palletCount: '2' }], deliveries: [{ groupKey: 'group-1', customerId: id, customerName: '客户甲', outboundNo: 'OUT-1', deliveryNo: 'DEL-1', destination: destination(), status: 'WAIT_DELIVERY', packageCount: '12', palletCount: '2' }] })
+const arrangement = () => ({ dispatchNo: 'PC/1', recordVersion: id, arrangementKey: 'key', cargoHash: 'hash', arrangedAt: '', ...references() })
+
+describe('native dispatch Long quantity boundary', () => {
+ it.each([0, '0', id])('keeps actual batch recordVersion %s lossless in candidates, drafts and existing dispatch references', version => {
+ const reference = { batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: id, recordVersion: version, sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 12 }] }
+ const value = { ...source(), appointmentBatches: [reference] }
+ expect(wire.normalizeCandidateList(parsed({ candidates: [value], complete: true, snapshotAt: '' })).candidates[0]!.appointmentBatches[0]!.recordVersion).toBe(version)
+ expect(wire.normalizeDispatchDraft(parsed({ ...draft(), sources: [value] })).sources[0]!.appointmentBatches[0]!.recordVersion).toBe(version)
+ const existing = detail()
+ expect(wire.normalizeDispatchDetail(parsed({ ...existing, dispatchInfo: { ...existing.dispatchInfo, appointmentBatches: [reference] } })).dispatchInfo.appointmentBatches[0]!.recordVersion).toBe(version)
+ })
+ it.each([undefined, null, -1, '', 'bad'])('rejects missing or invalid authoritative candidate batch version %s', version => {
+ const reference = { batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: id, recordVersion: version, sources: [] }
+ const value = { ...source(), appointmentBatches: [reference] } as unknown as wire.CandidateWire
+ expect(() => wire.normalizeCandidateList(parsed({ candidates: [value], complete: true, snapshotAt: '' }))).toThrow('预约批次版本缺失或无效，请重新读取候选')
+ })
+ it('preserves a raw large JSON integer that the shared parser safely converts into a version string', () => {
+ const value = { ...source(), appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: id, recordVersion: 9007199254740992, sources: [] }] }
+ expect(wire.normalizeCandidateList(parsed({ candidates: [value], complete: true, snapshotAt: '' })).candidates[0]!.appointmentBatches[0]!.recordVersion).toBe('9007199254740992')
+ })
+ it.each([undefined, null, true, false, '', ' ', ' 1', '1 ', '01', '+1', '-1', '1.0', '1e2', -1, 1.5, NaN, Infinity, '9007199254740992', 9007199254740992])('rejects invalid or unsafe quantity %s instead of silently changing it', value => {
+ expect(() => wire.dispatchQuantity(value, '箱数')).toThrow('排车响应')
+ })
+ it('accepts zero and the safe integer limit in numeric and string form', () => {
+ for (const value of [0, '0', Number.MAX_SAFE_INTEGER, String(Number.MAX_SAFE_INTEGER)]) expect(wire.dispatchQuantity(value, '箱数')).toBe(Number(value))
+ })
+ it('normalizes all list, statistics and review counts while preserving versions and IDs', () => {
+ const value = page()
+ const result = wire.normalizeDispatchPage(parsed({ ...value, total: '8', page: '1', size: '10', pages: '1', records: [{ ...value.records[0]!, warehouseId: id, recordVersion: id, counts, reviews: { ...value.records[0]!.reviews, dispatchReview: { ...value.records[0]!.reviews.dispatchReview, reviewRound: id } } }], statistics: { matchedTotal: '8', activeTotal: '7', cancelledTotal: '1', stageCounts: { BEFORE_LOADING: '3', LOADING: '1', AFTER_LOADING: '1', DELIVERING: '1', DELIVERED: '1' }, beforeLoadingReviewCounts: { vehicleInfoTotal: '3', dispatchReview: { notSubmitted: '1', pending: '1', approved: '1', rejected: '0' }, loadingReview: { notSubmitted: '2', pending: '0', approved: '1', rejected: '0' } } } }))
+ expect(result).toMatchObject({ total: 8, page: 1, size: 10, pages: 1, statistics: { matchedTotal: 8, activeTotal: 7, cancelledTotal: 1, stageCounts: value.statistics.stageCounts, beforeLoadingReviewCounts: value.statistics.beforeLoadingReviewCounts } })
+ expect(result.records[0]).toMatchObject({ warehouseId: id, recordVersion: id, counts: { itemCount: 1, palletCount: 2, packageCount: 12, pickedPackageCount: 0, shippedPackageCount: 0 }, reviews: { dispatchReview: { reviewRound: id } } })
+ })
+ it('normalizes detail document quantities without changing nullable Integer measurements or versions', () => {
+ const value = detail()
+ const result = wire.normalizeDispatchDetail(parsed({ ...value, recordVersion: id, counts, documents: { ...value.documents, ...references() }, orderDetails: [{ ...value.orderDetails[0]!, palletCount: null }] }))
+ expect(result.recordVersion).toBe(id); expect(result.counts.packageCount).toBe(12); expect(result.orderDetails[0]!.palletCount).toBeNull()
+ expect(result.documents.outbounds[0]).toMatchObject({ customerId: id, packageCount: 12, palletCount: 2 }); expect(result.documents.deliveries[0]!.packageCount).toBe(12)
+ })
+ it('normalizes candidates and draft sources and keeps source versions and container IDs', () => {
+ const candidates = wire.normalizeCandidateList(parsed({ candidates: [source()], snapshotAt: '', complete: true }))
+ expect(candidates.candidates[0]).toMatchObject({ availablePackages: 12, customerId: id, sourceVersion: 'source-hash' })
+ const result = wire.normalizeDispatchDraft(parsed(draft()))
+ expect(result.sources[0]!.availablePackages).toBe(12); expect(result.recordVersion).toBe(id); expect(result.containers[0]).toMatchObject({ draftContainerId: id, sequenceNo: 1, capacity: 30 })
+ })
+ it('normalizes actual item and loading quantities while keeping decimal measurements and integer positions', () => {
+ const value = source()
+ const items = wire.normalizeDispatchItems(parsed({ dispatchNo: 'PC/1', recordVersion: id, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...value.selection, dispatchItemId: id, sourceKey: value.sourceKey, sourceVersion: value.sourceVersion, customerId: id, customerName: value.customerName, palletNo: value.palletNo, orderNo: value.orderNo, inboundCode: value.inboundCode, destination: value.destination, scheduledPackages: '12', pickedPackages: '0', remove: gate }] } satisfies wire.DispatchItemsWire))
+ expect(items.items[0]).toMatchObject({ dispatchItemId: id, scheduledPackages: 12, pickedPackages: 0 }); expect(items.recordVersion).toBe(id)
+ const preview = loadingPreview()
+ const loading = wire.normalizeLoadingPreview(parsed({ ...preview, recordVersion: id, pallets: [{ ...preview.pallets[0]!, warehousePalletId: id, scheduledPackages: '12', pickedPackages: '12', weightKg: 12.25, volumeCbm: 0.5, deliveryIndex: 1, palletSpaces: 2 }] }))
+ expect(loading.pallets[0]).toMatchObject({ warehousePalletId: id, scheduledPackages: 12, pickedPackages: 12, weightKg: 12.25, volumeCbm: 0.5, deliveryIndex: 1, palletSpaces: 2 })
+ })
+ it('normalizes file size before metadata and Blob validation without rounding file identity', () => {
+ const result = wire.normalizeEvidenceFile(parsed({ fileId: id, fileName: '证据.png', contentType: 'image/png', sizeBytes: '3' }))
+ expect(result).toMatchObject({ fileId: id, sizeBytes: 3 }); expect(Number.isSafeInteger(result.sizeBytes)).toBe(true); expect(new Blob(['png']).size).toBe(result.sizeBytes)
+ })
+ it('normalizes every arrangement cargo and existing outbound/delivery quantity', () => {
+ const result = wire.normalizeArrangementPreview(parsed({ dispatchNo: 'PC/1', recordVersion: id, status: 'ACTIVE', stage: 'AFTER_LOADING', cargoHash: 'hash', loadingCompletionHash: 'loaded', arrange: gate, groups: [{ groupKey: 'group-1', customerId: id, customerName: '客户甲', destination: destination(), groupCargoHash: 'group-hash', cargo: [{ dispatchItemId: id, customerId: id, customerName: '客户甲', orderId: id, orderNo: 'LM-1', sourceKey: 'source-1', sourceStage: 'RECEIVED', sourceRegion: null, sourceInboundId: id, inboundCode: 'IN-1', planPalletId: id, warehousePalletId: id, palletNo: 'PALLET-1', pickId: id, attributionId: id, inventoryPositionId: id, receiptId: id, returnReceiptId: null, returnCartonId: null, cartonMark: null, relabelNo: null, destination: destination(), packages: '12', productQuantity: '24', grossWeightKg: 12.25, volumeCbm: null, batchAllocations: [] }], externalFreightHash: '', externalQuotes: [], feeCoverageCargoHash: '', feeSources: [], requiredServices: [], blockReasons: [] }], arrangement: arrangement() } satisfies wire.ArrangementPreviewWire))
+ expect(result.groups[0]!.cargo[0]).toMatchObject({ dispatchItemId: id, packages: 12, productQuantity: 24, grossWeightKg: 12.25 }); expect(result.arrangement).toMatchObject({ recordVersion: id, outbounds: [{ packageCount: 12, palletCount: 2 }], deliveries: [{ packageCount: 12, palletCount: 2 }] })
+ })
+ it('normalizes typed command payloads and converted drafts and preserves immutable proof versions', () => {
+ const base = { ...command('EDIT'), counts, recordVersion: id }
+ const pick = wire.normalizeDispatchCommand(parsed({ ...base, action: 'PICK', result: { dispatchItemId: id, positionId: id, returnCartonId: null, packages: '2', pickedPackages: '12', pickingReconciled: true } } satisfies wire.CommandResultWire))
+ expect(pick).toMatchObject({ recordVersion: id, counts: { packageCount: 12 }, result: { dispatchItemId: id, packages: 2, pickedPackages: 12 } })
+ const depart: wire.CommandResultWire = { ...base, action: 'DEPART', result: { departedAt: '', shippedPackages: '12', ...references() } }
+ expect(wire.normalizeDispatchCommand(parsed(depart))).toMatchObject({ result: { shippedPackages: 12, outbounds: [{ packageCount: 12 }], deliveries: [{ palletCount: 2 }] } })
+ const arranged: wire.CommandResultWire = { ...base, action: 'ARRANGE_DELIVERY', result: arrangement() }
+ expect(wire.normalizeDispatchCommand(parsed(arranged))).toMatchObject({ result: { recordVersion: id, deliveries: [{ packageCount: 12 }] } })
+ expect(wire.normalizeConvertedDraft(parsed({ draftToken: 'draft', vehicles: [{ draftContainerId: id, dispatch: depart }], replayed: true }))).toMatchObject({ vehicles: [{ draftContainerId: id, dispatch: { recordVersion: id, counts: { pickedPackageCount: 0 }, result: { shippedPackages: 12 } } }] })
+ })
+ it('rejects malformed nested quantities at the boundary', () => {
+ expect(() => wire.normalizeDispatchDraft(parsed({ ...draft(), sources: [{ ...source(), availablePackages: '9007199254740992' }] }))).toThrow('安全整数')
+ expect(() => wire.normalizeEvidenceFile({ fileId: id, fileName: '', contentType: '', sizeBytes: null } as unknown as wire.DispatchEvidenceFileWire)).toThrow('有效非负整数')
+ expect(() => wire.normalizeDispatchCommand({ ...command('EDIT'), counts: { ...counts, pickedPackageCount: undefined } } as unknown as wire.CommandResultWire)).toThrow('有效非负整数')
+ })
+})
diff --git a/src/modules/overseas-warehouse/dispatchWire.ts b/src/modules/overseas-warehouse/dispatchWire.ts
new file mode 100644
index 00000000..2417fbe0
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchWire.ts
@@ -0,0 +1,71 @@
+import { DispatchInputError, requireBatchVersions, type ArrangementPreview, type ArrangementResult, type Candidate, type CandidateList, type CargoLine, type CommandResult, type ConvertedDraft, type Counts, type DeliveryReference, type DispatchDetail, type DispatchDraft, type DispatchEvidenceFile, type DispatchItems, type DispatchListRow, type DispatchPage, type DispatchStage, type DispatchStatistics, type LoadingPreview, type OutboundReference, type PreviewGroup, type ReviewCounts } from './dispatchContracts'
+
+// common-web serializes both Long and long as decimal strings. Only quantity
+// fields are normalized here; IDs, recordVersion and reviewRound stay lossless.
+export type LongQuantityWire = string | number
+type LongFields = Omit & { [P in K]: LongQuantityWire }
+type CountsWire = LongFields
+type ReviewCountsWire = LongFields
+type OutboundWire = LongFields
+type DeliveryWire = LongFields
+type ReferencesWire = { outbounds: OutboundWire[]; deliveries: DeliveryWire[] }
+type StatisticsWire = Omit & {
+ matchedTotal: LongQuantityWire; activeTotal: LongQuantityWire; cancelledTotal: LongQuantityWire
+ stageCounts: Record
+ beforeLoadingReviewCounts: { vehicleInfoTotal: LongQuantityWire; dispatchReview: ReviewCountsWire; loadingReview: ReviewCountsWire }
+}
+type ListRowWire = Omit & { counts: CountsWire }
+export type DispatchPageWire = Omit & { records: ListRowWire[]; total: LongQuantityWire; page: LongQuantityWire; size: LongQuantityWire; pages: LongQuantityWire; statistics: StatisticsWire }
+export type DispatchDetailWire = Omit & { counts: CountsWire; documents: Omit & ReferencesWire }
+export type CandidateWire = LongFields
+export type CandidateListWire = Omit & { candidates: CandidateWire[] }
+export type DispatchDraftWire = Omit & { sources: CandidateWire[] }
+export type DispatchItemsWire = Omit & { items: Array> }
+export type LoadingPreviewWire = Omit & { pallets: Array> }
+export type DispatchEvidenceFileWire = LongFields
+type ArrangementResultWire = Omit & ReferencesWire
+type PreviewGroupWire = Omit & { cargo: Array> }
+export type ArrangementPreviewWire = Omit & { groups: PreviewGroupWire[]; arrangement: ArrangementResultWire | null }
+type PickedWire = LongFields['result'], 'packages' | 'pickedPackages'>
+type DepartedWire = Omit['result'], 'shippedPackages' | keyof ReferencesWire> & ReferencesWire & { shippedPackages: LongQuantityWire }
+type WireCommand = C extends CommandResult ? Omit & { counts: CountsWire; result: C extends { action: 'PICK' } ? PickedWire : C extends { action: 'DEPART' } ? DepartedWire : C extends { action: 'ARRANGE_DELIVERY' } ? ArrangementResultWire : C['result'] } : never
+export type CommandResultWire = WireCommand
+export type ConvertedDraftWire = Omit & { vehicles: Array<{ draftContainerId: string; dispatch: CommandResultWire }> }
+
+export function dispatchQuantity(value: unknown, field: string): number {
+ if (typeof value !== 'number' && (typeof value !== 'string' || !/^(?:0|[1-9]\d*)$/.test(value))) throw new DispatchInputError(`排车响应${field}不是有效非负整数，请重新读取`)
+ const number = typeof value === 'number' ? value : Number(value)
+ if (!Number.isSafeInteger(number) || number < 0) throw new DispatchInputError(`排车响应${field}超出安全整数范围或无效，请重新读取`)
+ return number
+}
+function numbers(value: LongFields, fields: readonly K[]): T {
+ const result = { ...value }
+ for (const field of fields) Object.assign(result, { [field]: dispatchQuantity(value[field], String(field)) })
+ return result as T
+}
+const counts = (value: CountsWire) => numbers(value, ['itemCount', 'palletCount', 'packageCount', 'pickedPackageCount', 'shippedPackageCount'])
+const reviewCounts = (value: ReviewCountsWire) => numbers(value, ['notSubmitted', 'pending', 'approved', 'rejected'])
+const references = (value: ReferencesWire) => ({ outbounds: value.outbounds.map(row => numbers(row, ['packageCount', 'palletCount'])), deliveries: value.deliveries.map(row => numbers(row, ['packageCount', 'palletCount'])) })
+const candidate = (value: CandidateWire): Candidate => { requireBatchVersions(value.appointmentBatches); return { ...value, availablePackages: dispatchQuantity(value.availablePackages, 'availablePackages') } }
+function statistics(value: StatisticsWire): DispatchStatistics {
+ return { ...value, matchedTotal: dispatchQuantity(value.matchedTotal, 'matchedTotal'), activeTotal: dispatchQuantity(value.activeTotal, 'activeTotal'), cancelledTotal: dispatchQuantity(value.cancelledTotal, 'cancelledTotal'), stageCounts: Object.fromEntries(Object.entries(value.stageCounts).map(([stage, count]) => [stage, dispatchQuantity(count, `stageCounts.${stage}`)])) as Record, beforeLoadingReviewCounts: { vehicleInfoTotal: dispatchQuantity(value.beforeLoadingReviewCounts.vehicleInfoTotal, 'vehicleInfoTotal'), dispatchReview: reviewCounts(value.beforeLoadingReviewCounts.dispatchReview), loadingReview: reviewCounts(value.beforeLoadingReviewCounts.loadingReview) } }
+}
+export function normalizeDispatchPage(value: DispatchPageWire): DispatchPage { return { ...value, total: dispatchQuantity(value.total, 'total'), page: dispatchQuantity(value.page, 'page'), size: dispatchQuantity(value.size, 'size'), pages: dispatchQuantity(value.pages, 'pages'), records: value.records.map(row => ({ ...row, counts: counts(row.counts) })), statistics: statistics(value.statistics) } }
+export function normalizeDispatchDetail(value: DispatchDetailWire): DispatchDetail { requireBatchVersions(value.dispatchInfo.appointmentBatches); return { ...value, counts: counts(value.counts), documents: { ...value.documents, ...references(value.documents) } } }
+export function normalizeCandidateList(value: CandidateListWire): CandidateList { return { ...value, candidates: value.candidates.map(candidate) } }
+export function normalizeDispatchDraft(value: DispatchDraftWire): DispatchDraft { return { ...value, sources: value.sources.map(candidate) } }
+export function normalizeDispatchItems(value: DispatchItemsWire): DispatchItems { return { ...value, items: value.items.map(row => ({ ...row, scheduledPackages: dispatchQuantity(row.scheduledPackages, 'scheduledPackages'), pickedPackages: dispatchQuantity(row.pickedPackages, 'pickedPackages') })) } }
+export function normalizeLoadingPreview(value: LoadingPreviewWire): LoadingPreview { return { ...value, pallets: value.pallets.map(row => ({ ...row, scheduledPackages: dispatchQuantity(row.scheduledPackages, 'scheduledPackages'), pickedPackages: dispatchQuantity(row.pickedPackages, 'pickedPackages') })) } }
+export function normalizeEvidenceFile(value: DispatchEvidenceFileWire): DispatchEvidenceFile { return { ...value, sizeBytes: dispatchQuantity(value.sizeBytes, 'sizeBytes') } }
+function arrangementResult(value: ArrangementResultWire): ArrangementResult { return { ...value, ...references(value) } }
+export function normalizeArrangementPreview(value: ArrangementPreviewWire): ArrangementPreview { return { ...value, groups: value.groups.map(group => ({ ...group, cargo: group.cargo.map(row => ({ ...row, packages: dispatchQuantity(row.packages, 'packages'), productQuantity: dispatchQuantity(row.productQuantity, 'productQuantity') })) })), arrangement: value.arrangement ? arrangementResult(value.arrangement) : null } }
+export function normalizeDispatchCommand(value: CommandResultWire): CommandResult {
+ const normalizedCounts = counts(value.counts)
+ switch (value.action) {
+ case 'PICK': return { ...value, counts: normalizedCounts, result: { ...value.result, packages: dispatchQuantity(value.result.packages, 'packages'), pickedPackages: dispatchQuantity(value.result.pickedPackages, 'pickedPackages') } }
+ case 'DEPART': return { ...value, counts: normalizedCounts, result: { ...value.result, shippedPackages: dispatchQuantity(value.result.shippedPackages, 'shippedPackages'), ...references(value.result) } }
+ case 'ARRANGE_DELIVERY': return { ...value, counts: normalizedCounts, result: arrangementResult(value.result) }
+ default: return { ...value, counts: normalizedCounts }
+ }
+}
+export function normalizeConvertedDraft(value: ConvertedDraftWire): ConvertedDraft { return { ...value, vehicles: value.vehicles.map(row => ({ ...row, dispatch: normalizeDispatchCommand(row.dispatch) })) } }
diff --git a/src/modules/overseas-warehouse/index.ts b/src/modules/overseas-warehouse/index.ts
index 2c747516..f7363bec 100644
--- a/src/modules/overseas-warehouse/index.ts
+++ b/src/modules/overseas-warehouse/index.ts
@@ -6,8 +6,12 @@ export type { FbaAppointmentDto, BatchFbaAppointmentPayload, UpdateFbaAppointmen
export { default as FbaAppointmentFields } from './components/FbaAppointmentFields.vue'
export { createAppointmentForm, appointmentPayload, appointmentFormError } from './appointmentForm'
export { overseasWarehousePermissions } from './permissions'
-export { getDispatch, getBatchDispatchCandidates, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, preArrangeDraftDispatch, releaseDispatchDraft } from './api/dispatches'
-export type { DispatchBatchReference, BatchDispatchCandidate, BatchDispatchCandidates, DispatchBatchAllocation, DispatchSummaryDto, PreArrangeDispatchDraftPayload } from './api/dispatches'
+export { getDispatch, getBatchDispatchCandidates, listDispatchCandidates, createDispatchDraft, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, convertDispatchDraft, releaseDispatchDraft, addDispatchCargo } from './api/dispatches'
+export type { BatchDispatchCandidate, BatchDispatchCandidates } from './api/dispatches'
+export type { DispatchBatchReference, DispatchBatchAllocation, DispatchDetail, DispatchDraft, ConvertDraft, ConvertedDraft, CommandResult, Candidate, DraftSelection, VersionCommand } from './dispatchContracts'
+export { DispatchInputError, requireVersion, requireBatchVersions, stageLabel } from './dispatchContracts'
+export { useDispatchCommandRecovery, validateCommandResult, validateCurrentDispatch, isDefiniteDispatchRejection } from './dispatchCommandRecovery'
+export { default as DispatchWorkflowDialog } from './components/DispatchWorkflowDialog.vue'
export { dispatchVehicleSpecs } from './dispatchVehicleSpecs'
export { getContainerPlanProgress, getContainerInboundPlanPreview, convertLastMileContainerToInboundPlans } from './api/lastMileOrders'
export type { ContainerPlanProgressDetailDto, ContainerInboundPlanPreviewDto, ConvertContainerInboundPlanPayload } from './api/lastMileOrders'
diff --git a/src/modules/overseas-warehouse/layoutAcceptance.test.ts b/src/modules/overseas-warehouse/layoutAcceptance.test.ts
index 2f86a735..655e1814 100644
--- a/src/modules/overseas-warehouse/layoutAcceptance.test.ts
+++ b/src/modules/overseas-warehouse/layoutAcceptance.test.ts
@@ -58,7 +58,8 @@ describe('overseas warehouse 1920px layout acceptance', () => {
expect(sharedDetail).toContain('grid-template-columns: repeat(2, minmax(0, 1fr))')
expect(page('LastMileOrderDetailView.vue')).toContain('density-fields')
expect(page('InboundOrderDetailView.vue')).toContain('density-fields')
- expect(page('DispatchDetailView.vue')).toContain('.document-section { grid-column: 1 / -1; }')
+ expect(page('DispatchDetailView.vue')).toContain('class="density-element-tabs density-contained-tabs"')
+ expect(page('DispatchDetailView.vue').match(/ ({} as Record))
-const routerPush = vi.hoisted(() => vi.fn())
-const canPermission = vi.hoisted(() => vi.fn(() => false))
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canPermission }) }))
-vi.mock('vue-router', () => ({ useRoute: () => ({ params: { dispatchNo: 'PC/1' }, query: sourceQuery }), useRouter: () => ({ push: routerPush }) }))
+const query = vi.hoisted(() => ({} as Record))
+const push = vi.hoisted(() => vi.fn())
+const can = vi.hoisted(() => vi.fn(() => false))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
+vi.mock('vue-router', () => ({ useRoute: () => ({ params: { dispatchNo: 'PC/1' }, query }), useRouter: () => ({ push }) }))
vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn() }))
-
-describe('DispatchDetailView', () => {
- beforeEach(() => {
- routerPush.mockReset()
- canPermission.mockReset().mockReturnValue(false)
- Object.keys(sourceQuery).forEach(key => delete sourceQuery[key])
- vi.mocked(getDispatch).mockReset().mockResolvedValue({
- id: '1', dispatchNo: 'PC/1', appointmentBatches: [], vehiclePlate: 'CA-100', driverName: '张师傅', status: 'PENDING_DEPARTURE',
- route: 'LAX → ONT8', items: [{ id: '11', planPalletId: '20', orderNo: 'LM-1', warehousePalletId: '21', fbaWarehouseCode: 'ONT8', grossWeightKg: 88.5, volumeCbm: 1.25 }],
- })
- })
-
- it('loads the business dispatch number and renders summary and related orders', async () => {
- const wrapper = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } })
- await flushPromises()
+vi.mock('@/modules/overseas-master-data', () => ({ inquiryReturnTarget: (value: Record) => value.fleetOfferNo ? { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: value.fleetOfferNo }, query: { inquiry: value.fleetBookingNo } } : null }))
+const options = { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub, DispatchWorkflowDialog: true } } }
+beforeEach(() => { vi.mocked(getDispatch).mockResolvedValue(detail()); can.mockReturnValue(false); push.mockReset(); Object.keys(query).forEach(key => delete query[key]) })
+describe('whole-dispatch four-tab detail', () => {
+ it('uses only four accessible colored tabs and switches without another network read', async () => {
+ const wrapper = mount(DispatchDetailView, options); await flushPromises()
expect(getDispatch).toHaveBeenCalledWith('PC/1')
- expect(wrapper.text()).toContain('PC/1')
- expect(wrapper.text()).toContain('CA-100')
- expect(wrapper.text()).toContain('待发车')
- const table = wrapper.findComponent(DataTableStub)
- expect(table.props('data')).toEqual([{ orderNo: 'LM-1', weight: 88.5, palletCount: 1, fbaWarehouse: 'ONT8', volume: 1.25, containerNo: '—' }])
- wrapper.unmount()
+ const tabs = wrapper.findAll('[role="tab"]')
+ expect(tabs.map(tab => tab.text())).toEqual(['🚚车辆信息', '📋排车信息', '📝单据信息', '📦关联订单明细'])
+ expect(wrapper.findAll('.density-tab-icon')).toHaveLength(4)
+ await tabs[1]!.trigger('click'); await flushPromises()
+ expect(tabs[1]!.attributes('aria-selected')).toBe('true')
+ expect(wrapper.get(`#${tabs[1]!.attributes('aria-controls')}`).text()).toContain('LAX → ONT8')
+ expect(getDispatch).toHaveBeenCalledTimes(1); expect(wrapper.text()).toContain('装车前'); wrapper.unmount()
})
-
- it('keeps related order weight unknown when one pallet lacks physical weight', async () => {
- vi.mocked(getDispatch).mockResolvedValueOnce({ id: '1', dispatchNo: 'PC/1', appointmentBatches: [], status: 'PENDING_DEPARTURE', items: [
- { id: '11', planPalletId: '31', orderNo: 'LM-1', warehousePalletId: '21', grossWeightKg: 88.5, volumeCbm: 1 },
- { id: '12', planPalletId: '32', orderNo: 'LM-1', warehousePalletId: '22', grossWeightKg: null, volumeWeightKg: 999, volumeCbm: 1 },
- ] })
- const wrapper = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } })
- await flushPromises()
- expect(wrapper.findComponent(DataTableStub).props('data')).toEqual([expect.objectContaining({ weight: null })])
- wrapper.unmount()
+ it('uses exact server order attribution including unknown measurements and real container numbers', async () => {
+ const value = detail(); value.orderDetails.push({ ...value.orderDetails[0]!, customerId: 'C2', customerName: '客户乙', sourceKey: 'source-2', orderNo: 'LM-2', grossWeightKg: 12.25 })
+ vi.mocked(getDispatch).mockResolvedValueOnce(value)
+ const wrapper = mount(DispatchDetailView, options); await flushPromises()
+ expect(wrapper.getComponent(DataTableStub).props('data')).toEqual(value.orderDetails)
+ expect(value.orderDetails[0]!.grossWeightKg).toBeNull(); wrapper.unmount()
})
-
- it('shows server blocking reasons and opens only authorized original documents', async () => {
- const data = await getDispatch('PC/1')
- data.actions = { canEdit: false, editBlockReason: '请先解除车次关联', canCancel: false, cancelBlockReason: '请先解除车次关联', canRemovePallet: false, removePalletBlockReason: '请先解除车次关联', canTransfer: false, transferBlockReason: '原出库已取消，请取消原排车后重新预排', outboundNo: 'OUT-1', outboundStatus: 'CANCELLED' }
- data.workflow = { tripNo: 'TR-1', dispatchReview: { status: 'PENDING', reason: null, reviewedAt: null }, loadingReview: { status: 'PENDING', reason: null, reviewedAt: null } }
- vi.mocked(getDispatch).mockResolvedValue(data)
- canPermission.mockReturnValue(true)
- const wrapper = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } }); await flushPromises()
- expect(wrapper.text()).toContain('原出库已取消')
- await wrapper.findAll('button').find(button => button.text().includes('处理原车次'))!.trigger('click')
- expect(routerPush).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-1' }, query: { tab: 'overview' } })
- await wrapper.findAll('button').find(button => button.text().includes('查看原出库'))!.trigger('click')
- expect(routerPush).toHaveBeenLastCalledWith({ name: 'overseas-outbounds', query: { documentNo: 'OUT-1' } })
- wrapper.unmount()
- canPermission.mockReturnValue(false)
- const readonly = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } }); await flushPromises()
- expect(readonly.findAll('button').some(button => ['处理原车次', '查看原出库'].some(label => button.text().includes(label)))).toBe(false)
- expect(readonly.text()).toContain('原出库已取消')
- readonly.unmount()
+ it('renders all customer delivery references and real update time/remark without leaking internal IDs', async () => {
+ const value = detail(); value.documents.deliveries = ['DEL-A', 'DEL-B'].map((deliveryNo, index) => ({ deliveryNo, customerId: `C${index}`, customerName: `客户${index}`, outboundNo: `OUT-${index}`, groupKey: `group-${index}`, destination: destination(), status: 'WAIT_DELIVERY', packageCount: 1, palletCount: 1 }))
+ vi.mocked(getDispatch).mockResolvedValueOnce(value)
+ const wrapper = mount(DispatchDetailView, options); await flushPromises(); await wrapper.findAll('[role="tab"]')[2]!.trigger('click')
+ expect(wrapper.text()).toContain('DEL-A'); expect(wrapper.text()).toContain('DEL-B'); expect(wrapper.text()).toContain('真实备注')
+ expect(wrapper.findAll('button').some(button => button.text() === 'DEL-A')).toBe(false); wrapper.unmount()
})
- it.each([false, true])('returns to the original inquiry only for a valid source: %s', async fromInquiry => {
- if (fromInquiry) Object.assign(sourceQuery, { fleetSource: 'inquiry', fleetOfferNo: 'FO-1', fleetBookingNo: 'FB-2' })
- const wrapper = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } })
- await flushPromises()
- const backButton = wrapper.get('button.density-back')
- expect(backButton.text()).toBe(fromInquiry ? '返回原拼车登记' : '返回列表')
- await backButton.trigger('click')
- expect(routerPush).toHaveBeenCalledWith(fromInquiry ? { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'FO-1' }, query: { inquiry: 'FB-2' } } : { name: 'overseas-dispatches' })
- wrapper.unmount()
+ it('requires a literal service allowance and permission for a write action', async () => {
+ can.mockReturnValue(true); vi.mocked(getDispatch).mockResolvedValueOnce(detail({ actions: { DEPART: { allowed: false, blockCode: 'NOT_ARRANGED', blockReason: '尚未安排派送' } } }))
+ const wrapper = mount(DispatchDetailView, options); await flushPromises()
+ expect(wrapper.text()).toContain('尚未安排派送'); expect(wrapper.findAll('button').some(button => button.text() === '确认发车')).toBe(false); wrapper.unmount()
+ })
+ it('retains a real API failure and exposes retry rather than rendering a successful empty detail', async () => {
+ vi.mocked(getDispatch).mockRejectedValueOnce(new Error('permission denied'))
+ const wrapper = mount(DispatchDetailView, options); await flushPromises(); expect(wrapper.text()).toContain('排车详情加载失败，请重试'); expect(wrapper.findAll('[role="tab"]')).toHaveLength(0); wrapper.unmount()
+ })
+ it('keeps the original inquiry return target', async () => {
+ Object.assign(query, { fleetOfferNo: 'FO-1', fleetBookingNo: 'FB-2' }); const wrapper = mount(DispatchDetailView, options); await flushPromises(); await wrapper.get('button.density-back').trigger('click')
+ expect(push).toHaveBeenCalledWith({ name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'FO-1' }, query: { inquiry: 'FB-2' } }); wrapper.unmount()
})
-
})
diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
index 0252ad22..10f9f2ac 100644
--- a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
@@ -1,187 +1,95 @@
-
+
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
index 0ca2c1bc..f650e5b5 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
@@ -1,382 +1,71 @@
import { createPinia } from 'pinia'
-import ElementPlus, { ElMessage, ElFormItem, ElDatePicker, ElSelect, ElCheckbox } from 'element-plus'
-import AppDialog from '@/shared/components/AppDialog.vue'
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
-import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import QueryToolbar, { type QueryModel } from '@/shared/components/QueryToolbar.vue'
-import LoadErrorState from '@/shared/components/LoadErrorState.vue'
-import RowActions from '@/shared/components/RowActions.vue'
-import { cancelDispatch, getDispatchBolPdf, getDispatchExternalFreight, getDispatchFeeCoverage, listDispatches, removeDispatchItem, transferDispatchToDelivery, updateDispatch } from '../api/dispatches'
-import DeliveryFeeCoveragePanel from '../components/DeliveryFeeCoveragePanel.vue'
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
import DispatchesView from './DispatchesView.vue'
-vi.mock('@/modules/warehouses', () => ({
- listAllPlatformWarehouses: vi.fn(async (query: { keyword: string }) => [{ id: query.keyword, warehouseCode: query.keyword, warehouseType: 'FBA' }]),
- getPlatformWarehouse: vi.fn(async (id: string) => ({ warehouse: { warehouseCode: id, warehouseType: id === '321' ? 'OVERSEAS' : 'FBA' }, addresses: [{ addressType: 'OPERATING', addressLine1: '100 Example Street', city: 'City', stateProvince: 'CA', countryCode: 'US' }], capabilities: [] })),
-}))
-
+import QueryToolbar from '@/shared/components/QueryToolbar.vue'
+import RowActions from '@/shared/components/RowActions.vue'
+import { getDispatch, getDispatchBolPdf, listDispatches } from '../api/dispatches'
+import { detail, listRow, page } from '../dispatchTestFixtures'
+import type { DispatchPage } from '../dispatchContracts'
+import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
+const identity = vi.hoisted(() => ({ id: '' }))
const push = vi.hoisted(() => vi.fn())
-vi.mock('vue-router', () => ({ useRouter: () => ({ push }), useRoute: () => ({ query: {} }) }))
-const canPermission = vi.hoisted(() => vi.fn<(permissionCode: string) => boolean>(() => true))
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canPermission }) }))
-vi.mock('../api/dispatches', () => ({ listDispatches: vi.fn(), removeDispatchItem: vi.fn(), getDispatchBolPdf: vi.fn(), getDispatchExternalFreight: vi.fn(), getDispatchFeeCoverage: vi.fn(), updateDispatch: vi.fn(), cancelDispatch: vi.fn(), transferDispatchToDelivery: vi.fn() }))
-
-class ResizeObserverStub implements ResizeObserver {
- observe() {}
- unobserve() {}
- disconnect() {}
-}
-
-function memoryStorage(): Storage {
- const values = new Map()
- return {
- get length() { return values.size },
- clear: () => values.clear(),
- getItem: (key) => values.get(key) ?? null,
- key: (index) => [...values.keys()][index] ?? null,
- removeItem: (key) => values.delete(key),
- setItem: (key, value) => values.set(key, value),
- }
-}
-
-enableAutoUnmount(afterEach)
-afterEach(() => vi.restoreAllMocks())
-afterAll(() => vi.unstubAllGlobals())
-
-const allowedActions = { canEdit: true, editBlockReason: null, canCancel: true, cancelBlockReason: null,
- canRemovePallet: true, removePalletBlockReason: null, canTransfer: true, transferBlockReason: null, outboundNo: null, outboundStatus: null }
-
-describe('DispatchesView', () => {
- beforeEach(() => {
- vi.stubGlobal('ResizeObserver', ResizeObserverStub)
- vi.stubGlobal('localStorage', memoryStorage())
- vi.mocked(listDispatches).mockReset().mockResolvedValue({
- records: [{
- id: '190000000000000099', dispatchNo: 'PC-1', appointmentBatches: [], actions: allowedActions, vehiclePlate: 'CA-100', driverName: '张师傅',
- driverPhone: '555-0100', carrierName: 'Carrier A', orderNos: 'LM-1,LM-2', route: 'ONT8,LAX9',
- overseasWarehouseId: '321', overseasWarehouseName: '洛杉矶仓', departAt: '2026-08-20T09:00:00', fbaAppointmentNo: 'FBA-1',
- fbaAppointmentStatus: 'CONFIRMED', vehicleAppointmentStatus: 'BOOKED', estimatedArrivalAt: '2026-08-20T18:00:00',
- status: 'PENDING_DEPARTURE', palletCount: 12, packageCount: 80, createdAt: '2026-08-19T16:00:00',
- }],
- page: 1, size: 20, total: 1, pages: 1,
- })
- vi.mocked(updateDispatch).mockReset()
- vi.mocked(getDispatchBolPdf).mockReset().mockResolvedValue(new Blob(['%PDF-test'], { type: 'application/pdf' }))
- vi.mocked(removeDispatchItem).mockReset()
- vi.mocked(cancelDispatch).mockReset()
- vi.mocked(transferDispatchToDelivery).mockReset().mockResolvedValue({ dispatchNo: 'PC-1', outboundNo: 'OUT-1', outboundStatus: 'WAIT_OUTBOUND', palletCount: 12, packageCount: 80, deliveries: [], replayed: false })
- vi.mocked(getDispatchExternalFreight).mockReset().mockResolvedValue({ snapshotHash: 'own-hash', requiresDeliveryFee: true, quotes: [] })
- vi.mocked(getDispatchFeeCoverage).mockReset().mockResolvedValue({ dispatchNo: 'PC-1', sourceComplete: true, blockReason: null, cargoHash: 'cargo-hash', cargo: [], feeSources: [] })
- canPermission.mockReset().mockReturnValue(true)
- })
-
-
- it('queries stages on the server and discards an older response after switching', async () => {
- let resolveOld!: (value: Awaited>) => void
- vi.mocked(listDispatches).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await wrapper.get('[role="tablist"]').findAll('button')[2]!.trigger('click')
- await flushPromises()
- expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ stage: 'LOADING', page: 1, status: undefined }))
- expect(wrapper.text()).toContain('PC-1')
- resolveOld({ records: [], total: 0, page: 1, size: 10, pages: 0 })
- await flushPromises()
- expect(wrapper.text()).toContain('PC-1')
- await wrapper.get('[role="tablist"]').findAll('button')[3]!.trigger('click')
- await flushPromises()
- expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ stage: 'AFTER_LOADING', page: 1 }))
- })
-
- it('shows the shared route map only in the after-loading vehicle section without another query', async () => {
- const wrapper = mount(DispatchesView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(wrapper.text()).not.toContain('查看路线')
- await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[3]!.trigger('click')
- await flushPromises()
- const requests = vi.mocked(listDispatches).mock.calls.length
- await wrapper.findAll('button').find(button => button.text() === '查看路线')!.trigger('click')
- await flushPromises()
- expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('modelValue')).toBe(true)
- expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('origin')).toEqual({ kind: 'warehouse', label: '洛杉矶仓', warehouseId: '321' })
- expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('destinations')).toEqual(['ONT8', 'LAX9'].map(code => ({ kind: 'warehouse', label: code, warehouseCode: code })))
- expect(listDispatches).toHaveBeenCalledTimes(requests)
- await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[1]!.trigger('click')
- await flushPromises()
- await wrapper.get('[aria-label="排车业务分区"]').findAll('button')[1]!.trigger('click')
- expect(wrapper.findAll('button').some(button => button.text() === '查看路线')).toBe(false)
- })
-
- it('shows review facts and opens the matching trip section with read permission', async () => {
- const result = await listDispatches({ page: 1, size: 10 })
- result.records[0]!.workflow = { tripNo: 'TR-A', dispatchReview: { status: 'REJECTED', reason: '请核对货量', reviewedAt: null }, loadingReview: { status: 'PENDING', reason: null, reviewedAt: null } }
- vi.mocked(listDispatches).mockClear().mockResolvedValue(result)
- canPermission.mockImplementation(code => code === 'platform:fleet:trip:list')
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- const sections = wrapper.get('[aria-label="排车业务分区"]')
- expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息'])
- await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[1]!.trigger('click')
- await flushPromises()
- expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息', '调度审核', '理货员审核'])
- expect(wrapper.findAll('[role="tablist"]')).toHaveLength(2)
- expect(wrapper.text()).not.toContain('请核对货量')
- await sections.findAll('button')[1]!.trigger('click')
- await flushPromises()
- expect(wrapper.text()).toContain('请核对货量')
- expect(wrapper.findAll('button').some(button => button.text() === '打印BOL')).toBe(false)
- await wrapper.findAll('button').find(button => button.text() === '查看审核')!.trigger('click')
- expect(push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-A' }, query: { tab: 'overview' } })
- await sections.findAll('button')[2]!.trigger('click')
- await flushPromises()
- expect(wrapper.text()).not.toContain('请核对货量')
- expect(wrapper.text()).toContain('待审核')
- const links = wrapper.findAll('button').filter(button => button.text() === '查看审核')
- await links[0]!.trigger('click')
- expect(push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-A' }, query: { tab: 'loading' } })
- expect(wrapper.text()).not.toContain('前往审核')
- expect(listDispatches).toHaveBeenCalledTimes(2)
- })
-
- it.each([0, 2, 3, 4].flatMap(stageIndex => [1, 2].map(sectionIndex => [stageIndex, sectionIndex])))('leaving a review section for stage %s resets section %s to vehicle information', async (stageIndex, sectionIndex) => {
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- const stages = wrapper.get('[aria-label="排车执行阶段"]').findAll('button')
- const sections = wrapper.get('[aria-label="排车业务分区"]')
- await stages[1]!.trigger('click')
- await flushPromises()
- await sections.findAll('button')[sectionIndex]!.trigger('click')
- expect(wrapper.findAll('button').some(button => button.text() === '打印BOL')).toBe(false)
- await stages[stageIndex]!.trigger('click')
- await flushPromises()
- expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息'])
- expect(sections.get('button').attributes('aria-selected')).toBe('true')
- expect(wrapper.findAll('button').some(button => button.text() === '打印BOL')).toBe(true)
- expect(wrapper.findAll('button').some(button => ['前往审核', '查看审核'].includes(button.text()))).toBe(false)
- await stages[1]!.trigger('click')
- await flushPromises()
- expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息', '调度审核', '理货员审核'])
- expect(sections.get('button').attributes('aria-selected')).toBe('true')
- })
-
- it.each([
- [[], ['查看', '打印BOL'], false],
- [['edit'], ['查看', '打印BOL', '编辑'], false],
- [['cancel'], ['查看', '打印BOL', '取消'], false],
- [['transfer-delivery'], ['查看', '打印BOL', '转派送'], false],
- [['edit', 'transfer-delivery'], ['查看', '打印BOL', '转派送', '更多'], true],
- [['edit', 'cancel'], ['查看', '打印BOL', '编辑', '更多'], true],
- [['edit', 'cancel', 'transfer-delivery'], ['查看', '打印BOL', '转派送', '更多'], true],
- ])('uses the row action threshold for permissions %j', async (allowed, labels, overflow) => {
- canPermission.mockImplementation(code => allowed.some(action => code === 'platform:overseas-warehouse:dispatch:' + action))
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- const actions = wrapper.get('.el-table__body-wrapper .density-actions')
- expect(actions.findAll('button').map(button => button.text().trim())).toEqual(labels)
- expect(actions.find('.el-dropdown').exists()).toBe(overflow)
- })
-
- it('keeps the integrated header and filters usable through failure and retry', async () => {
- vi.mocked(listDispatches).mockRejectedValueOnce(new Error('网络错误'))
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- const card = wrapper.get('.data-table--integrated')
- expect(card.get('.data-table__toolbar h1').text()).toBe('排车列表')
- expect(card.get('.data-table__toolbar button[aria-label="列设置"]').text()).toBe('字段设置')
- expect(card.get('.data-table__filters').findComponent(QueryToolbar).exists()).toBe(true)
- expect(card.find('.el-table').exists()).toBe(false)
- expect(card.find('.data-table__pagination').exists()).toBe(false)
- wrapper.findComponent(LoadErrorState).vm.$emit('retry')
- await flushPromises()
- expect(card.find('.data-table__state').exists()).toBe(false)
- expect(card.get('.el-table').text()).toContain('PC-1')
- expect(card.get('.data-table__pagination').text()).toContain('共 1 条排车记录')
- })
-
- it('loads immediately and sends only supported page filters', async () => {
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(listDispatches).toHaveBeenCalledWith({ page: 1, size: 10, dispatchNo: undefined, vehiclePlate: undefined, status: undefined, fbaAppointmentNo: undefined })
-
- const model: QueryModel = {
- dispatchNo: 'PC-1', vehiclePlate: 'CA-100',
- status: 'PENDING_DEPARTURE', fbaAppointmentNo: 'FBA-1',
- }
- wrapper.findComponent(QueryToolbar).vm.$emit('search', model)
- await flushPromises()
-
- expect(listDispatches).toHaveBeenCalledWith({
- page: 1, size: 10, dispatchNo: 'PC-1',
- vehiclePlate: 'CA-100', status: 'PENDING_DEPARTURE', fbaAppointmentNo: 'FBA-1',
- })
- expect(wrapper.text()).toContain('PC-1')
- expect(wrapper.text()).toContain('待发车')
- expect(wrapper.text()).toContain('FBA-1 · 已确认')
- expect(wrapper.text()).toContain('已预约')
- expect(wrapper.get('.data-table').classes()).not.toContain('admin-text-actions')
- expect(wrapper.get('.query-toolbar').classes()).not.toContain('admin-text-actions')
- expect(wrapper.get('.data-table__toolbar button[aria-label="列设置"]').find('svg').exists()).toBe(true)
- expect(wrapper.get('.query-toolbar__actions .el-button--primary').text()).toBe('查询')
- expect(wrapper.get('button[aria-label="上一页"]').find('svg').exists()).toBe(true)
- expect(wrapper.findAll('.query-toolbar__actions button svg')).toHaveLength(3)
- expect(wrapper.get('.el-table__body-wrapper .row-actions').classes()).toContain('admin-text-actions')
- })
-
- it('keeps long dispatch identifiers as strings', async () => {
- vi.mocked(listDispatches).mockResolvedValueOnce({
- records: [{ id: '190000000000000099', dispatchNo: '190000000000000099', appointmentBatches: [] }],
- page: 1, size: 20, total: 1, pages: 1,
- })
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(wrapper.html()).toContain('190000000000000099')
- })
-
- it('opens the server-generated BOL PDF with one request', async () => {
- const pdfWindow = { location: { href: '' }, close: vi.fn() }
- vi.spyOn(window, 'open').mockReturnValue(pdfWindow as unknown as Window)
- vi.stubGlobal('URL', { createObjectURL: vi.fn(() => 'blob:dispatch-bol'), revokeObjectURL: vi.fn() })
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(getDispatchBolPdf).not.toHaveBeenCalled()
-
- await wrapper.findAll('.el-table__body-wrapper button').find((button) => button.text().trim() === '打印BOL')!.trigger('click')
- await flushPromises()
-
- expect(getDispatchBolPdf).toHaveBeenCalledOnce()
- expect(getDispatchBolPdf).toHaveBeenCalledWith('PC-1')
- expect(pdfWindow.location.href).toBe('blob:dispatch-bol')
- })
-
- it('documents the backend feature flag required by a missing endpoint', () => {
- const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/DispatchesView.vue'), 'utf8')
- expect(source).toContain('请确认海外尾程排车接口已发布')
- })
-
- it('uses server blocks even for a pending row and offers the original trip and outbound paths', async () => {
- const result = await listDispatches({ page: 1, size: 10 })
- Object.assign(result.records[0]!, {
- actions: { ...allowedActions, canEdit: false, canCancel: false, canRemovePallet: false, canTransfer: false,
- editBlockReason: '请先在车次 TR-A 中解除关联', cancelBlockReason: '请先在车次 TR-A 中解除关联',
- removePalletBlockReason: '请先在车次 TR-A 中解除关联', transferBlockReason: '原出库已取消，请取消原排车后通过新预排重新安排',
- outboundNo: 'OUT-A', outboundStatus: 'CANCELLED' },
- workflow: { tripNo: 'TR-A', dispatchReview: { status: 'PENDING', reason: null, reviewedAt: null }, loadingReview: { status: 'PENDING', reason: null, reviewedAt: null } },
- })
- vi.mocked(listDispatches).mockClear().mockResolvedValue(result)
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } }); await flushPromises()
- const actions = wrapper.findAllComponents(RowActions).find(item => item.element.closest('.el-table__body-wrapper'))!
- const visible = actions.props('actions').filter(action => action.visible !== false).map(action => action.key)
- expect(visible.filter(key => ['edit', 'cancel', 'transfer'].includes(key))).toEqual([])
- expect(visible).toEqual(expect.arrayContaining(['trip', 'outbound', 'detail']))
- expect(wrapper.text()).toContain('原出库已取消')
- actions.vm.$emit('action', 'edit'); actions.vm.$emit('action', 'transfer'); await flushPromises()
- expect(wrapper.findAllComponents(AppDialog).filter(dialog => ['编辑排车', '转派送'].includes(String(dialog.props('title')))).every(dialog => !dialog.props('modelValue'))).toBe(true)
- actions.vm.$emit('action', 'trip'); await flushPromises()
- expect(push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-A' }, query: { tab: 'overview' } })
- actions.vm.$emit('action', 'outbound'); await flushPromises()
- expect(push).toHaveBeenLastCalledWith({ name: 'overseas-outbounds', query: { documentNo: 'OUT-A' } })
- expect(getDispatchExternalFreight).not.toHaveBeenCalled()
- })
-
- it('keeps write commands closed when action capabilities are missing', async () => {
- const result = await listDispatches({ page: 1, size: 10 })
- delete result.records[0]!.actions
- vi.mocked(listDispatches).mockClear().mockResolvedValue(result)
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } }); await flushPromises()
- expect(wrapper.findComponent(RowActions).props('actions').filter(action => action.visible !== false).map(action => action.key)).toEqual(['detail', 'bol'])
- expect(wrapper.text()).toContain('操作资格暂未返回，请刷新列表')
- })
-
- it.each([
- { replayed: true, outboundStatus: 'WAIT_OUTBOUND', method: 'info' as const, message: '本次未重复生成' },
- { replayed: true, outboundStatus: 'CANCELLED', method: 'warning' as const, message: '请取消原排车后重新预排' },
- ])('reports transfer replay accurately for $outboundStatus', async result => {
- const success = vi.spyOn(ElMessage, 'success'), notice = vi.spyOn(ElMessage, result.method)
- vi.mocked(transferDispatchToDelivery).mockResolvedValue({ dispatchNo: 'PC-1', outboundNo: 'OUT-OLD', palletCount: 1, packageCount: 2, deliveries: [], replayed: result.replayed, outboundStatus: result.outboundStatus })
- vi.mocked(getDispatchExternalFreight).mockResolvedValue({ snapshotHash: 'external-hash', requiresDeliveryFee: false, quotes: [] })
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } }); await flushPromises()
- await wrapper.findAll('button').find(button => button.text() === '转派送')!.trigger('click'); await flushPromises()
- const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title') === '转派送')!
- dialog.findComponent(ElDatePicker).vm.$emit('update:modelValue', '2026-10-03T12:00:00')
- for (const [label, value] of [['派送方式', 'TRUCK_PALLET'], ['提货方式', 'WAREHOUSE_PICKUP'], ['装车类型', 'PALLET']]) {
- dialog.findAllComponents(ElFormItem).find(item => item.props('label') === label)!.findComponent(ElSelect).vm.$emit('update:modelValue', value)
- }
- await flushPromises(); dialog.vm.$emit('confirm'); await flushPromises()
- expect(notice).toHaveBeenCalledWith(expect.stringContaining(result.message))
- expect(success).not.toHaveBeenCalledWith('已生成出库单和派送单')
- })
-
- it('loads external quotes only when opened and submits their hash without a duplicate delivery charge', async () => {
- vi.mocked(getDispatchExternalFreight).mockResolvedValue({ snapshotHash: 'external-hash', requiresDeliveryFee: false, quotes: [
- { bookingNo: 'FB-1', recordVersion: '4', incomingNo: 'WT-1', inboundCode: 'IN-1', customerName: '客户甲', destinationKey: 'FBA:ONT8', currency: 'CNY', amount: 60, quantity: 2, quantityUnit: '托位', unitPrice: 30 },
- ] })
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(getDispatchExternalFreight).not.toHaveBeenCalled()
- await wrapper.findAll('button').find(button => button.text() === '转派送')!.trigger('click')
- await flushPromises()
- expect(getDispatchExternalFreight).toHaveBeenCalledOnce()
- expect(getDispatchExternalFreight).toHaveBeenCalledWith('PC-1')
- const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title') === '转派送')!
- expect(dialog.text()).toContain('FB-1')
- expect(dialog.text()).not.toContain('请输入派送费用')
- dialog.findComponent(ElDatePicker).vm.$emit('update:modelValue', '2026-10-03T12:00:00')
- for (const [label, value] of [['派送方式', 'TRUCK_PALLET'], ['提货方式', 'WAREHOUSE_PICKUP'], ['装车类型', 'PALLET']]) {
- dialog.findAllComponents(ElFormItem).find(item => item.props('label') === label)!.findComponent(ElSelect).vm.$emit('update:modelValue', value)
- }
- await flushPromises()
- dialog.vm.$emit('confirm')
- await flushPromises()
- expect(transferDispatchToDelivery).toHaveBeenCalledWith('PC-1', expect.objectContaining({ fees: [], externalFreightHash: 'external-hash' }))
- })
-
- it('confirms an original delivery fee without submitting a new receivable', async () => {
- vi.mocked(getDispatchFeeCoverage).mockResolvedValue({ dispatchNo: 'PC-1', sourceComplete: true, blockReason: null, cargoHash: 'actual-cargo',
- cargo: [{ dispatchItemId: '201', warehousePalletId: '501', palletNo: 'PLT-1', orderId: '401', sourceRegion: 'FIRSTLEG', sourceInboundId: '11', inboundCode: 'IN-11', packages: 20, dispatchInboundCode: 'IN-11' }],
- feeSources: [{ financeFeeId: '711', sourceFeeId: '811', sourceType: 'INBOUND_FEE', sourceVersion: 3, customerId: '101', sourceInboundId: '11', inboundCode: 'IN-11', feeItemCode: 'FREIGHT', feeItemName: '原运费', currency: 'CNY', amount: 100, sourceHash: 'original-fee-hash', status: 'AVAILABLE' }],
- })
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(getDispatchFeeCoverage).not.toHaveBeenCalled()
- await wrapper.findAll('button').find(button => button.text() === '转派送')!.trigger('click')
- await flushPromises()
- expect(getDispatchFeeCoverage).toHaveBeenCalledTimes(1)
- const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title') === '转派送')!
- await dialog.findComponent(DeliveryFeeCoveragePanel).findAllComponents(ElCheckbox).find(row => row.text() === '已含派送')!.find('input').setValue(true)
- dialog.findComponent(ElDatePicker).vm.$emit('update:modelValue', '2026-10-03T12:00:00')
- for (const [label, value] of [['派送方式', 'TRUCK_PALLET'], ['提货方式', 'WAREHOUSE_PICKUP'], ['装车类型', 'PALLET']]) {
- dialog.findAllComponents(ElFormItem).find(item => item.props('label') === label)!.findComponent(ElSelect).vm.$emit('update:modelValue', value)
- }
- await flushPromises()
- expect(dialog.text()).toContain('本次全部货物已覆盖：派送')
- dialog.vm.$emit('confirm')
- await flushPromises()
- expect(transferDispatchToDelivery).toHaveBeenCalledWith('PC-1', expect.objectContaining({ fees: [], feeCoverageCargoHash: 'actual-cargo', feeCoverage: [{ financeFeeId: '711', sourceVersion: 3, sourceHash: 'original-fee-hash', services: ['DELIVERY_FEE'] }] }))
- })
-
- it('gates edit, cancel, pallet removal and transfer with independent permissions and server capabilities', async () => {
- const source = readFileSync(resolve(process.cwd(), 'src/modules/overseas-warehouse/pages/DispatchesView.vue'), 'utf8')
- expect(source).toContain('permission.dispatchEdit')
- expect(source).toContain('permission.dispatchCancel')
- expect(source).toContain('permission.dispatchTransferDelivery')
- expect(source).toContain("import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'")
- expect(source).toContain("{ key: 'transfer', label: '转派送', priority: 250")
- expect(source).toContain('access.can(permission.dispatchEdit) && row.actions?.canEdit === true')
- expect(source).toContain('access.can(permission.dispatchCancel) && row.actions?.canCancel === true')
- expect(source).toContain('access.can(permission.dispatchTransferDelivery) && row.actions?.canTransfer === true')
- expect(source).toContain('access.can(permission.dispatchEdit) && row.actions?.canRemovePallet === true')
- expect(source).toContain('!canRemovePallet(editRow.value)')
- expect(source).toContain('removeDispatchItem')
- expect(source).not.toContain('托盘箱唛确认')
- expect(source).not.toContain('palletCartonMarks')
- expect(source).toContain('v-model="editForm.route" readonly')
- expect(source).not.toContain('route: editForm.route.trim()')
- expect(source).toContain('dispatchVehicleSizeOptions')
- expect(source).not.toContain('departDispatch')
-
- canPermission.mockReturnValue(false)
- const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
- await flushPromises()
- expect(wrapper.text()).not.toContain('转派送')
- })
+const can = vi.hoisted(() => vi.fn(() => true))
+vi.mock('vue-router', () => ({ useRoute: () => ({ query: {} }), useRouter: () => ({ push }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
+vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
+vi.mock('@/modules/appointment-calendar', () => ({ appointmentReturnTarget: () => null }))
+vi.mock('@/modules/overseas-master-data', () => ({ TransportRouteDialog: { template: '' }, routeLocation: (label: string) => ({ label }) }))
+vi.mock('../api/dispatches', () => ({ listDispatches: vi.fn(), getDispatch: vi.fn(), getDispatchBolPdf: vi.fn() }))
+const options = { global: { plugins: [createPinia(), ElementPlus], stubs: { SmartDispatchDialog: true, DispatchWorkflowDialog: true } } }
+beforeEach(() => { vi.clearAllMocks(); identity.id = crypto.randomUUID(); sessionStorage.clear(); can.mockReturnValue(true); vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} }); localStorage.clear(); vi.mocked(listDispatches).mockResolvedValue(page()); vi.mocked(getDispatch).mockResolvedValue(detail()) })
+it('offers recovery of the original pending command independently of the filtered list rows', async () => {
+ const pending = useDispatchCommandRecovery(() => identity.id); pending.begin('PC-OTHER', 'DEPART', { recordVersion: 0, idempotencyKey: 'original-key' })
+ const wrapper = mount(DispatchesView, options); await flushPromises()
+ expect(wrapper.text()).toContain('PC-OTHER 的确认发车结果尚待核对')
+ await wrapper.findAll('button').find(button => button.text() === '核对原请求')!.trigger('click')
+ const dialog = wrapper.get('dispatch-workflow-dialog-stub')
+ expect(dialog.attributes('dispatchno')).toBe('PC-OTHER'); expect(dialog.attributes('modelvalue')).toBe('true'); wrapper.unmount()
+})
+it('shows exactly five phases and uses server stage counts instead of current page length', async () => {
+ const wrapper = mount(DispatchesView, options); await flushPromises()
+ const tabs = wrapper.get('[aria-label="排车执行阶段"]').findAll('button')
+ expect(tabs.map(tab => tab.text())).toEqual(['装车前 3', '装车中 1', '装车后 1', '派送中 1', '派送完成 1'])
+ expect(listDispatches).toHaveBeenCalledWith(expect.objectContaining({ stage: 'BEFORE_LOADING', status: 'ACTIVE', beforeLoadingSection: 'VEHICLE_INFO' }))
+ await tabs[3]!.trigger('click'); await flushPromises()
+ expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ stage: 'DELIVERING' })); expect(wrapper.find('[aria-label="装车前审核分区"]').exists()).toBe(false); wrapper.unmount()
+})
+it('queries each review section on the server and includes only its legal review filter', async () => {
+ const wrapper = mount(DispatchesView, options); await flushPromises()
+ await wrapper.get('[aria-label="装车前审核分区"]').findAll('button')[1]!.trigger('click'); await flushPromises()
+ expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ beforeLoadingSection: 'DISPATCH_REVIEW' }))
+ wrapper.getComponent(QueryToolbar).vm.$emit('search', { status: 'ACTIVE', reviewStatus: 'PENDING', dispatchNo: '', vehiclePlate: '' }); await flushPromises()
+ expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ reviewStatus: 'PENDING' })); wrapper.unmount()
+})
+it('discards a late page response after switching phase', async () => {
+ let old!: (value: DispatchPage) => void
+ vi.mocked(listDispatches).mockImplementationOnce(() => new Promise(resolve => { old = resolve }))
+ const wrapper = mount(DispatchesView, options)
+ await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[1]!.trigger('click'); await flushPromises()
+ old(page([])); await flushPromises(); expect(wrapper.text()).toContain('PC/1'); wrapper.unmount()
+})
+it('gates every mutation with both its literal service capability and independent permission', async () => {
+ vi.mocked(listDispatches).mockResolvedValue(page([listRow({ actions: { DEPART: { allowed: false, blockReason: '未安排', blockCode: 'NO' }, EDIT: { allowed: true, blockCode: null, blockReason: null } } })]))
+ const wrapper = mount(DispatchesView, options); await flushPromises()
+ const actions = wrapper.findAllComponents(RowActions).find(entry => entry.props('moreLabel') === '更多操作 · PC/1')!.props('actions') as Array<{ key: string }>
+ expect(actions.map(row => row.key)).toContain('EDIT'); expect(actions.map(row => row.key)).not.toContain('DEPART')
+ can.mockReturnValue(false); wrapper.unmount()
+ const readonly = mount(DispatchesView, options); await flushPromises(); expect((readonly.findAllComponents(RowActions).find(entry => entry.props('moreLabel') === '更多操作 · PC/1')!.props('actions') as Array<{ key: string }>).map(row => row.key)).toEqual(['detail', 'bol']); readonly.unmount()
+})
+it('keeps server errors visible with the integrated query and retry context', async () => {
+ vi.mocked(listDispatches).mockRejectedValueOnce(new Error('service unavailable'))
+ const wrapper = mount(DispatchesView, options); await flushPromises(); expect(wrapper.text()).toContain('排车列表加载失败，请重试'); expect(wrapper.findComponent(QueryToolbar).exists()).toBe(true); wrapper.unmount()
+})
+it('navigates by the business number without arranging a separate trip', async () => {
+ const wrapper = mount(DispatchesView, options); await flushPromises(); wrapper.findAllComponents(RowActions).find(entry => entry.props('moreLabel') === '更多操作 · PC/1')!.vm.$emit('action', 'detail'); await flushPromises()
+ expect(push).toHaveBeenCalledWith({ name: 'overseas-dispatch-detail', params: { dispatchNo: 'PC/1' } }); expect(wrapper.text()).not.toContain('安排车次'); wrapper.unmount()
+})
+it('reads one BOL on demand and preserves popup failure handling', async () => {
+ vi.stubGlobal('open', vi.fn().mockReturnValue(null)); const wrapper = mount(DispatchesView, options); await flushPromises(); wrapper.findAllComponents(RowActions).find(entry => entry.props('moreLabel') === '更多操作 · PC/1')!.vm.$emit('action', 'bol'); await flushPromises(); expect(getDispatchBolPdf).not.toHaveBeenCalled(); wrapper.unmount()
})
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.vue b/src/modules/overseas-warehouse/pages/DispatchesView.vue
index d9c97939..c2b45952 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.vue
@@ -1,743 +1,127 @@
-
-
- 返回预约工作 安排车次
-
+ 返回预约工作 新建排车
+ {{ row.workflow.tripNo }}
- {{ row.workflow?.tripNo || '未关联车次' }}
-
-
-
- 查看路线
- 共 {{ total }} 条排车记录
+
{{ row.resources.driver?.phone || '—' }} +查看路线
- 移除 ([])
const selectedRows = ref([])
@@ -145,6 +146,7 @@ function openAppointment() {
}
function openSmartDispatch() {
+ if (!canCreateDispatch.value) return
smartDispatchOpen.value = true
}
@@ -234,7 +236,7 @@ onMounted(() => { void load() })
查看 编辑 查看预约 预约 管理多批预约
共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
index 25c76e1a..9e2dd673 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
@@ -307,9 +307,9 @@ describe('LastMileOrdersView pending order and container conversion', () => {
it.each([
[[], ['查看'], false],
- [['inbound-order:create'], ['查看', '生成入库计划'], false],
- [['last-mile-order:edit'], ['查看', '人工修改节点'], false],
- [['inbound-order:create', 'last-mile-order:edit'], ['查看', '生成入库计划', '人工修改节点'], false],
+ [['inbound-order:create'], ['查看', '入库'], false],
+ [['last-mile-order:edit'], ['查看', '修改节点'], false],
+ [['inbound-order:create', 'last-mile-order:edit'], ['查看', '入库', '修改节点'], false],
])('only collapses row actions above three for %j', async (allowed, labels, overflow) => {
canAccess.mockImplementation(code => allowed.some(action => code === 'platform:overseas-warehouse:' + action))
vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{ id: 'order-1', customerId, orderNo: 'LM-1', currentStatus: 'PENDING_ASSIGNMENT', orderType: 'FIRST_LEG' }], page: 1, size: 10, total: 1, pages: 1 })
@@ -469,11 +469,11 @@ describe('LastMileOrdersView pending order and container conversion', () => {
const wrapper = await mountView()
const actions = wrapper.get('.el-table__body-wrapper .row-actions')
expect(actions.text()).toContain('查看')
- expect(actions.text()).not.toContain('生成入库计划')
+ expect(actions.text()).not.toContain('入库')
expect(actions.text()).not.toContain('暂扣订单')
await selectRows(wrapper, [(wrapper.findComponent(DataTable).props('data') as object[])[0]])
- expect((button(wrapper, '生成入库计划')!.element as HTMLButtonElement).disabled).toBe(true)
+ expect((button(wrapper, '入库')!.element as HTMLButtonElement).disabled).toBe(true)
})
it('keeps the original pending order table and does not render a view switch or container table', async () => {
@@ -481,7 +481,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
expect(wrapper.text()).toContain('尾程单号')
expect(wrapper.text()).toContain('海外仓')
expect(wrapper.text()).toContain('转仓')
- expect(wrapper.text()).toContain('生成入库计划')
+ expect(wrapper.text()).toContain('入库')
expect(wrapper.text()).toContain('按柜批量生成')
expect(wrapper.text()).not.toContain('按订单')
expect(wrapper.text()).not.toContain('待分配整柜')
@@ -545,7 +545,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
it('opens the required single-order inbound-plan form without invoking the cabinet conversion', async () => {
const wrapper = await openPending()
await selectRows(wrapper, [selectedRow()])
- await button(wrapper, '生成入库计划')!.trigger('click')
+ await button(wrapper, '入库')!.trigger('click')
await flushPromises()
expect(document.body.textContent).toContain('计划入库仓')
expect(document.body.textContent).toContain('预计到仓时间')
@@ -572,7 +572,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
it('shows cabinet-frozen facts but never sends arrival time or per-order warehouse overrides', async () => {
const wrapper = await openPending()
await selectRows(wrapper, [selectedRow()])
- await button(wrapper, '生成入库计划')!.trigger('click')
+ await button(wrapper, '入库')!.trigger('click')
await flushPromises()
const confirm = [...document.body.querySelectorAll('button')]
.find((item) => item.textContent?.includes('保存并生成入库单')) as HTMLButtonElement
@@ -598,7 +598,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
orderTypeCode: 'ONE_CLICK_DROPSHIP',
currentStatusCode: 'PENDING_ASSIGNMENT',
})])
- await button(wrapper, '生成入库计划')!.trigger('click')
+ await button(wrapper, '入库')!.trigger('click')
await flushPromises()
expect(getContainerInboundPlanPreview).not.toHaveBeenCalled()
@@ -610,7 +610,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
it('blocks manual plan creation when the cabinet has no frozen expected arrival time', async () => {
const wrapper = await openPending()
await selectRows(wrapper, [selectedRow({ estimatedWarehouseAt: '', warehouseEta: '—' })])
- await button(wrapper, '生成入库计划')!.trigger('click')
+ await button(wrapper, '入库')!.trigger('click')
await flushPromises()
const confirm = [...document.body.querySelectorAll('button')]
@@ -634,7 +634,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
} as never)
const wrapper = await openPending()
await selectRows(wrapper, [selectedRow({ orderTypeCode: 'ONE_CLICK_DROPSHIP', pallets: 2 })])
- await button(wrapper, '生成入库计划')!.trigger('click')
+ await button(wrapper, '入库')!.trigger('click')
await flushPromises()
const palletInput = wrapper.find('.command-form').findComponent({ name: 'ElInputNumber' })
@@ -944,7 +944,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
it('starts cabinet plan generation directly from the workbench card', async () => {
const wrapper = await mountView()
await openHiddenContainerWorkbench(wrapper)
- await button(wrapper, '生成入库计划')!.trigger('click')
+ await button(wrapper, '入库')!.trigger('click')
await flushPromises()
expect(document.body.textContent).toContain('头程已有 4 个托盘码，海外仓补充 1 个，最终生成 5 个托盘')
expect(document.body.textContent).toContain('头程已有 4 托 / 海外仓补充 1 托')
@@ -974,7 +974,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
await openHiddenContainerWorkbench(wrapper)
expect(wrapper.text()).toContain('柜内接柜仓业务快照不一致')
- expect((button(wrapper, '生成入库计划')!.element as HTMLButtonElement).disabled).toBe(true)
+ expect((button(wrapper, '入库')!.element as HTMLButtonElement).disabled).toBe(true)
await wrapper.get('.container-workbench-card__detail').trigger('click')
await flushPromises()
expect(getContainerPlanProgress).toHaveBeenCalledWith(bookingId)
@@ -1183,7 +1183,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
const wrapper = await mountView()
await selectRows(wrapper, [selectedRow({ orderTypeCode: 'RETURN_RELABEL', currentStatusCode: 'INBOUND_COMPLETED', sourceOrderNo: 'RETURN-1' })])
const actions = wrapper.get('.data-table__business-actions')
- expect(actions.text()).not.toContain('生成入库计划')
+ expect(actions.text()).not.toContain('入库')
const packing = actions.findAll('button').find(action => action.text().includes('创建退货合箱计划（1）'))!
await packing.trigger('click')
await flushPromises()
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
index e11f1441..b91fc0e1 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
@@ -1000,9 +1000,9 @@ function lastMileRowActions(row: LastMileOrderListItem): RowActionItem[] {
{ key: 'review-direct-relabel', label: '审核', priority: 470, tone: 'warning', visible: access.can(permission.lastMileOrderTransfer) && row.orderTypeCode === 'RELABEL_APPLICATION' && row.currentStatusCode === 'PENDING_REVIEW' },
{ key: 'review-return', label: '审核', priority: 460, tone: 'warning', visible: access.can(permission.returnOrderReview) && row.orderTypeCode === 'RETURN_RELABEL' && row.currentStatusCode === 'PENDING_REVIEW' },
{ key: 'review', label: '审核', priority: 450, tone: 'warning', visible: access.can(permission.warehouseTransferApprove) && row.orderTypeCode === 'WAREHOUSE_TRANSFER' && row.currentStatusCode === 'PENDING_REVIEW' },
- { key: 'inbound-plan', label: '生成入库计划', priority: 400, visible: access.can(permission.inboundOrderCreate) && canGenerateInboundPlan(row) && !inboundPlanCreated },
+ { key: 'inbound-plan', label: '入库', priority: 400, visible: access.can(permission.inboundOrderCreate) && canGenerateInboundPlan(row) && !inboundPlanCreated },
{ key: 'hold', label: row.detained ? '解除暂扣' : '暂扣订单', priority: 300, tone: 'warning', visible: access.can(permission.lastMileOrderTransfer) && (row.detained || row.currentStatusCode === 'INBOUND_COMPLETED') },
- { key: 'manual-nodes', label: '人工修改节点', priority: 200, visible: access.can(permission.lastMileOrderTransfer) },
+ { key: 'manual-nodes', label: '修改节点', priority: 200, visible: access.can(permission.lastMileOrderTransfer) },
{ key: 'confirm-relabel', label: '换标完成确认', priority: 150, visible: access.can(permission.relabelOrderStatus) && Boolean(row.relabelOrderNo) && canConfirmRelabel(row) },
{ key: 'rework-relabel', label: '换标退回重做', priority: 100, tone: 'danger', divided: true, visible: access.can(permission.relabelOrderStatus) && canReworkRelabel(row) },
]
@@ -1124,7 +1124,7 @@ onMounted(() => { void load() })
- {{ container.resourcePendingPlanCount && !container.pendingPlanCount ? '重试生成托盘码' : '生成入库计划' }}
+ {{ container.resourcePendingPlanCount && !container.pendingPlanCount ? '重试生成托盘码' : '入库' }}
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/overseas-master-data/index.ts b/src/modules/overseas-master-data/index.ts
index 1e1acf6b..0be6075b 100644
--- a/src/modules/overseas-master-data/index.ts
+++ b/src/modules/overseas-master-data/index.ts
@@ -10,3 +10,6 @@ export { default as TripDispatchSelector } from './components/TripDispatchSelect
export { listTripDispatchCandidates, prepareTrip, type TripPreparation, type DispatchCandidate } from './api/trips'
export type { TripPreviousDispatch } from './tripTypes'
+export { listVehicles } from './api/overseasMasterData'
+export { listDrivers } from './api/drivers'
+export type { DriverDetail } from './driverTypes'
diff --git a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
index c803d2fb..2d799deb 100644
--- a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
@@ -89,7 +89,7 @@ watch([page, size], loadInquiries)
onBeforeUnmount(() => { followupSequence++; sequence++; inquirySequence++ })
{{ section.title }}
+
+ {{ number(summary.physicalPallets) }} 托
+ {{ number(destinationCount) }} 个目的地
+
+ {{ section.active.label }} {{ number(amount(section.active.label)!.amount, true) }}
+ —
+
+
+ {{ section.active.unit }} {{ number(section.active.points[section.active.points.length - 1]!.value, true) }}
+ —
+
+
+
+ {{ series.label }}
+
+
+
+ +{{ section.active.points.length - 5 }}
+
+
+ 暂无对应统计
+
+
+
+
+
+
+ {{ section.title }}
+{{ section.note }}
+各日均价按确认计价托位加权，排除整单报价；不将每日均价相加或简单平均为期间均价。
+暂无对应统计
+| {{ section.key === 'destinations' ? '目的地' : '日期（UTC）' }} | 数值 |
|---|---|
| {{ point.label }} | {{ number(point.value, section.money) }} |
{{ detail?.offer.offerNo || '运力发布详情' }}
{{ offerStatusLabels[detail.offer.status] }}{{ detail?.offer.offerNo || '运力发布详情' }}
{{ offerStatusLabels[detail.offer.status] }}- 车次号
{{ detail.offer.tripNo }} {{ detail.offer.tripNo }}- 起运仓
- {{ detail.offer.warehouseName }}
- 计划发车
- {{ offerTime(detail.offer.plannedDepartureAt) }}
- 最晚送仓
- {{ offerTime(detail.offer.cutoffAt) }}
- 调度联系人
- {{ detail.offer.contactName || '—' }}
- 调度联系方式
- {{ detail.offer.contactPhone || '—' }}
拼车接货
散板需求
-
+
@@ -142,7 +142,7 @@ watch([tab, page, size], load); onMounted(load); onBeforeUnmount(() => { followu
{{ applied.scope === 'TODO' ? '待我处理' : applied.scope === 'ALL' ? '全部登记' : '我的登记' }}
-
+
diff --git a/src/modules/overseas-master-data/pages/FleetReportingViews.test.ts b/src/modules/overseas-master-data/pages/FleetReportingViews.test.ts
index b04bbf60..08edfa7b 100644
--- a/src/modules/overseas-master-data/pages/FleetReportingViews.test.ts
+++ b/src/modules/overseas-master-data/pages/FleetReportingViews.test.ts
@@ -2,6 +2,8 @@ import { afterEach, expect, it, vi } from 'vitest'
import { shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
import FleetQuotesView from './FleetQuotesView.vue'
import TripOperationsView from './TripOperationsView.vue'
+import QueryToolbar from '@/shared/components/QueryToolbar.vue'
+import TripOperationsCharts from '../components/TripOperationsCharts.vue'
import * as quotes from '../api/fleetQuotes'
import * as reports from '../api/tripOperations'
vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (p: string) => p.endsWith(':list') }) }))
@@ -9,10 +11,10 @@ vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
vi.mock('../api/fleetQuotes', () => ({ listFleetQuotes: vi.fn(), setFleetQuoteStatus: vi.fn(), deleteFleetQuote: vi.fn(), exportFleetQuotes: vi.fn(), saveFleetCsv: vi.fn() }))
vi.mock('../api/tripOperations', () => ({ listTripOperations: vi.fn(), exportTripOperations: vi.fn() }))
const wrappers: VueWrapper[] = []
-const layout = { template: '出车数据统计
+
+ {{ loading ? '正在更新…' : displayedRange }}
+ {{ statisticsOpen ? '收起详情' : '统计详情' }}
+
+
+ 实际出车 {{ result.summary.trips }} 次在途 {{ result.summary.inTransit }} 次货物结案 {{ result.summary.completed }} 次
+
+ 已登记直接成本：{{ result.summary.costs.totals.length ? result.summary.costs.totals.map(c => `${c.currency} ${c.directCost.toFixed(2)}`).join(' / ') : '—' }}；未登记 {{ result.summary.costs.unrecordedTrips ?? '—' }} 趟，已登记但未能分摊 {{ result.summary.costs.unallocatedTrips ?? '—' }} 趟。
+按实际发车时间查询，每趟车只计一次；货源筛选展示含该类货物的整趟车。物理托盘去重；同车多站可分别计入目的地。外接约定金额不代表应收或实收，结案不代表车辆与司机已释放。
+{{ loading ? '正在加载出车统计…' : '暂无统计数据' }}
+出车记录
-
-
-
+
- 实际出车 {{ result.summary.trips }} 次在途 {{ result.summary.inTransit }} 次货物结案 {{ result.summary.completed }} 次
- 实物托盘 {{ result.summary.physicalPallets }} 托外接约定 {{ money(result.summary.externalAgreedAmounts) }}
-
- 已登记直接成本：{{ result.summary.costs.totals.length ? result.summary.costs.totals.map(c => `${c.currency} ${c.directCost.toFixed(2)}`).join(' / ') : '—' }}；未登记 {{ result.summary.costs.unrecordedTrips }} 趟，已登记但未能分摊 {{ result.summary.costs.unallocatedTrips }} 趟。
-按实际发车时间查询，每趟车只计一次；货源筛选展示含该类货物的整趟车。约定金额不代表应收或实收，结案不代表车辆与司机已释放。
-{{ previewGroup.customerName || '—' }} · {{ previewGroup.destination.warehouseCode || previewGroup.destination.warehouseName || previewGroup.destination.address || '—' }}
+{{ reason }}
+
+
+ {{ quote.bookingNo }} · {{ quote.inboundCode }}：{{ quote.currency }} {{ quote.amount }}（外接约定运费）
+原费用覆盖
暂无可引用原费用。
+{{ fee.currency }} {{ fee.amount }} · {{ fee.status }}已包含{{ serviceLabels[service] || '服务费用' }}
+ 本组新增费用
本组{{ serviceLabels[fee.feeType] || fee.feeName }}已全部覆盖，不重复登记。
{{ label }}
+{{ error.message }}
- {{ metadata[id]?.fileName || '附件资料待核实' }}
预览 替换 移除引用
暂无本趟附件。
PDF、JPG、PNG，单文件最大10MiB；上传后保存车辆信息才完成本车引用。
+正在读取本车附件…
{{ error }}
+
+
+ 临时资料仅用于本趟，不创建档案。先保存排车单，再在本车维护中上传本趟证据；资料齐备后由调度核实审核。
+ + diff --git a/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts b/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts new file mode 100644 index 00000000..599aa8d5 --- /dev/null +++ b/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts @@ -0,0 +1,141 @@ +import ElementPlus, { ElMessage } from 'element-plus' +import { ApiResponseError, http } from '@/shared/api/http' +import { parseApiJsonResponse } from '@chongchong/shared' +import { flushPromises, mount } from '@vue/test-utils' +import { beforeEach, expect, it, vi } from 'vitest' +import DispatchWorkflowDialog from './DispatchWorkflowDialog.vue' +import * as api from '../api/dispatches' +import { candidate, command, detail, destination, loadingPreview, page } from '../dispatchTestFixtures' +import type { ArrangeGroup, CargoLine, CommandResult, DispatchAction, DispatchDetail, PreviewGroup } from '../dispatchContracts' +const identity = vi.hoisted(() => ({ id: '' })) +vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) })) +vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) })) +vi.mock('./DispatchResourceFields.vue', () => ({ default: { template: '' } })) +vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchArrangement: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), departDispatch: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn(), transferDispatchToDelivery: vi.fn() })) +interface State { submit(): Promise排车单号 {{ currentNo || '—' }}
原操作结果尚待核对，当前使用原版本和原请求内容。
+{{ detail?.actions[currentAction]?.blockReason || '当前操作资格未返回，请刷新核对' }}
+起运仓：{{ route.stops[0]?.name || '—' }} · {{ route.stops[0]?.address || '—' }}
{{ route.edit.blockReason || '仅调整本车既有卸货点，外接卸货点一并保留。调整后须重新审核。' }}
- {{ stop.name }} · {{ stop.address || '—' }}
上移 下移
{{ detail.vehicleInfo.vehicle?.plate || '—' }} · {{ detail.vehicleInfo.driver?.name || '—' }} · {{ detail.counts.palletCount }}托／{{ detail.counts.packageCount }}箱
{{ appointment.destinationWarehouseCode }} · {{ appointment.appointmentNo || '—' }} · {{ appointment.status }}
请核对本车资源与本趟证据；审核通过不代替后续现场扫码。
{{ preview.loadingComplete.blockReason || 'PDA真实拣货已核平，请核对每托实际装载。' }}
{{ pallet.palletNo }}：{{ evidence.actual ? '实测依据' : '仅供参考' }} {{ evidence.sourceBusinessNo || '—' }} {{ evidence.value ?? '—' }}；
+确认本车实际发车。装车完成及全部客户派送安排由服务端再次核验。
仅零真实扫码允许退回装车前，保留原排车号，修改后两级审核重新提交。
确认取消本排车单；服务端将核对真实作业和来源占用，不自动回库。
+仅展示客户已确认、卡车派送且尚未排车的换标单。必须一次选择本申请全部应排托盘并放入同一装车容器。换标选择仅保留在当前页面，尚未锁定；刷新页面后需重新选择，提交时由服务端重新校验。
- - - -正在恢复排车草稿，请稍候…
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
- - 出库单列表 ({{ orderGroups.length }}单) -
-
-
-
-
-
- {{ row.first.sourceStage === 'RELABEL' ? text(row.first.orderRefs) : '—' }}
- {{ text(row.first.inboundCode) }}
- {{ orderType(row.first.orderType) }}
- {{ formatWeightLb(orderWeightLb(row.pallets)) }}
- {{ row.pallets.length }}
- {{ text(row.first.fbaWarehouseCode) }}
- {{ privateWarehouse(row.first) }}
- {{
- number(
- row.pallets.reduce((sum: number, item: DispatchPalletCandidateDto) => sum + Number(item.volumeCbm || 0), 0),
- 2,
- )
- }}
- {{ text(row.first.containerNo) }}
- {{ dateTime(row.first.appointmentAt) }}
- {{ dateTime(row.first.expectedLoadingAt) }}
-
-
- - 托盘明细 - {{ activePallets.length ? `(${activePallets.length}托)` : '' }} -
- 订单号：
-
-
- {{ item.sourceStage === 'RELABEL' ? '已选择，尚未锁定' : '已锁定' }}
-
- 移入
- 装车托盘 {{ index + 1 }}（{{ container.palletIds.length }}/{{ container.capacity }}）
-
-
- {{ text(item.palletNo) }}{{ Number(item.packageCount || 0) }}箱 · {{ formatWeightLb(weightLb(item)) }}
- 退回实收：{{ text(item.returnReceiptNo) }}
-
-
-
-
- {{ mark }}换标
-
- 原请求结果尚待核对，请勿更改选择、版本或重新建单。
当前编辑：{{ draft?.containers.find(row => row.draftContainerId === activeContainerId)?.sequenceNo ? `装车组 ${draft.containers.find(row => row.draftContainerId === activeContainerId)!.sequenceNo}` : '请先选择装车组' }}；每组车辆、司机和时间独立保存。
空单可先保存，之后添加同仓各客户货物；空单不能核平、装车或发车。
+{{ row.selection.relabelNo || row.planNo || '—' }}
仅供预排参考
- {{ draft?.sources.find(row => row.sourceKey === key)?.palletNo || '来源待恢复' }}
移除货物
新建或恢复草稿后添加装车组。同仓可混装多个客户与目的仓。
- 处理原车次 {{ detail.workflow.tripNo }} 查看原出库 {{ detail.actions.outboundNo }} {{ dispatchActionLabels[value] }} 调整卸货顺序
+ 车辆信息
+ 排车信息
+ 单据信息
+ 查看出库 {{ outbound.outboundNo }}
+
+ 关联订单明细
+
+ {{ reason }}
-
- 车辆信息
- {{ field.label }}
- {{ field.value }}
排车信息
- {{ field.label }}
- {{ field.value }}
单据信息
- {{ field.label }}
- {{ field.value }}
关联订单明细
{{ reason }}
- {{ field[0] }}
- {{ field[1] }}
- {{ field[0] }}
- {{ field[1] }}
- {{ field[0] }}
- {{ field[1] }}
- 关联派送单
{{ delivery.deliveryNo }} {{ text(delivery.deliveryNo) }}—
排车列表
-
+
-
-
-
-
-
- {{ recovery.pending.value.dispatchNo || '新排车单' }} 的{{ dispatchActionLabels[recovery.pending.value.action] }}结果尚待核对。
排车列表
+{{ reason }}
- -{{ reviewLabels[(row as DispatchListItem).workflow![review].status] }}
- {{ row.workflow[review].reason || '—' }}
- {{ formatOverseasDateTime(row.workflow[review].reviewedAt) }}
-
- 未关联车次
-
- 操作资格未返回，请刷新核对
+ {{ row.resources.vehicle?.plate || '—' }}{{ row.resources.driver?.name || '—' }}{{ row.resources.driver?.phone || '—' }} +
{{ reviewLabels[review.status as ReviewStatus] }}
{{ review.reason }}
{{ review.invalidatedReason }}
{{ time(review.reviewedAt) }}
+ {{ row.counts.palletCount }}托／{{ row.counts.packageCount }}箱／已拣{{ row.counts.pickedPackageCount }}箱{{ time(row.plannedDepartureAt) }}{{ time(row.departedAt) }}{{ row.status === 'CANCELLED' ? '已取消' : stageLabel(row.stage) }}派送信息
本次全部货物已覆盖：{{ coveredServices.map(service => coveredServiceLabels[service]).join('、') }}，无需重复登记对应应收。
本次新增费用
正在读取约定运费…
{{ quote.bookingNo }} · {{ quote.incomingNo }}：{{ quote.quantity }} {{ quote.quantityUnit }} × {{ quote.currency }} {{ quote.unitPrice }} = {{ quote.currency }} {{ quote.amount }}（外接约定运费）
{{ editRow.actions.removePalletBlockReason }}
已排车托盘
{{ application.relabelNo }}
{{ row.relabelOrderNo }}
{{ application.statusLabel }}
{{ row.relabelStatus }}
尾程单号{{ actionTarget?.orderNo || '—' }}
节点节点时间
{{ node.label }}
{{ day }}
-
+
所选时段包含今日（{{ data.context.anchorDate }}），尚不满足完整自然日要求，库存消化天数与两个库存榜单暂不能完成评估。可选择截至昨日的自定义时段；仍需满足销量覆盖、库存及观察期条件。
销量有变动，待重新统计发布。出库趋势展示已发布版本的历史覆盖结果；库存评估等待新版销量发布。
-
{{ metric.key === 'intervalOutboundQuantity' && data.kpis[metric.key].dataStatus !== 'COMPLETE' ? '区间已采集出库量' : metric.label }}
{{ quantityText(metric.key === 'intervalOutboundQuantity' && data.kpis[metric.key].dataStatus !== 'COMPLETE' ? data.kpis[metric.key].observedQuantity : data.kpis[metric.key].value) }} {{ metric.key === 'averageDailyOutboundQuantity' ? '件／日' : data.kpis[metric.key].unit === 'SKU' ? 'SKU' : '件' }}
{{ contextExpired || metric.inventory && stockExpired ? '历史／待刷新 · ' : '' }}{{ label(data.kpis[metric.key].dataStatus) }}
已知小计 {{ quantityText(data.kpis[metric.key].knownSubtotal) }}
另 {{ quantityText(data.kpis[metric.key].unknownSkuCount) }} SKU 待核验
{{ reasonsText(data.kpis[metric.key].reasonCodes) }}{{ metric.key === 'intervalOutboundQuantity' && data.kpis[metric.key].dataStatus !== 'COMPLETE' ? '区间已采集出库量' : metric.label }}
{{ metric.key === 'averageDailyOutboundQuantity' ? averageDailyText(data.kpis[metric.key].value) : quantityText(metric.key === 'intervalOutboundQuantity' && data.kpis[metric.key].dataStatus !== 'COMPLETE' ? data.kpis[metric.key].observedQuantity : data.kpis[metric.key].value) }} {{ metric.key === 'averageDailyOutboundQuantity' ? '件／日' : data.kpis[metric.key].unit === 'SKU' ? 'SKU' : '件' }}
{{ contextExpired || metric.inventory && stockExpired ? '历史／待刷新 · ' : '' }}{{ label(data.kpis[metric.key].dataStatus) }}
已知小计 {{ quantityText(data.kpis[metric.key].knownSubtotal) }}
另 {{ quantityText(data.kpis[metric.key].unknownSkuCount) }} SKU 待核验
{{ reasonsText(data.kpis[metric.key].reasonCodes) }}{{ editor.title }}
+
+
+
+
+
+
+
+
| 业务 | {{ editor.title }} |
|---|
自动计划为到港日期加2个自然日；人工保存后优先使用人工时间。填写接仓地点当地时间。
- +上次提交结果尚未确认，请使用原请求重试，避免重复修改。
重试将重新读取当前资格和版本并保留输入，核对后再次点击保存。
- +预约已保存：{{ created.appointmentNo || '预约编号未返回' }}
-预约保存后仍需在原业务安排车辆，日历中的排车以真实车次为准。
-预约已保存：{{ created.appointmentNo || '预约编号未返回' }}
+| 系统单号 | {{ created.appointmentNo || '—' }} | 目的仓时区 | {{ created.timezone || '待核实' }} |
|---|---|---|---|
| 计划送仓日期 | {{ createdForm.plannedDate || '—' }} | 本次登记 | {{ ({ PENDING: '等待对方确认', SUCCESS: '已取得对方正式确认', FAILED: '未约成', CANCELLED: '已取消' })[createdForm.appointmentStatus] }} |
| 计划开始时段 | {{ createdForm.plannedAt || '—' }} | 计划结束时段 | {{ createdForm.plannedEndAt || '—' }} |
| 外部约号 | {{ createdForm.confirmationNo || '—' }} | ||
| 对方确认开始时间 | {{ createdForm.appointmentAt || '—' }} | 对方确认结束时间 | {{ createdForm.appointmentEndAt || '—' }} |
| 确认开始时差 | {{ createdForm.startOffset || '—' }} | 确认结束时差 | {{ createdForm.endOffset || '—' }} |
| {{ createdForm.appointmentStatus === 'FAILED' ? '原因' : '备注' }} | {{ createdForm.appointmentRemark || '—' }} | ||
预约保存后仍需在原业务安排车辆，日历中的排车以真实车次为准。
+选择需要送往FBA的已有货物；同一起运仓、同一目的仓可合并多个客户的货物。跨页选择会保留。
-选择需要送往FBA的已有货物；同一起运仓、同一目的仓可合并多个客户的货物。跨页选择会保留。
新建预约安排
+正在核对本次货物范围…
-{{ preview.originWarehouseName }} → {{ preview.destinationWarehouseCode }} · {{ preview.group.sourceCount }} 票 · {{ preview.group.packages ?? '箱数待核实' }}
-{{ source.inboundCode || source.bookingNo || '原票业务号未提供' }}
-{{ workReason(field) }}
-货物备妥窗口待核实。
-本次预约货物
+| 起运仓 | {{ preview.originWarehouseName || '—' }} | 目的FBA仓 | {{ preview.destinationWarehouseCode || '—' }} |
|---|---|---|---|
| 票数 | {{ preview.group.sourceCount }} | 箱数 | {{ preview.group.packages ?? '箱数待核实' }} |
| 货物业务号 | {{ index ? '、' : '' }}{{ source.inboundCode || source.bookingNo || '原票业务号未提供' }} | ||
{{ workReason(field) }}
+货物备妥窗口待核实。
+{{ existing.length ? '沿用本批已有排车单' : '按批次选择同仓真实货物' }}
同一张排车单可装同仓多个客户与目的仓，客户和预约归属逐来源保留。
+{{ existing.length ? '沿用本批已有排车单' : '按批次选择同仓真实货物' }} 同一张排车单可装同仓多个客户与目的仓，客户和预约归属逐来源保留。
同一张排车单可装同仓多个客户与目的仓，客户和预约归属逐来源保留。
读取批次实物需要预约、尾程订单、入仓单和排车列表权限。
正在核对批次、客户、起运仓与实物来源…
diff --git a/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts b/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts index 447b1e81..074fe88f 100644 --- a/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts +++ b/src/modules/appointment-calendar/WorkExistingDispatchForm.test.ts @@ -8,7 +8,7 @@ const access = vi.hoisted(() => ({ allowed: true })) vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => access.allowed }) })) vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original{{ message }}
' }, ApiErrorMeta: true, WorkSharedTripForm: { name: 'WorkSharedTripForm', props: ['dispatchNo', 'canWrite'], template: '' } } } }) } const button = (wrapper: ReturnType沿用原整车排车
在原排车单维护车辆、司机和货物；一张排车单就是一趟车。
+沿用原整车排车 在原排车单维护车辆、司机和货物；一张排车单就是一趟车。
在原排车单维护车辆、司机和货物；一张排车单就是一趟车。
查看原排车单及批次关联需要相应列表权限。
正在核对原排车单与批次…
| 操作 | 排车单号 | 车牌号 | 箱数 | 阶段 |
|---|---|---|---|---|
| {{ row.dispatchNo }} | {{ row.vehicleInfo.vehicle?.plate || '—' }} | {{ row.counts.packageCount }} | {{ stageLabel(row.stage) }} |
重量{{ formatNumber(totalWeight, 1) }} / {{ formatNumber(weightLimit, 1) }} kg
整组加入 · 不可拆
-
+
@@ -867,24 +890,26 @@ onMounted(() => { void load(); void loadCustomers() })
diff --git a/src/modules/customers/components/CustomerBillingRulesPanel.test.ts b/src/modules/customers/components/CustomerBillingRulesPanel.test.ts
index 32cd0e73..dd754a51 100644
--- a/src/modules/customers/components/CustomerBillingRulesPanel.test.ts
+++ b/src/modules/customers/components/CustomerBillingRulesPanel.test.ts
@@ -1,4 +1,4 @@
-import ElementPlus from 'element-plus'
+import ElementPlus, { ElDialog, ElMessageBox } from 'element-plus'
import { createPinia, setActivePinia } from 'pinia'
import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -136,13 +136,23 @@ describe('CustomerBillingRulesPanel', () => {
})
it('submits all four rows in one update request', async () => {
- const wrapper = mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流' }, global: { plugins: [ElementPlus] } })
+ const wrapper = mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流', customerCode: 'C0008' }, global: { plugins: [ElementPlus] } })
await flushPromises()
;[...document.querySelectorAll('button')].find((button) => button.textContent?.trim() === '编辑规则')?.click()
await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('title')).toBe('编辑箱规尺寸 / 计算规则 · C0008')
+ const length = document.querySelector('.editor-table input[placeholder="请输入内径长"]')!
+ length.value = '31'
+ length.dispatchEvent(new Event('input', { bubbles: true }))
+ length.dispatchEvent(new Event('change', { bubbles: true }))
+ await flushPromises()
+ document.querySelector('button[aria-label="展开全屏"]')!.click()
+ await flushPromises()
+ expect(document.querySelector('.customer-density-dialog.is-fullscreen')).not.toBeNull()
+ expect(length.value).toBe('31.000')
const saveButton = [...document.querySelectorAll('button')].find((button) => button.textContent?.trim() === '保存规则')
saveButton?.click(); await flushPromises()
- expect(updateCustomerDimensionConfig).toHaveBeenCalledWith('8', { rules: expect.arrayContaining([expect.objectContaining({ boxType: 'SMALL', version: 3 }), expect.objectContaining({ boxType: 'EXTRA_LARGE', version: 3 })]) })
+ expect(updateCustomerDimensionConfig).toHaveBeenCalledWith('8', { rules: expect.arrayContaining([expect.objectContaining({ boxType: 'SMALL', innerLengthCm: 31, version: 3 }), expect.objectContaining({ boxType: 'EXTRA_LARGE', version: 3 })]) })
const submittedRules = vi.mocked(updateCustomerDimensionConfig).mock.calls[0][1].rules
expect(submittedRules).toHaveLength(4)
expect(Object.keys(submittedRules[0]).sort()).toEqual([
@@ -190,4 +200,43 @@ describe('CustomerBillingRulesPanel', () => {
await flushPromises()
expect(updateCustomerDimensionDefaultCalculationMode).toHaveBeenCalledWith('8', 'MULTIPLY')
})
+ it('keeps dimension changes when header abandonment is declined', async () => {
+ const wrapper = mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流', customerCode: 'C0008' }, global: { plugins: [ElementPlus] } })
+ await flushPromises()
+ ;[...document.querySelectorAll('button')].find(button => button.textContent?.trim() === '编辑规则')!.click()
+ await flushPromises()
+ const input = document.querySelector('.editor-table input[placeholder="请输入内径长"]')!
+ input.value = '32'
+ input.dispatchEvent(new Event('input', { bubbles: true }))
+ input.dispatchEvent(new Event('change', { bubbles: true }))
+ await flushPromises()
+ const confirmation = vi.spyOn(ElMessageBox, 'confirm').mockRejectedValueOnce('cancel')
+ document.querySelector('.customer-density-dialog .el-dialog__headerbtn')!.click()
+ await flushPromises()
+ expect(confirmation).toHaveBeenCalledWith(expect.stringContaining('尚未保存'), '放弃编辑 · C0008', expect.objectContaining({ customClass: 'admin-density-confirm' }))
+ expect(wrapper.findComponent(AppDialog).props('modelValue')).toBe(true)
+ expect(input.value).toBe('32.000')
+ confirmation.mockRestore()
+ })
+
+ it('locks header and footer closing while coefficient rules are saving', async () => {
+ let finish!: (rule: CustomerChargeRule) => void
+ vi.mocked(createCustomerChargeRule).mockReturnValueOnce(new Promise(resolve => { finish = resolve }))
+ const wrapper = mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流' }, global: { plugins: [ElementPlus] } })
+ await flushPromises()
+ ;[...document.querySelectorAll('button')].find(button => button.textContent?.trim() === '编辑规则')!.click()
+ await flushPromises()
+ ;[...document.querySelectorAll('button')].find(button => button.textContent?.trim() === '保存系数规则')!.click()
+ await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('confirmLoading')).toBe(true)
+ expect(wrapper.findComponent(ElDialog).props('showClose')).toBe(false)
+ expect(wrapper.findComponent(ElDialog).props('closeOnPressEscape')).toBe(false)
+ const done = vi.fn()
+ await wrapper.findComponent(AppDialog).props('beforeClose')!(done)
+ expect(done).not.toHaveBeenCalled()
+ finish(chargeRule)
+ await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('modelValue')).toBe(false)
+ })
+
})
diff --git a/src/modules/customers/components/CustomerBillingRulesPanel.vue b/src/modules/customers/components/CustomerBillingRulesPanel.vue
index 956c3ca4..48bcfdee 100644
--- a/src/modules/customers/components/CustomerBillingRulesPanel.vue
+++ b/src/modules/customers/components/CustomerBillingRulesPanel.vue
@@ -18,6 +18,7 @@ import {
import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
import AppDialog from '@/shared/components/AppDialog.vue'
+import { customerDialogTitle } from '../customerDialogTitle'
import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
import { createCustomerChargeRule, listCustomerChargeRules, setCustomerChargeRuleDefault, type CustomerChargeRule, type CreateCustomerChargeRuleRequest } from '@/modules/fba-pricing'
import { getPlatformTenantDimensionInitializationStatus } from '@/modules/iam'
@@ -196,7 +197,7 @@ async function openEditor() {
async function confirmAbandon(): Promise {
try {
- await ElMessageBox.confirm('箱规尺寸尚未保存，确定放弃修改吗？', '放弃编辑', {
+ await ElMessageBox.confirm('箱规尺寸尚未保存，确定放弃修改吗？', customerDialogTitle('放弃编辑', { tenantCode: props.customerCode, tenantName: props.customerName }), {
customClass: 'admin-density-confirm', confirmButtonText: '放弃', cancelButtonText: '继续编辑', type: 'warning',
})
return true
@@ -206,12 +207,12 @@ async function confirmAbandon(): Promise {
}
async function beforeEditorClose(done: () => void) {
- if (editorSaving.value) return
+ if (editorSaving.value || chargeSaving.value) return
if (!editorDirty.value || await confirmAbandon()) done()
}
async function closeEditor() {
- if (editorSaving.value) return
+ if (editorSaving.value || chargeSaving.value) return
if (editorDirty.value && !await confirmAbandon()) return
editorVisible.value = false
}
@@ -410,20 +411,21 @@ onBeforeUnmount(stopInitializationPolling)
-
-
{{ selectedCandidate.groupNo || selectedCandidate.customerName || '客户待补充' }}
-目标柜次：{{ displayCabinetNo(selectedContainer) }} · 集装箱号：{{ displayActualContainerNo(selectedContainer) }}
-发货仓：{{ selectedContainer?.warehouseName || '—' }} · 柜次渠道：{{ containerChannelGroup(selectedContainer)?.name || '—' }}
-订单渠道：{{ selectedCandidate.channelName || '—' }}
+
+
+
+
+
+
+
+
+
+
-
| 目标柜次 | {{ displayCabinetNo(selectedContainer) }} | 集装箱号 | {{ displayActualContainerNo(selectedContainer) }} |
|---|---|---|---|
| 发货仓 | {{ selectedContainer?.warehouseName || '—' }} | 柜次渠道 | {{ containerChannelGroup(selectedContainer)?.name || '—' }} |
| 订单渠道 | {{ selectedCandidate.channelName || '—' }} | {{ selectedCandidate.coLoadGroupId ? '同柜组' : '客户' }} | {{ selectedCandidate.coLoadGroupId ? selectedCandidate.groupNo : selectedCandidate.customerName || '客户待补充' }} |
| 整组范围 | 组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱 | ||
|---|---|---|---|
| 托盘号 | {{ selectedCandidate.palletNo || '—' }} | 整托箱数 | 整托 {{ selectedCandidate.availablePackageCount }} 箱 |
| 入仓码 | {{ selectedCandidate.inboundCode || '—' }} | 可用箱数 | {{ selectedCandidate.availablePackageCount }} 箱 |
| 平均单箱毛重 | {{ formatMeasurement(selectedCandidate.unitGrossWeightKg, 'kg', 1) }} | 平均单箱体积 | {{ formatMeasurement(selectedCandidate.averageUnitVolumeCbm, 'm³') }} |
组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱
-{{ summary }}
+| 组内订单及入仓片段 |
|---|
| {{ summary }} |
托盘号 {{ selectedCandidate.palletNo || '—' }} · 整托 {{ selectedCandidate.availablePackageCount }} 箱
-托盘入仓组成
入仓码 {{ selectedCandidate.inboundCode || '—' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱 · 平均单箱毛重 {{ formatMeasurement(selectedCandidate.unitGrossWeightKg, 'kg', 1) }} · 平均单箱体积 {{ formatMeasurement(selectedCandidate.averageUnitVolumeCbm, 'm³') }}
- 本次只记录该入仓码的计划装柜箱数，具体箱号归属为未核验。 -本次只记录该入仓码的计划装柜箱数，具体箱号归属为未核验。
-
+
+
+
+
计算公式：按长、宽、高匹配箱规；长、宽、高各加 2X（X 为单边加宽），体积(CBM) = 外径长 × 外径宽 × 外径高 ÷ 1,000,000
-按箱规尺寸计算
+计算公式：按长、宽、高匹配箱规；长、宽、高各加 2X（X 为单边加宽），体积(CBM) = 外径长 × 外径宽 × 外径高 ÷ 1,000,000
-
- 保存规则
-
保存系数规则 取消
+
+
+
('button')].find(item => item.textContent?.trim() === text)
+ expect(found, text).toBeDefined()
+ return found!
+}
+function changeNumber(input: HTMLInputElement, value: string) {
+ input.value = value
+ input.dispatchEvent(new Event('input', { bubbles: true }))
+ input.dispatchEvent(new Event('change', { bubbles: true }))
+ input.dispatchEvent(new Event('blur', { bubbles: true }))
+}
+async function open(entry: 'detail' | 'list') {
+ const wrapper = entry === 'detail'
+ ? mount(CustomerOverseasStorageFeePanel, { attachTo: document.body, props: { customerId, customerName: '费用测试客户' }, global: { plugins: [ElementPlus] } })
+ : mount(OverseasStorageFeesView, { attachTo: document.body, global: { plugins: [ElementPlus] } })
+ await flushPromises()
+ if (entry === 'detail') button('编辑费用').click()
+ else {
+ const action = document.querySelector('.el-table__body .row-actions button')
+ expect(action).not.toBeNull()
+ action!.click()
+ }
+ await flushPromises()
+ return wrapper
+}
+
+enableAutoUnmount(afterEach)
+afterEach(() => { vi.restoreAllMocks(); ElMessageBox.close() })
+beforeEach(() => {
+ vi.resetAllMocks()
+ document.body.innerHTML = ''
+ setActivePinia(createPinia())
+ const auth = useAuthStore()
+ auth.token = 'test-session'
+ auth.permissions = ['platform:customer:list', 'platform:customer:edit', 'platform:overseas-storage-fee:edit']
+ useAccessPreviewStore().initializeAfterLogin()
+ vi.mocked(getCustomerOverseasStorageFees).mockImplementation(async () => configuration())
+ vi.mocked(listOverseasStorageFees).mockImplementation(async () => ({ records: [configuration()], total: 1, page: 1, size: 20 }))
+ vi.mocked(updateCustomerOverseasStorageFees).mockImplementation(async () => configuration())
+})
+
+describe('customer overseas fee dialog entry points', () => {
+ it.each(['detail', 'list'] as const)('retains %s currency choices, values, version and full customer ID on save', async entry => {
+ const wrapper = await open(entry)
+ const dialog = wrapper.findComponent(AppDialog)
+ expect(dialog.props('title')).toBe(`${entry === 'detail' ? '编辑海外仓费用' : '编辑海外仓阶梯费用'} · 费用测试客户`)
+ expect(dialog.props('fullscreenable')).toBe(true)
+ expect(dialog.findAllComponents(ElOption).map(option => option.props('value'))).toEqual(entry === 'detail' ? ['USD', 'CNY', 'HKD', 'EUR', 'GBP'] : ['USD', 'CNY', 'EUR'])
+ const prices = document.querySelectorAll('.customer-fee-tier-table input[placeholder^="请输入"]')
+ expect(prices).toHaveLength(4)
+ const price = document.querySelector(entry === 'detail' ? 'input[placeholder="请输入价格"]' : 'input[placeholder="请输入单价"]')!
+ changeNumber(price, '0.654321')
+ await flushPromises()
+ button('新增阶梯').click()
+ await flushPromises()
+ expect(document.querySelectorAll('.customer-fee-tier-table tbody tr')).toHaveLength(3)
+ document.querySelector('button[aria-label="展开全屏"]')!.click()
+ await flushPromises()
+ expect(document.querySelector('.customer-density-dialog.is-fullscreen')).not.toBeNull()
+ expect(price.value).toBe('0.654321')
+ button(entry === 'detail' ? '保存费用' : '确定').click()
+ await flushPromises()
+ expect(updateCustomerOverseasStorageFees).toHaveBeenCalledWith(customerId, {
+ customerId, customerName: '费用测试客户', currency: 'USD', version: 7, tiers: [
+ { feeType: 'STORAGE', billingUnit: 'CBM', startDay: 1, endDay: 1, unitPrice: 0.654321 },
+ { feeType: 'STORAGE', billingUnit: 'CBM', startDay: 2, endDay: null, unitPrice: 0.654321 },
+ { feeType: 'RETURN_STORAGE', billingUnit: 'PALLET', startDay: 1, endDay: null, unitPrice: 2 },
+ ],
+ })
+ expect(dialog.props('modelValue')).toBe(false)
+ })
+
+ it('applies dirty confirmation to the detail header close and preserves inputs when declined', async () => {
+ const wrapper = await open('detail')
+ const price = document.querySelector('input[placeholder="请输入价格"]')!
+ changeNumber(price, '9.123456')
+ await flushPromises()
+ const confirmation = vi.spyOn(ElMessageBox, 'confirm').mockRejectedValueOnce('cancel')
+ document.querySelector('.customer-density-dialog .el-dialog__headerbtn')!.click()
+ await flushPromises()
+ expect(confirmation).toHaveBeenCalledWith(expect.stringContaining('尚未保存'), '放弃编辑 · 费用测试客户', expect.objectContaining({ customClass: 'admin-density-confirm' }))
+ expect(wrapper.findComponent(AppDialog).props('modelValue')).toBe(true)
+ expect(price.value).toBe('9.123456')
+ const done = vi.fn()
+ const closing = wrapper.findComponent(AppDialog).props('beforeClose')!(done)
+ await flushPromises()
+ Array.from(document.querySelectorAll('.el-message-box .el-button--primary')).at(-1)!.click()
+ await closing
+ expect(done).toHaveBeenCalledOnce()
+ button('取消').click()
+ await flushPromises()
+ Array.from(document.querySelectorAll('.el-message-box .el-button--primary')).at(-1)!.click()
+ await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('modelValue')).toBe(false)
+ expect(updateCustomerOverseasStorageFees).not.toHaveBeenCalled()
+ })
+
+ it.each(['detail', 'list'] as const)('keeps %s inputs and context when saving fails', async entry => {
+ vi.mocked(updateCustomerOverseasStorageFees).mockRejectedValueOnce(new Error('费用版本冲突'))
+ const wrapper = await open(entry)
+ button(entry === 'detail' ? '保存费用' : '确定').click()
+ await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('modelValue')).toBe(true)
+ expect(document.body.textContent).toContain(entry === 'detail' ? '海外仓费用保存失败，请刷新后重试' : '保存失败，请刷新后重试')
+ expect(document.querySelectorAll('.customer-fee-tier-table tbody tr')).toHaveLength(2)
+ })
+
+ it.each(['detail', 'list'] as const)('locks %s close actions during save', async entry => {
+ let finish!: (value: OverseasStorageFeeConfig) => void
+ vi.mocked(updateCustomerOverseasStorageFees).mockReturnValueOnce(new Promise(resolve => { finish = resolve }))
+ const wrapper = await open(entry)
+ button(entry === 'detail' ? '保存费用' : '确定').click()
+ await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('confirmLoading')).toBe(true)
+ expect(wrapper.findComponent(ElDialog).props('showClose')).toBe(false)
+ expect(wrapper.findComponent(ElDialog).props('closeOnPressEscape')).toBe(false)
+ finish(configuration())
+ await flushPromises()
+ expect(wrapper.findComponent(AppDialog).props('modelValue')).toBe(false)
+ })
+})
diff --git a/src/modules/customers/overseasStorageFee.test.ts b/src/modules/customers/overseasStorageFee.test.ts
index d9a03db9..c6320f52 100644
--- a/src/modules/customers/overseasStorageFee.test.ts
+++ b/src/modules/customers/overseasStorageFee.test.ts
@@ -25,10 +25,10 @@ describe('customer overseas storage fee api', () => {
beforeEach(() => vi.clearAllMocks())
it('keeps overseas fee business actions as semantic buttons at narrow widths', () => {
- expect(overseasListSource).toContain('border stripe')
+ expect(overseasListSource).toContain('density-table density-table--editable customer-fee-tier-table')
expect(overseasListSource).toContain('class="density-action" size="small" plain')
expect(overseasListSource).toContain('size="small" plain type="danger"')
- expect(overseasListSource).toContain('')
+ expect(overseasListSource).toContain('操作 开始天数 结束天数 价格 {
expect(downloadTenantQualification).toHaveBeenCalledWith(tenant.id, '/files/license.png')
expect(document.querySelector('img[alt="license.png预览"]')).not.toBeNull()
+ expect(document.querySelector('.customer-qualification-preview .el-dialog__title')?.textContent).toBe('查看资质文件 · TEN8')
+ expect(document.querySelector('.customer-preview-filename')?.textContent).toBe('license.png')
+ document.querySelector('.customer-qualification-preview button[aria-label="展开全屏"]')!.click()
+ await flushPromises()
+ expect(document.querySelector('.customer-qualification-preview.is-fullscreen img')?.getAttribute('src')).toBe('blob:qualification-preview')
})
it('reloads a reused detail view and ignores the previous customer response', async () => {
diff --git a/src/modules/customers/pages/CustomerDetailView.vue b/src/modules/customers/pages/CustomerDetailView.vue
index 3581be5e..49d69956 100644
--- a/src/modules/customers/pages/CustomerDetailView.vue
+++ b/src/modules/customers/pages/CustomerDetailView.vue
@@ -21,6 +21,7 @@ import { getApiErrorDetails, getApiErrorMessage, type ApiErrorDetails } from '@/
import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
import AdminPage from '@/shared/components/AdminPage.vue'
import AppDialog from '@/shared/components/AppDialog.vue'
+import { customerDialogTitle } from '../customerDialogTitle'
import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
import LoadErrorState from '@/shared/components/LoadErrorState.vue'
import PageToolbar from '@/shared/components/PageToolbar.vue'
@@ -163,7 +164,7 @@ async function changeStatus() {
const next = customer.value.status === 'ACTIVE' ? 'DISABLED' : 'ACTIVE'
const verb = next === 'ACTIVE' ? '启用' : '停用'
try {
- await ElMessageBox.confirm(`确认${verb}客户“${customer.value.tenantName}”吗？`, `${verb}客户`, {
+ await ElMessageBox.confirm(`确认${verb}客户“${customer.value.tenantName}”吗？`, customerDialogTitle(`${verb}客户`, customer.value), {
customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: `确认${verb}`, cancelButtonText: '取消',
})
statusChanging.value = true
@@ -307,8 +308,9 @@ onBeforeUnmount(() => {
-
- ![]()
+
+ ![]()
@@ -345,7 +347,7 @@ table { width:100%; min-width:720px; border-collapse:collapse; font-size:var(--a
.member-contact span { display:block; }
.member-contact small { display:block; }.member-contact small { margin-top:3px; color:var(--cc-muted); }.module-empty > svg { color:#8797b2; }.module-empty p { max-width:520px; font-size:var(--admin-font-caption, 12px); }
.contract-note { padding:var(--admin-space-6, 16px) 18px; border-radius:10px; background:var(--admin-label-bg, #f8fafc); }.contract-note strong { color:#344054; font-size:var(--admin-font-caption, 12px); }.contract-note p { margin:5px 0 0; color:var(--cc-muted); font-size:var(--admin-font-caption, 11px); line-height:1.7; }
-.qualification-preview { display:grid; min-height:320px; max-height:72vh; overflow:auto; place-items:center; border-radius:10px; background:var(--admin-label-bg, #f8fafc); }.qualification-preview img { display:block; max-width:100%; height:auto; }.qualification-preview iframe { width:100%; min-height:68vh; border:0; background:var(--admin-surface, #fff); }
+
@media (max-width:960px) { .basic-layout { grid-template-columns:1fr; }.contact-panel,.user-panel { grid-column:auto; }.qualification-panel { order:3; }.user-panel { order:4; }.info-grid--three { grid-template-columns:repeat(2,minmax(0,1fr)); } }
@media (max-width:720px) { .detail-header { align-items:flex-start; flex-wrap:wrap; }.detail-page-toolbar { width:100%; flex-basis:100%; }.company-mark { width:40px; height:40px; }.header-actions { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); width:100%; }.header-actions :deep(.el-tag) { grid-column:1 / -1; justify-self:start; }.header-actions :deep(.el-button) { min-height:44px; }.detail-panel { padding:16px; }.info-grid { grid-template-columns:1fr; }.info-grid > div.wide { grid-column:auto; } }
@media (max-width:420px) { .company-mark { display:none; }.header-actions { grid-template-columns:1fr; }.header-actions :deep(.el-tag) { grid-column:auto; }.qualification-list button { grid-template-columns:36px minmax(0,1fr) auto; }.qualification-list .file-date,.qualification-list button > svg { display:none; } }
diff --git a/src/modules/customers/pages/CustomersView.test.ts b/src/modules/customers/pages/CustomersView.test.ts
index 486bf67c..e3d2fbfd 100644
--- a/src/modules/customers/pages/CustomersView.test.ts
+++ b/src/modules/customers/pages/CustomersView.test.ts
@@ -188,7 +188,7 @@ describe('CustomersView', () => {
it('matches the frozen prototype containers for customer operations', () => {
expect(customersSource).toContain("router.push({ name: 'customer-detail'")
expect(customersSource).toContain("const editorDialogWidth = 'min(1120px, calc(100vw - 28px))'")
- expect(customersSource.match(/class="form-grid three-cols"/g)).toHaveLength(2)
+ expect(customersSource.match(/class="density-table density-table--editable customer-editor-table"/g)).toHaveLength(2)
expect(customersSource).toContain('width="min(520px, calc(100vw - 28px))" class="admin-density-dialog customer-density-dialog customer-password-dialog"')
expect(customersSource).toContain('width="min(1040px, calc(100vw - 28px))" class="admin-density-dialog customer-density-dialog review-decision-dialog"')
expect(customersSource).not.toContain(' {
const email = document.querySelector('input[placeholder="如：contact@example.com"]')
expect(phone?.value).toBe(fullTenant.contactPhone)
expect(email?.value).toBe(fullTenant.contactEmail)
+ expect(document.querySelector('.customer-editor-dialog .el-dialog__title')?.textContent).toBe('编辑客户 · TEN8')
+ expect(document.querySelector('input[placeholder="请输入18位大写字母或数字"]')).toBeNull()
+ expect(document.querySelector('.qualification-credit-code')?.textContent).toContain(fullTenant.unifiedSocialCreditCode)
+ phone!.value = '13900139000'
+ phone!.dispatchEvent(new Event('input', { bubbles: true }))
+ document.querySelector('.customer-editor-dialog button[aria-label="展开全屏"]')!.click()
+ await flushPromises()
+ expect(document.querySelector('.customer-editor-dialog.is-fullscreen')).not.toBeNull()
+ expect(document.querySelector('input[placeholder="请输入公司联系电话"]')?.value).toBe('13900139000')
+ document.querySelector('.customer-editor-dialog button[aria-label="退出全屏"]')!.click()
+ await flushPromises()
+ expect(document.querySelector('input[placeholder="请输入公司联系电话"]')?.value).toBe('13900139000')
})
it('shows an authenticated image preview for an uploaded qualification', async () => {
@@ -607,7 +619,7 @@ describe('CustomersView', () => {
temporaryPassword: 'Temporary#2026',
})
- mount(CustomersView, { attachTo: document.body, global: { plugins: [pinia, ElementPlus] } })
+ const wrapper = mount(CustomersView, { attachTo: document.body, global: { plugins: [pinia, ElementPlus] } })
await flushPromises()
tableButtonByText('审核')?.click()
await flushPromises()
@@ -620,6 +632,13 @@ describe('CustomersView', () => {
expect(document.body.textContent).toContain('请立即保存以下一次性凭证')
expect(document.body.textContent).toContain('merchant_8_owner')
expect(document.body.textContent).toContain('Temporary#2026')
+ const credentials = wrapper.findAllComponents(AppDialog).find(dialog => dialog.props('title').startsWith('审核通过，管理员账号已创建'))!
+ expect(credentials.props()).toMatchObject({ modelValue: true, showClose: false, closeOnPressEscape: false, closeOnClickModal: false })
+ expect(document.querySelector('.approval-result-dialog .el-dialog__headerbtn')).toBeNull()
+ document.querySelector('.approval-result-dialog .el-dialog__footer button')!.click()
+ await flushPromises()
+ expect(credentials.props('modelValue')).toBe(false)
+ expect(document.querySelector('.approval-result-dialog code')).toBeNull()
})
it('loads and previews authenticated qualification files in the review dialog', async () => {
diff --git a/src/modules/customers/pages/CustomersView.vue b/src/modules/customers/pages/CustomersView.vue
index 738d8790..df07f097 100644
--- a/src/modules/customers/pages/CustomersView.vue
+++ b/src/modules/customers/pages/CustomersView.vue
@@ -3,7 +3,7 @@ import '@/styles/adminDensity.css'
import '@/modules/customers/customerDensity.css'
import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
-import { Building2, CheckCircle2, CircleCheck, FileCheck2, FileText, ShieldCheck, ShieldX } from '@lucide/vue'
+import { CheckCircle2, FileText, ShieldCheck, ShieldX } from '@lucide/vue'
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
import { getApiErrorDetails, getApiErrorMessage, type ApiErrorDetails } from '@/shared/api/http'
import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
@@ -42,7 +42,7 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
import AdminPage from '@/shared/components/AdminPage.vue'
import AppDialog from '@/shared/components/AppDialog.vue'
-import FormSection from '@/shared/components/FormSection.vue'
+import { customerDialogTitle } from '../customerDialogTitle'
import ListPageLayout from '@/shared/components/ListPageLayout.vue'
import LoadErrorState from '@/shared/components/LoadErrorState.vue'
import { showExportTaskCreatedDialog } from '@/shared/components/exportTaskCreatedDialog'
@@ -227,7 +227,8 @@ const customerColumns: DataTableColumn[] = [
let loadSequence = 0
let reviewLoadSequence = 0
let editorLoadSequence = 0
-const editorTitle = computed(() => editingId.value ? '编辑客户' : '新增客户')
+const editorCustomer = computed(() => result.value.records.find(row => String(row.id) === editingId.value) || { tenantName: form.value.tenantName })
+const editorTitle = computed(() => editingId.value ? customerDialogTitle('编辑客户', editorCustomer.value) : '新增客户')
const editorDialogWidth = 'min(1120px, calc(100vw - 28px))'
const canUploadQualifications = computed(() => !editorStatus.value
|| ['PROFILE_REQUIRED', 'REJECTED', 'ACTIVE', 'DISABLED'].includes(editorStatus.value))
@@ -641,7 +642,7 @@ async function submitReview() {
const missing = qualifications.value.filter((item) => item.required && !item.uploaded)
for (const item of missing) item.error = `${item.label}为提交审核必填文件`
if (missing.length) { ElMessage.warning(`请先上传${missing.map((item) => item.label).join('、')}`); return }
- await ElMessageBox.confirm('提交后客户资料与资质将进入企业审核，审核完成前不能继续替换文件。确认提交吗？', '提交企业审核', { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认提交', cancelButtonText: '继续完善' })
+ await ElMessageBox.confirm('提交后客户资料与资质将进入企业审核，审核完成前不能继续替换文件。确认提交吗？', customerDialogTitle('提交企业审核', editorCustomer.value), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认提交', cancelButtonText: '继续完善' })
const saved = await submitPlatformTenantReview(editingId.value)
editorStatus.value = saved.status; ElMessage.success('审核单已提交')
editorOpen.value = false; await loadCustomers()
@@ -730,7 +731,7 @@ function handleMoreAction(row: PlatformTenantResource, command: string) {
async function toggleStatus(row: PlatformTenantResource) {
const next = row.status === 'ACTIVE' ? 'DISABLED' : 'ACTIVE'; const verb = next === 'ACTIVE' ? '启用' : '停用'
try {
- await ElMessageBox.confirm(`确认${verb}客户“${row.tenantName}”吗？`, `${verb}客户`, { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: `确认${verb}`, cancelButtonText: '取消' })
+ await ElMessageBox.confirm(`确认${verb}客户“${row.tenantName}”吗？`, customerDialogTitle(`${verb}客户`, row), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: `确认${verb}`, cancelButtonText: '取消' })
rowActionId.value = String(row.id); await changePlatformTenantStatus(row.id, next)
ElMessage.success(`客户已${verb}`); await loadCustomers()
} catch (error) {
@@ -1081,30 +1082,29 @@ onMounted(() => { void loadCustomers() })
-
-
-
+
+
+
+
+
+ {{ statusMeta(editorStatus).label }}
- {{ statusMeta(editorStatus).label }}
+
-
+
-
-
| 箱规类型 | 内径长(cm) | 内径宽(cm) | 内径高(cm) | 单边加宽(cm) | 备注 | |
|---|---|---|---|---|---|---|
| 箱规类型 | 内径长(cm) | 内径宽(cm) | 内径高(cm) | 单边加宽(cm) | 备注 |
|---|---|---|---|---|---|
| {{ row.boxTypeName }} |
箱规按权重系数计算
长、宽、高任一项超出当前挡位时进入下一挡；命中规格的一个系数统一应用于长、宽、高。
| 箱规类型 | 内径长(cm) | 内径宽(cm) | 内径高(cm) | 权重系数 | 重量(kg) | 备注 |
|---|---|---|---|---|---|---|
| {{ BOX_NAMES[row.boxType] }} |
箱规按权重系数计算
长、宽、高任一项超出当前挡位时进入下一挡；命中规格的一个系数统一应用于长、宽、高。
| 箱规类型 | 内径长(cm) | 内径宽(cm) | 内径高(cm) | 权重系数 | 重量(kg) | 备注 |
|---|---|---|---|---|---|---|
| {{ BOX_NAMES[row.boxType] }} |
{{ previewName }}
+
-
基础资料
+
-
联系与商务
仅用于企业业务联系，不会修改企业管理员登录手机号；登录手机号请在成员/账号管理中单独维护，修改会影响登录。
+企业认证资料
营业执照和18位统一社会信用代码为必填业务项；法人身份证、货代资质证书和银行开户许可证均为选填。
{{ qualificationLoadError }}重试
文件类型上传文件有效期
@@ -1122,96 +1122,90 @@ onMounted(() => { void loadCustomers() })
支持 PDF、JPG、PNG，单个文件不超过 5MB；* 为提交审核必填项。
-
+
+
![]()
-
-
{{ qualificationPreviewName }}
+
+
+
+
我已保存，关闭
-
+
-
-
请立即保存以下一次性凭证临时密码只在本次{{ credentialSource === 'creation' ? '创建' : '审核' }}响应中返回，关闭后无法再次查看。
-
-
- 登录账号
{{ approvalResult.administratorUsername || '未返回' }}- 临时密码
{{ approvalResult.temporaryPassword || '未返回' }}
| 登录账号 | {{ approvalResult.administratorUsername || '未返回' }} |
|---|---|
| 临时密码 | {{ approvalResult.temporaryPassword || '未返回' }} |
-
-
- 待审核
-
-
-
+
- ![]()
+
-
+
+ ![]()
+
+
+
-
+
随机生成 客户下次登录时必须修改密码
-
-
-
+
+
-
+
本操作会生成一次性、短时有效的客户会话，并记录代登录原因；不会替换当前 Admin 会话。
-
+
+
删除是逻辑归档：历史业务数据会保留，客户账号会被停用。是否允许归档由服务端最终判断。
+
+
@@ -1227,7 +1221,7 @@ onMounted(() => { void loadCustomers() })
:deep(.customer-list-table .customer-code-column .cell) { white-space:nowrap; }
.capital-input { display:grid; grid-template-columns:minmax(0,1fr) 130px; width:100%; gap:var(--admin-space-3, 8px); } .capital-input :deep(.el-input-number) { width:100%; } .capital-input :deep(.el-select) { width:100%; }
.qualification-heading { display:flex; justify-content:flex-end; margin-bottom:var(--admin-space-5, 12px); } .qualification-hint { margin:var(--admin-space-5, 12px) 0 0; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); line-height:1.6; } .qualification-hint span { color:var(--el-color-danger); } .qualification-label > span { color:var(--el-color-danger); }
-.qualification-credit-code { max-width:420px; margin-top:var(--admin-space-6, 16px); } .qualification-credit-code small { display:block; margin-top:var(--admin-space-2, 6px); color:var(--cc-muted); font-size:var(--admin-font-caption, 11px); line-height:1.5; } .field-hint { display:block; margin-top:var(--admin-space-2, 6px); color:var(--cc-muted); line-height:1.5; }
+.qualification-credit-code small { display:block; margin-top:var(--admin-space-2, 6px); color:var(--cc-muted); font-size:var(--admin-font-caption, 11px); line-height:1.5; } .field-hint { display:block; margin-top:var(--admin-space-2, 6px); color:var(--cc-muted); line-height:1.5; }
.qualification-table { container-type:inline-size; overflow:hidden; margin-top:14px; border:1px solid var(--cc-border); border-radius:8px; } .qualification-row { display:grid; grid-template-columns:170px minmax(0,1fr) 220px; min-width:0; border-top:1px solid var(--cc-border); } .qualification-row:first-child { border-top:0; } .qualification-row > * { display:flex; min-width:0; align-items:center; } .qualification-header { min-height:44px; background:#f7f8fc; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); font-weight:600; }
.qualification-label { gap:5px; font-weight:600; } .qualification-label svg { margin-left:auto; color:var(--el-color-success); }
.qualification-optional { padding:2px 5px; border-radius:var(--admin-radius, 4px); background:var(--el-fill-color-light); color:var(--cc-muted); font-size:var(--admin-font-caption, 10px); font-weight:500; line-height:1.4; }
@@ -1246,51 +1240,17 @@ onMounted(() => { void loadCustomers() })
.qualification-preview-placeholder { display:grid; place-items:center; gap:2px; }
.qualification-preview-placeholder small { font-size:var(--admin-font-caption, 10px); font-weight:700; }
.qualification-preview-action { position:absolute; inset:auto 0 0; display:flex; min-height:22px; align-items:center; justify-content:center; gap:3px; background:rgba(23,32,51,.78); color:var(--admin-surface, #fff); }
-.qualification-preview { display:grid; max-height:min(70vh,760px); min-height:240px; place-items:center; overflow:auto; border:1px solid var(--cc-border); border-radius:6px; background:var(--admin-label-bg, #f8fafc); }
-.qualification-preview img { display:block; max-width:100%; height:auto; }
-.qualification-preview iframe { width:100%; min-height:min(68vh,720px); border:0; background:var(--admin-surface, #fff); }
.qualification-load-error { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-4, 10px); margin-top:var(--admin-space-5, 12px); padding:var(--admin-space-4, 10px) var(--admin-space-5, 12px); border:1px solid #fecdca; border-radius:6px; background:#fffafa; color:#b42318; font-size:var(--admin-font-caption, 12px); }
-.customer-editor-footer { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-6, 16px); } .customer-editor-footer > span { color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); text-align:left; } .customer-editor-footer > div { display:flex; flex:0 0 auto; gap:var(--admin-space-3, 8px); } .customer-editor-footer :deep(.el-button + .el-button) { margin-left:0; }
+.customer-editor-footer { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-6, 16px); } .customer-editor-footer > span { color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); text-align:left; }
.decision-summary { display:flex; min-width:0; align-items:center; justify-content:space-between; gap:var(--admin-space-5, 12px); background:var(--admin-label-bg, #f8fafc); } .decision-summary > * { min-width:0; overflow-wrap:anywhere; } .decision-summary strong { color:var(--cc-text); font-size:var(--admin-font-body, 13px); } .decision-summary span { color:var(--cc-muted); font-size:var(--admin-font-caption, 11px); }
-.review-dialog-content { display:grid; }
-.review-dialog-header { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-6, 16px); border:1px solid #dbe4f0; }
-.review-dialog-title { display:flex; min-width:0; align-items:center; gap:11px; }
-.review-dialog-title > div { display:grid; min-width:0; gap:3px; }
-.review-dialog-title strong { overflow:hidden; color:#18243a; font-size:var(--admin-font-title, 16px); text-overflow:ellipsis; }
-.review-dialog-title span:not(.review-dialog-icon) { overflow:hidden; color:#718096; font-size:var(--admin-font-caption, 12px); text-overflow:ellipsis; white-space:nowrap; }
-.review-dialog-icon { width:36px; height:var(--admin-row-height, 36px); flex:0 0 36px; place-items:center; border-radius:9px; background:#e9efff; color:#526fe8; }
-.review-dialog-grid { display:grid; grid-template-columns:minmax(270px,.85fr) minmax(390px,1.15fr); }
-.review-dialog-section { min-width:0; border:1px solid #e5eaf1; background:var(--admin-surface, #fff); }
-.review-decision-card { min-width:0; border:1px solid #e5eaf1; background:var(--admin-surface, #fff); }
-.review-section-heading { display:flex; align-items:flex-start; justify-content:space-between; gap:var(--admin-space-5, 12px); }
-.review-section-heading > div { min-width:0; }
-.review-section-heading h3 { margin:0; color:#1a2438; font-size:var(--admin-font-section, 14px); font-weight:700; }
-.review-section-heading span { display:block; margin-top:var(--admin-space-1, 4px); color:#8a94a6; line-height:1.4; }
-.review-section-heading > svg { flex:0 0 auto; color:#657bea; }
-.review-info-grid { margin:0; }
-.review-document-table { overflow:hidden; border:1px solid #e4e9f1; }
-.review-document-header { display:grid; grid-template-columns:118px minmax(0,1fr) 138px; }
-.review-document-row { display:grid; grid-template-columns:118px minmax(0,1fr) 138px; }
-.review-document-header { background:#f5f7fb; color:#657188; font-weight:700; }
-.review-document-header > span { min-width:0; padding:9px var(--admin-space-4, 10px); overflow-wrap:anywhere; border-right:1px solid #e4e9f1; }
-.review-document-row > span { min-width:0; padding:9px var(--admin-space-4, 10px); overflow-wrap:anywhere; border-right:1px solid #e4e9f1; }
-.review-document-header > span:last-child { border-right:0; }
-.review-document-row > span:last-child { border-right:0; }
-.review-document-row { min-height:46px; border-top:1px solid #edf0f4; color:#334155; font-size:var(--admin-font-caption, 12px); }
-.review-document-row > span { display:flex; align-items:center; }
-.review-document-type { font-weight:650; }
-.review-document-name { min-width:0; gap:var(--admin-space-2, 6px); overflow:hidden; color:#4c5b72; text-overflow:ellipsis; }
-.review-document-name svg { flex:0 0 auto; color:#8798cf; }
-.review-document-actions { justify-content:flex-end; gap:var(--admin-space-2, 6px); }
-.review-document-actions :deep(.el-button + .el-button) { margin-left:0; }
.review-document-state { padding:14px; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); }
.review-document-error { padding:14px; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); }
.review-document-empty { padding:14px; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); }
.review-document-error { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-5, 12px); margin-bottom:var(--admin-space-3, 8px); border:1px solid #fecdca; border-radius:6px; background:#fffafa; color:#b42318; }
.review-document-empty { display:flex; align-items:center; justify-content:center; gap:7px; text-align:center; }.review-document-empty svg { color:#a5afc1; }
-.review-decision-card :deep(.el-form-item) { margin-bottom:0; }.review-decision-card :deep(.el-form-item__label) { color:#4b5870; font-size:var(--admin-font-caption, 12px); font-weight:650; }.decision-summary > div > span { display:block; margin-top:var(--admin-space-1, 4px); }.decision-type { margin:0 0 14px; }.password-input-row { display:grid; grid-template-columns:minmax(0,1fr) auto; width:100%; gap:var(--admin-space-3, 8px); }.dialog-hint { margin:var(--admin-space-5, 12px) 0 0; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); line-height:1.6; }.archive-confirm { display:grid; gap:var(--admin-space-3, 8px); margin:var(--admin-space-6, 16px) 0; }.archive-confirm strong { color:var(--cc-text); }.archive-confirm span { color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); }
-.approval-result-warning { display:flex; align-items:flex-start; gap:var(--admin-space-4, 10px); padding:var(--admin-space-5, 12px) 14px; border:1px solid #fecdca; border-radius:8px; background:#fffafa; color:#b42318; } .approval-result-warning strong { display:block; } .approval-result-warning span { display:block; } .approval-result-warning strong { font-size:var(--admin-font-section, 14px); } .approval-result-warning span { margin-top:var(--admin-space-1, 4px); font-size:var(--admin-font-caption, 12px); line-height:1.5; } .approval-credentials { margin:18px 0 0; border:1px solid var(--cc-border); } .approval-credentials > div { display:grid; grid-template-columns:90px minmax(0,1fr); gap:var(--admin-space-5, 12px); } .approval-credentials > div + div { border-top:1px solid var(--cc-border); } .approval-credentials dt { color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); } .approval-credentials dd { display:flex; min-width:0; align-items:center; gap:var(--admin-space-4, 10px); margin:0; } .approval-credentials code { min-width:0; flex:1; overflow-wrap:anywhere; color:var(--cc-text); font-size:var(--admin-font-section, 14px); font-weight:700; }
-@media (max-width:720px) { .customer-editor-footer,.review-sync-error { align-items:stretch; flex-direction:column; } .customers-table-actions { display:grid; grid-template-columns:1fr 1fr; width:100%; } .customers-table-actions :deep(.el-button) { min-height:40px; margin:0; } .qualification-table { overflow-x:auto; } .qualification-row { min-width:640px; } .customer-editor-footer > div { display:grid; grid-template-columns:repeat(auto-fit,minmax(110px,1fr)); width:100%; } .customer-editor-footer :deep(.el-button) { min-height:40px; margin:0; } .decision-summary { align-items:flex-start; flex-direction:column; }.review-dialog-grid { grid-template-columns:1fr; gap:12px; }.review-info-grid { grid-template-columns:1fr 1fr; }.review-document-header,.review-document-row { grid-template-columns:104px minmax(0,1fr) 124px; }.review-dialog-header { align-items:flex-start; }.password-input-row { grid-template-columns:1fr; }.table-actions :deep(.el-button) { min-height:40px; } }
-@media (max-width:480px) { :global(.review-decision-dialog .el-dialog__header),:global(.review-decision-dialog .el-dialog__body) { padding-left:16px; padding-right:16px; }.review-info-grid { grid-template-columns:1fr; }.review-document-header { display:none; }.review-document-row { grid-template-columns:1fr; gap:6px; padding:10px; }.review-document-row > span { padding:0; border-right:0; }.review-document-actions { justify-content:flex-start; }.review-dialog-title strong { max-width:190px; } }
+.decision-summary > div > span { display:block; margin-top:var(--admin-space-1, 4px); }.decision-type { margin:0 0 14px; }.password-input-row { display:grid; grid-template-columns:minmax(0,1fr) auto; width:100%; gap:var(--admin-space-3, 8px); }.archive-confirm { display:grid; gap:var(--admin-space-3, 8px); margin:var(--admin-space-6, 16px) 0; }.archive-confirm strong { color:var(--cc-text); }.archive-confirm span { color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); }
+.approval-result-warning { display:flex; align-items:flex-start; gap:var(--admin-space-4, 10px); padding:var(--admin-space-5, 12px) 14px; border:1px solid #fecdca; border-radius:8px; background:#fffafa; color:#b42318; } .approval-result-warning strong { display:block; } .approval-result-warning span { display:block; } .approval-result-warning strong { font-size:var(--admin-font-section, 14px); } .approval-result-warning span { margin-top:var(--admin-space-1, 4px); font-size:var(--admin-font-caption, 12px); line-height:1.5; }
+@media (max-width:720px) { .customer-editor-footer,.review-sync-error { align-items:stretch; flex-direction:column; } .customers-table-actions { display:grid; grid-template-columns:1fr 1fr; width:100%; } .customers-table-actions :deep(.el-button) { min-height:40px; margin:0; } .qualification-table { overflow-x:auto; } .qualification-row { min-width:640px; } .customer-editor-footer > div { display:grid; grid-template-columns:repeat(auto-fit,minmax(110px,1fr)); width:100%; } .customer-editor-footer :deep(.el-button) { min-height:40px; margin:0; } .decision-summary { align-items:flex-start; flex-direction:column; }.review-document-header,.password-input-row { grid-template-columns:1fr; }.table-actions :deep(.el-button) { min-height:40px; } }
+@media (max-width:480px) { :global(.review-decision-dialog .el-dialog__header),:global(.review-decision-dialog .el-dialog__body) { padding-left:16px; padding-right:16px; } }
@media (max-width:360px) { .customers-table-actions,.capital-input { grid-template-columns:1fr; } }
diff --git a/src/modules/customers/pages/OverseasStorageFeesView.vue b/src/modules/customers/pages/OverseasStorageFeesView.vue
index 149946f9..fc89abdb 100644
--- a/src/modules/customers/pages/OverseasStorageFeesView.vue
+++ b/src/modules/customers/pages/OverseasStorageFeesView.vue
@@ -6,6 +6,7 @@ import { ElMessage } from 'element-plus'
import AdminPage from '@/shared/components/AdminPage.vue'
import AppDialog from '@/shared/components/AppDialog.vue'
+import { customerDialogTitle } from '../customerDialogTitle'
import QueryToolbar from '@/shared/components/QueryToolbar.vue'
import DataTable from '@/shared/components/DataTable.vue'
import ListPageLayout from '@/shared/components/ListPageLayout.vue'
@@ -70,13 +71,11 @@ onMounted(() => { void load() })
-
重新加载 编辑
-
- 新增阶梯 删除
+
+
@@ -105,14 +114,6 @@ onMounted(() => { void load() })
.tier-item { display:flex; align-items:baseline; min-width:0; max-width:100%; line-height:24px; }
.tier-item dt { flex:0 0 auto; color:var(--cc-muted); font-size:var(--admin-font-caption, 12px); }
.tier-item dd { min-width:0; margin:0; color:var(--cc-text); font-size:var(--admin-font-body, 13px); font-weight:600; font-variant-numeric:tabular-nums; overflow-wrap:anywhere; }
-.groups { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); }
-.groups > div { min-width:0; }
-.groups :deep(.el-table) { width:100%; }
-.groups :deep(.el-input-number) { width:100%; min-width:0; }
-.groups h3 { margin:0 0 var(--admin-space-4, 10px); }
-.group-heading { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-5, 12px); margin-bottom:var(--admin-space-4, 10px); }
-.group-heading h3 { min-width:0; margin:0; }
-.group-heading :deep(.el-button) { flex:0 0 auto; }
-@media (max-width:900px) { .groups { grid-template-columns:1fr; } }
-@media (max-width:720px) { .error-state { align-items:stretch; flex-direction:column; gap:12px; } .error-state :deep(.el-button) { width:100%; min-height:44px; } .tier-list { grid-template-columns:1fr; } .groups > div { overflow-x:auto; } .groups :deep(.el-table) { min-width:560px; } }
+
+@media (max-width:720px) { .error-state { align-items:stretch; flex-direction:column; gap:12px; } .error-state :deep(.el-button) { width:100%; min-height:44px; } .tier-list { grid-template-columns:1fr; } }
diff --git a/src/modules/dashboard/pages/DashboardView.test.ts b/src/modules/dashboard/pages/DashboardView.test.ts
index a1c14dbf..db73c65c 100644
--- a/src/modules/dashboard/pages/DashboardView.test.ts
+++ b/src/modules/dashboard/pages/DashboardView.test.ts
@@ -48,7 +48,7 @@ describe('DashboardView', () => {
const wrapper = mount(DashboardView)
await flushPromises()
- expect(wrapper.text()).toContain('核心指标来自实时业务数据')
+ expect(wrapper.find('.dashboard-context > p').exists()).toBe(false)
expect(wrapper.text()).toContain('数据更新时间：2026-09-11 12:00')
expect(wrapper.findAll('.dashboard-metric')).toHaveLength(4)
expect(wrapper.findAll('.dashboard-metric p').map(label => label.text())).toEqual(['今日新运单', '在途柜量', '活跃客户', '待清关票数'])
@@ -77,7 +77,7 @@ describe('DashboardView', () => {
await wrapper.findAll('button').find(button => button.text().trim() === '刷新数据')!.trigger('click')
await flushPromises()
expect(getTodayNewOrderCount).toHaveBeenCalledTimes(2)
- expect(wrapper.text()).toContain('核心指标来自实时业务数据')
+ expect(wrapper.find('.dashboard-context > p').exists()).toBe(false)
expect(wrapper.text()).toContain('12 票')
})
diff --git a/src/modules/dashboard/pages/DashboardView.vue b/src/modules/dashboard/pages/DashboardView.vue
index 874f8225..2e63f8a1 100644
--- a/src/modules/dashboard/pages/DashboardView.vue
+++ b/src/modules/dashboard/pages/DashboardView.vue
@@ -86,8 +86,8 @@ onBeforeUnmount(() => document.removeEventListener('fullscreenchange', syncFulls
-
-
+
{{ selectedReview.tenantName || '未命名客户' }}客户编号：{{ selectedReview.tenantCode || '未生成' }}
-
-
-
-
-
- 企业基本信息
核对客户提交的主体资料-
-
- 客户名称
- {{ selectedReview.tenantName || '未填写' }}
- 客户编号
- {{ selectedReview.tenantCode || '未生成' }}
- 联系人
- {{ selectedReview.contactName || '未填写' }}
- 公司联系电话
- {{ selectedReview.contactPhone || '未填写' }}
- 联系邮箱
- {{ selectedReview.contactEmail || '未填写' }}
- 提交时间
- {{ formatDate(selectedReview.submittedAt || selectedReview.createdAt) }}
资质文件
营业执照为必填；法人身份证及其他资质为选填。共 {{ reviewQualifications.length }} 份正在加载资质文件...
- {{ reviewQualificationsError.message }}重试
-
-
- 资质类型已上传文件操作
- {{ qualificationLabel(item.qualificationType) }}预览 下载
- 审核决定
确认资料无误后提交审核结果
+
+ 企业基本信息
+
+
+
+
+
+
+
+
+ 通过 驳回
+
-
-
-
- 企业基本信息 待审核
+ | 客户名称 | {{ selectedReview.tenantName || '未填写' }} | 客户编号 | {{ selectedReview.tenantCode || '未生成' }} |
|---|---|---|---|
| 联系人 | {{ selectedReview.contactName || '未填写' }} | 公司联系电话 | {{ selectedReview.contactPhone || '未填写' }} |
| 联系邮箱 | {{ selectedReview.contactEmail || '未填写' }} | 提交时间 | {{ formatDate(selectedReview.submittedAt || selectedReview.createdAt) }} |
资质文件
+营业执照为必填；法人身份证及其他资质为选填。共 {{ reviewQualifications.length }} 份
+正在加载资质文件...
+ {{ reviewQualificationsError.message }}重试
+ | 资质类型 | 已上传文件 | 操作 |
|---|---|---|
| {{ qualificationLabel(item.qualificationType) }} | {{ qualificationName(item) }} | |
| 暂无资质文件 | ||
审核决定
{{ reviewPreviewName }}
+正在重置企业管理员登录密码{{ passwordTenant.tenantName }}
客户编号：{{ passwordTenant.tenantCode }}重置对象为企业 OWNER 管理员，原密码将立即失效。
+重置对象为企业 OWNER 管理员，原密码将立即失效。
{{ impersonationTenant.tenantName }}将以企业管理员身份打开客户工作台
客户编号：{{ impersonationTenant.tenantCode }}{{ archiveTenant.tenantName }}请输入客户编号 {{ archiveTenant.tenantCode }} 以确认。
-
- 海外仓阶梯费用
{{ error.message }}
-
@@ -91,8 +90,18 @@ onMounted(() => { void load() })
共 {{ tableTotal }} 个客户
{{ index === 0 ? '仓租（CBM/天）' : '退货仓储费（托/天）' }} · {{ group.length }}档
+
+ 新增阶梯
+
+
+
+ {{ groupIndex === 0 ? '仓租（CBM/天）' : '退货仓储费（托/天）' }} · {{ group.length }}档
| 操作 | 开始天数 | 结束天数 | 价格 |
|---|---|---|---|
{{ !hasMetrics ? '当前账号暂无可查看的首页指标，请从左侧菜单进入已授权业务。' : metricsError ? '部分核心指标加载失败，可刷新重试。' : '核心指标来自实时业务数据。' }}
+{{ !hasMetrics ? '当前账号暂无可查看的首页指标，请从左侧菜单进入已授权业务。' : '部分核心指标加载失败，可刷新重试。' }}
数据更新时间：{{ metricsUpdatedAt ? dayjs(metricsUpdatedAt).format('YYYY-MM-DD HH:mm') : '加载中' }}