fix: close appointment cancellation bypass and clarify verified cargo

2026-10-11 14:14:49 +08:00
parent 240aa5d6d0
commit ee174f8265
13 changed files with 131 additions and 24 deletions
@@ -0,0 +1,37 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { expect, it, vi } from 'vitest'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import InboundOrdersView from './InboundOrdersView.vue'
+import { getFbaAppointment, updateFbaAppointment } from '../api/inboundOrders'
+vi.mock('vue-router', () => ({ useRouter: () => ({push: vi.fn()}), onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({can: () => true}) }))
+vi.mock('../api/inboundOrders', () => ({
+  listInboundOrders: vi.fn().mockResolvedValue({records:[{lineId:'1',planNo:'IP-1',customerId:'A',appointmentNo:'AP-1',fbaWarehouseCode:'ONT8'}],total:1}),
+  getFbaAppointment: vi.fn(), updateFbaAppointment: vi.fn(), createFbaAppointment: vi.fn(), updateInboundPlan: vi.fn(),
+}))
+vi.mock('element-plus', () => ({ ElMessage: {warning:vi.fn(),success:vi.fn()} }))
+it('keeps the inbound appointment retry across close, reopen and route attempts', async () => {
+  vi.mocked(getFbaAppointment).mockResolvedValue({id:'1',appointmentNo:'AP-1',version:2,originWarehouseId:'100',fbaWarehouseCode:'ONT8',appointmentStatus:'PENDING',selectedCount:1,items:[]})
+  vi.mocked(updateFbaAppointment).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({} as never)
+  const wrapper=mount(InboundOrdersView,{global:{directives:{loading:{}},stubs:{
+    AdminPage:{template:'<main><slot/></main>'},ListPageLayout:{template:'<div><slot/></div>'},
+    DataTable:{props:['data'],template:'<div><slot v-for="row in data" name="actions" :row="row"/></div>'},
+    AppDialog:{name:'AppDialog',props:['modelValue','beforeClose'],template:'<section v-if="modelValue"><slot/><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save @click="$emit(\'confirm\')">保存</button></section>'},
+    ElButton:{template:'<button><slot/></button>'}, FbaAppointmentFields:true,SmartDispatchDialog:true,QueryToolbar:true,OperationErrorToast:true,
+  }}})
+  await flushPromises()
+  const open=()=>wrapper.findAll('button').find(b=>b.text()==='预约')!.trigger('click')
+  await open();await flushPromises();await wrapper.get('[data-save]').trigger('click');await flushPromises()
+  const original=vi.mocked(updateFbaAppointment).mock.calls[0]![1]
+  await wrapper.get('[data-close]').trigger('click')
+  const dialog=wrapper.findAllComponents({name:'AppDialog'})[0]!
+  const done=vi.fn();dialog.props('beforeClose')(done);expect(done).not.toHaveBeenCalled()
+  expect(wrapper.find('[data-save]').exists()).toBe(true)
+  await open();await flushPromises();expect(getFbaAppointment).toHaveBeenCalledTimes(1)
+  for(const hook of [onBeforeRouteLeave,onBeforeRouteUpdate]) expect((vi.mocked(hook).mock.calls[0]![0] as () => boolean)()).toBe(false)
+  await wrapper.get('[data-save]').trigger('click');await flushPromises()
+  expect(updateFbaAppointment).toHaveBeenNthCalledWith(2,'AP-1',original)
+  expect(wrapper.find('[data-save]').exists()).toBe(false)
+  expect((vi.mocked(onBeforeRouteLeave).mock.calls[0]![0] as () => boolean)()).toBe(true)
+  wrapper.unmount()
+})