完善预约确认与排车表单并统一计费和筛选展示

src/modules/appointment-calendar/AppointmentCalendarDialogs.native.test.ts

@@ -11,6 +11,7 @@ import { batchContext } from './batch.test-support'
 import type { ScheduleEvent } from './schedule'
 import { getWorkDetail, type WorkAction } from './workApi'
 import { workDetail, workItem } from './work.test-support'
+import { getCargoVerification } from './cargoVerificationApi'
 
 const routing = vi.hoisted(() => ({ query: { date: '2026-10-19' } as Record<string, string>, push: vi.fn(), replace: vi.fn(), denied: new Set<string>() }))
 vi.mock('vue-router', () => ({ useRoute: () => routing, useRouter: () => routing, onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
@@ -19,6 +20,7 @@ vi.mock('./scheduleApi', () => ({ getCalendarSources: vi.fn(), getWarehouseArriv
 vi.mock('./tripCalendar', async original => ({ ...await original<typeof import('./tripCalendar')>(), listTripCalendar: vi.fn() }))
 vi.mock('./planningApi', async original => ({ ...await original<typeof import('./planningApi')>(), listPlanningCargo: vi.fn(), previewPlanningBatch: vi.fn(), resolvePlanningSource: vi.fn(), createSourceAppointment: vi.fn() }))
 vi.mock('./workApi', async original => ({ ...await original<typeof import('./workApi')>(), getWorkDetail: vi.fn() }))
+vi.mock('./cargoVerificationApi', () => ({ getCargoVerification: vi.fn(), saveCargoVerification: vi.fn() }))
 enableAutoUnmount(afterEach)
 afterEach(() => { vi.unstubAllGlobals() })
 const warehouse: WarehouseArrival = { sourceContainerBookingId: '9007199254740999', containerNo: 'TEST-CONT', warehouseName: '美国仓', warehouseCode: 'US-W', plannedAt: null, actualAt: null, version: 3, planCount: 0, canEdit: true }
@@ -35,6 +37,7 @@ beforeEach(() => {
   vi.mocked(saveWarehouseArrival).mockResolvedValue({})
   vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], total: 1, page: 1, size: 20, pages: 1 })
   vi.mocked(resolvePlanningSource).mockResolvedValue({ source, coverage: { status: 'NONE', missingFields: [], changeReviewRequired: false, appointments: [] } })
+  vi.mocked(getCargoVerification).mockResolvedValue({ source, verification: null, allocatedPackages: 0, unknownAllocationCount: 0, effectivePackages: 20, effectiveShipmentReferences: ['FBA-TEST'], availablePackages: 20, sourceChanged: false, allowedActions: [], blockReasons: [] })
   vi.mocked(previewPlanningBatch).mockResolvedValue(preview)
   vi.mocked(createSourceAppointment).mockResolvedValue(batchContext().appointment)
   vi.mocked(getWorkDetail).mockResolvedValue(workDetail())
@@ -52,6 +55,7 @@ async function create(wrapper: Awaited<ReturnType<typeof open>>) {
   const content = creationBody()
   await content.get('input[type="checkbox"]').setValue(true)
   await content.findAll('button').find(button => button.text().startsWith('下一步'))!.trigger('click'); await flushPromises()
+  await content.get('input[placeholder="填写收货方提供的确认号"]').setValue('CONFIRM-NEW'); await flushPromises()
   return dialog
 }
 function creationBody() { return new DOMWrapper(Array.from(document.querySelectorAll<HTMLElement>('.el-dialog')).find(item => item.textContent?.includes('新增FBA送仓预约'))!) }
@@ -72,17 +76,19 @@ it('keeps the arrival context and typed local time across native fullscreen and
   await dialog.get('.el-dialog__footer .el-button--primary').trigger('click'); await flushPromises()
   expect(saveWarehouseArrival).toHaveBeenCalledExactlyOnceWith(warehouse.sourceContainerBookingId, { estimatedWarehouseArrivalAt: '2026-10-22T09:30:00', expectedVersion: 3 }, expect.any(String))
 })
-it('locks the real arrival input after an unknown outcome and reuses its immutable request', async () => {
+it('keeps the real arrival input editable after a failed attempt and submits the edited time with a fresh key', async () => {
   vi.mocked(saveWarehouseArrival).mockRejectedValueOnce(new Error('connection lost'))
   const wrapper = await open(); wrapper.getComponent({ name: 'AppointmentCalendarPanel' }).vm.$emit('edit', event); await flushPromises()
   const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title') === '调整计划到仓')!
   dialog.getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-10-22T09:30'); await flushPromises()
   await dialog.get('.el-dialog__footer .el-button--primary').trigger('click'); await flushPromises()
-  expect(dialog.get('input').attributes('disabled')).toBeDefined()
-  expect(dialog.text()).toContain('上次提交结果尚未确认')
-  expect(dialog.get('.el-dialog__footer .el-button--primary').text()).toBe('重试确认保存结果')
+  expect(dialog.get('input').attributes('disabled')).toBeUndefined()
+  expect(dialog.get('.el-dialog__footer .el-button--primary').text()).toBe('保存')
+  dialog.getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-10-23T09:30'); await flushPromises()
   await dialog.get('.el-dialog__footer .el-button--primary').trigger('click'); await flushPromises()
-  expect(vi.mocked(saveWarehouseArrival).mock.calls[1]).toEqual(vi.mocked(saveWarehouseArrival).mock.calls[0])
+  const calls = vi.mocked(saveWarehouseArrival).mock.calls
+  expect(calls[1]![2]).not.toBe(calls[0]![2])
+  expect(calls[1]![1]).toEqual({ estimatedWarehouseArrivalAt: '2026-10-23T09:30:00', expectedVersion: 3 })
 })
 it('clears the Element arrival picker without saving an empty required time', async () => {
   const wrapper = await open(); wrapper.getComponent({ name: 'AppointmentCalendarPanel' }).vm.$emit('edit', event); await flushPromises()
@@ -114,7 +120,7 @@ it('preserves real FBA fields and entered values when expanding the create dialo
   expect(dialog.findComponent({ name: 'ElDialog' }).props('fullscreen')).toBe(true)
   expect(date.props('modelValue')).toBe('2026-10-25')
   await creationBody().findAll('button').find(button => button.text() === '保存预约安排')!.trigger('click'); await flushPromises()
-  expect(createSourceAppointment).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ sources: [{ sourceKey: source.sourceKey, customerId: source.customerId, destinationKey: 'FBA:LAX9' }], details: expect.objectContaining({ plannedDate: '2026-10-25', plannedAt: null, appointmentStatus: 'PENDING' }), idempotencyKey: expect.any(String) }))
+  expect(createSourceAppointment).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ sources: [{ sourceKey: source.sourceKey, customerId: source.customerId, destinationKey: 'FBA:LAX9' }], details: expect.objectContaining({ plannedDate: '2026-10-25', plannedAt: null, appointmentStatus: 'SUCCESS', confirmationNo: 'CONFIRM-NEW', appointmentAt: null }), idempotencyKey: expect.any(String) }))
   expect(creationBody().get('[aria-label="预约保存回执"]').findAll('input, textarea, select')).toHaveLength(0)
   expect(creationBody().text()).toContain('AP-001')
 })
@@ -141,9 +147,10 @@ it('uses the same real continuous form through the original work detail deep lin
   const wrapper = await open(); await vi.dynamicImportSettled(); await flushPromises()
   const content = new DOMWrapper(Array.from(document.querySelectorAll<HTMLElement>('.el-dialog')).find(item => item.textContent?.includes('原业务预约办理'))!)
   await content.get('.primary-next-action').trigger('click'); await flushPromises()
+  await content.get('input[placeholder="填写收货方提供的确认号"]').setValue('CONFIRM-NEW'); await flushPromises()
   expect(wrapper.getComponent({ name: 'FbaAppointmentFields' }).props('continuous')).toBe(true)
   expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith(action.target.kind === 'FBA_APPOINTMENT' ? action.target.sources : [])
   await content.findAll('button').find(button => button.text() === '保存预约安排')!.trigger('click'); await flushPromises()
-  expect(createSourceAppointment).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ sources: [{ sourceKey: source.sourceKey, customerId: source.customerId, destinationKey: source.destinationKey }], details: expect.objectContaining({ plannedAt: null, appointmentStatus: 'PENDING' }) }))
+  expect(createSourceAppointment).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ sources: [{ sourceKey: source.sourceKey, customerId: source.customerId, destinationKey: source.destinationKey }], details: expect.objectContaining({ plannedAt: null, appointmentStatus: 'SUCCESS', confirmationNo: 'CONFIRM-NEW', appointmentAt: null }) }))
   expect(content.text()).toContain('本次保存已完成')
 })