From aac878c3d4300f02ab00826da7444321b1f4a4fa Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Thu, 22 Oct 2026 14:55:53 +0800
Subject: [PATCH] fix(dispatch): finish original truck appointment linking

---
 .../DispatchAppointmentAllocationsDialog.vue        |  2 +-
 .../components/DispatchWorkflowDialog.test.ts       | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/modules/overseas-warehouse/components/DispatchAppointmentAllocationsDialog.vue b/src/modules/overseas-warehouse/components/DispatchAppointmentAllocationsDialog.vue
index 8d7867d3..16db874d 100644
--- a/src/modules/overseas-warehouse/components/DispatchAppointmentAllocationsDialog.vue
+++ b/src/modules/overseas-warehouse/components/DispatchAppointmentAllocationsDialog.vue
@@ -91,7 +91,7 @@ onBeforeUnmount(() => { generation++ })
 
 <template>
   <AppDialog v-model="open" class="admin-density-dialog admin-density" :title="`关联正式预约 · ${dispatchNo}`" width="1100px" fullscreenable
-    confirm-text="保存关联" :loading="loading" :confirm-loading="saving" :confirm-disabled="!canSave" :close-on-click-modal="!saving" :close-on-press-escape="!saving" @confirm="save">
+    confirm-text="保存关联" :loading="loading" :confirm-loading="saving" :confirm-disabled="!canSave" :close-on-press-escape="!saving" @confirm="save">
     <LoadErrorState v-if="error" title="正式预约关联未完成" :message="error.message" :loading="loading || saving" retry-text="刷新当前预约" @retry="load(true)"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <el-alert v-if="context && !permitted" :title="context.edit.blockReason || '当前无关联预约资格'" type="warning" :closable="false" show-icon />
     <p class="density-dialog-note">按本车每托、每票货物核对已确认的正式预约及箱数。保存后保留原排车，重新提交两级审核。</p>
diff --git a/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts b/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts
index e5bdf3de..11abf8c0 100644
--- a/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts
+++ b/src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts
@@ -11,6 +11,7 @@ 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: '<div />' } }))
+vi.mock('./DispatchAppointmentAllocationsDialog.vue', () => ({ default: { name: 'DispatchAppointmentAllocationsDialog', props: ['modelValue', 'dispatchNo'], emits: ['saved', 'update:modelValue'], template: '<div />' } }))
 vi.mock('../api/dispatches', () => ({ markDispatchException: vi.fn(), getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn() }))
 interface State { exception: { exceptionType: string; returnDirection: string; description: string; imageFileIds: string[] }; submit(submitReviewAfterSave?: boolean): Promise<void>; retryError(): Promise<void>; measurements: Array<{ weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null; palletSpaces: number | null }>; form: { reason: string; decision: string; remark: string; publishLooseboardDemand: boolean }; detail: DispatchDetail }
 async function open(action: DispatchAction, allowed = true) {
@@ -19,6 +20,18 @@ async function open(action: DispatchAction, allowed = true) {
   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('opens appointment linking from vehicle maintenance and refreshes the original version without losing unsaved inputs', async () => {
+  const { wrapper, state } = await open('EDIT')
+  state.form.remark = '尚未保存的车辆备注'
+  const button = wrapper.findAll('button').find(button => button.text() === '关联正式预约')
+  expect(button).toBeDefined(); await button!.trigger('click'); await flushPromises()
+  const child = wrapper.findComponent({ name: 'DispatchAppointmentAllocationsDialog' })
+  expect(child.props('dispatchNo')).toBe('PC/1')
+  vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 2 }))
+  child.vm.$emit('saved'); await flushPromises()
+  expect(state.detail.recordVersion).toBe(2); expect(state.form.remark).toBe('尚未保存的车辆备注')
+  expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+})
 it('confirms scanned cargo without requesting measurements and preserves native version zero', async () => {
   const value = loadingPreview(); value.pallets[0]!.weightKg = 100; value.pallets[0]!.volumeCbm = 2
   vi.mocked(api.getDispatchLoading).mockResolvedValue(value)