优化

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts

@@ -12,7 +12,7 @@ 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('../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(): 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 }; detail: DispatchDetail }
+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 }; detail: DispatchDetail }
 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()
@@ -215,3 +215,65 @@ it('does not submit an exception when the server disallows the action', async ()
   state.exception.exceptionType = 'REFUSED'; await state.submit()
   expect(api.markDispatchException).not.toHaveBeenCalled(); wrapper.unmount()
 })
+
+it('submits review from vehicle maintenance after saving the current inputs and reading the new version', async () => {
+  const { wrapper, state } = await open('EDIT')
+  const gate = { allowed: true, blockCode: null, blockReason: null }
+  expect(wrapper.find('[aria-label="本次操作备注"]').exists()).toBe(false)
+  expect(wrapper.findAll('button').some(button => button.text() === '保存')).toBe(true)
+  expect(wrapper.findAll('button').some(button => button.text() === '提交审核')).toBe(true)
+  vi.mocked(api.updateDispatch).mockImplementation(async (_, body) => command('EDIT', body.idempotencyKey))
+  vi.mocked(api.submitDispatchReview).mockImplementation(async (_, body) => ({ ...command('SUBMIT_REVIEW', body.idempotencyKey), recordVersion: 2 }))
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1, actions: { EDIT: gate, SUBMIT_REVIEW: gate } })).mockResolvedValueOnce(detail({ recordVersion: 2 }))
+  await state.submit(true)
+  expect(api.updateDispatch).toHaveBeenCalledWith('PC/1', expect.objectContaining({ recordVersion: 0, vehicle: expect.any(Object), driver: expect.any(Object) }))
+  expect(api.submitDispatchReview).toHaveBeenCalledWith('PC/1', expect.objectContaining({ recordVersion: 1, remark: null }))
+  expect(vi.mocked(api.updateDispatch).mock.invocationCallOrder[0]).toBeLessThan(vi.mocked(api.submitDispatchReview).mock.invocationCallOrder[0]!)
+  expect(wrapper.emitted('update:modelValue')).toContainEqual([false]); wrapper.unmount()
+})
+it('save alone never submits review and a failed save cannot advance review', async () => {
+  const first = await open('EDIT')
+  vi.mocked(api.updateDispatch).mockImplementationOnce(async (_, body) => command('EDIT', body.idempotencyKey))
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1 }))
+  await first.state.submit(); expect(api.submitDispatchReview).not.toHaveBeenCalled(); first.wrapper.unmount()
+  const second = await open('EDIT')
+  vi.mocked(api.updateDispatch).mockRejectedValueOnce(new ApiResponseError('车辆资料不完整', 'A0400'))
+  await second.state.submit(true); expect(api.submitDispatchReview).not.toHaveBeenCalled()
+  expect(second.wrapper.text()).toContain('车辆资料不完整'); second.wrapper.unmount()
+})
+it('rechecks review eligibility after save and leaves the saved editor open if blocked', async () => {
+  const { wrapper, state } = await open('EDIT')
+  vi.mocked(api.updateDispatch).mockImplementationOnce(async (_, body) => command('EDIT', body.idempotencyKey))
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null }, SUBMIT_REVIEW: { allowed: false, blockCode: 'MISSING', blockReason: '预约资料未齐全' } } }))
+  await state.submit(true)
+  expect(api.submitDispatchReview).not.toHaveBeenCalled(); expect(state.detail.recordVersion).toBe(1)
+  expect(wrapper.text()).toContain('预约资料未齐全'); expect(wrapper.emitted('update:modelValue')).toBeUndefined(); wrapper.unmount()
+})
+it('retains the follow-up review intent through an unknown save and does not save twice on recovery', async () => {
+  const { wrapper, state } = await open('EDIT')
+  vi.mocked(api.updateDispatch).mockRejectedValueOnce(new Error('save outcome unknown'))
+  await state.submit(true)
+  const pending = useDispatchCommandRecovery(() => identity.id).pending.value!
+  expect(pending.submitReviewAfterSave).toBe(true)
+  expect(JSON.parse(sessionStorage.getItem(`dispatch-command:${identity.id}`)!).submitReviewAfterSave).toBe(true)
+  vi.mocked(api.getDispatchCommand).mockResolvedValueOnce(command('EDIT', String(pending.body.idempotencyKey)))
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1, actions: { SUBMIT_REVIEW: { allowed: true, blockCode: null, blockReason: null } } })).mockResolvedValueOnce(detail({ recordVersion: 2 }))
+  vi.mocked(api.submitDispatchReview).mockImplementationOnce(async (_, body) => ({ ...command('SUBMIT_REVIEW', body.idempotencyKey), recordVersion: 2 }))
+  await state.submit()
+  expect(api.updateDispatch).toHaveBeenCalledTimes(1); expect(api.submitDispatchReview).toHaveBeenCalledTimes(1)
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value).toBeNull(); wrapper.unmount()
+})
+it('recovers an unknown review submission without saving the vehicle again', async () => {
+  const { wrapper, state } = await open('EDIT')
+  vi.mocked(api.updateDispatch).mockImplementationOnce(async (_, body) => command('EDIT', body.idempotencyKey))
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1, actions: { SUBMIT_REVIEW: { allowed: true, blockCode: null, blockReason: null } } }))
+  vi.mocked(api.submitDispatchReview).mockRejectedValueOnce(new Error('review outcome unknown'))
+  await state.submit(true)
+  const pending = useDispatchCommandRecovery(() => identity.id).pending.value!
+  expect(pending.action).toBe('SUBMIT_REVIEW'); expect(pending.body).toMatchObject({ recordVersion: 1, remark: null })
+  vi.mocked(api.getDispatchCommand).mockResolvedValueOnce({ ...command('SUBMIT_REVIEW', String(pending.body.idempotencyKey)), recordVersion: 2 })
+  vi.mocked(api.getDispatch).mockResolvedValueOnce(detail({ recordVersion: 2 }))
+  await state.submit()
+  expect(api.updateDispatch).toHaveBeenCalledTimes(1); expect(api.submitDispatchReview).toHaveBeenCalledTimes(1)
+  expect(wrapper.emitted('update:modelValue')).toContainEqual([false]); wrapper.unmount()
+})