优化

src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts

@@ -17,7 +17,7 @@ vi.mock('@/modules/overseas-master-data', async () => ({
   inquiryReturnTarget: (value: Record<string, string>) => 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]) })
+beforeEach(() => { vi.clearAllMocks(); 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 value = detail(); value.dispatchInfo.fbaAppointments = [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'BATCH-1', appointmentNo: 'FBA-AP-1', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', status: 'CONFIRMED', confirmedAt: null, blockReason: null }]
@@ -104,4 +104,45 @@ describe('whole-dispatch four-tab detail', () => {
     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()
   })
+  it.each(['saved', 'rejected'] as const)('refreshes detail actions after the workflow %s event and retains a real rejection after closure', async event => {
+    can.mockReturnValue(true)
+    vi.mocked(getDispatch).mockResolvedValueOnce(detail({ actions: { SUBMIT_REVIEW: { allowed: true, blockCode: null, blockReason: null } } }))
+    const wrapper = mount(DispatchDetailView, options); await flushPromises()
+    await wrapper.findAll('button').find(button => button.text() === '提交调度审核')!.trigger('click')
+    vi.mocked(getDispatch).mockResolvedValueOnce(detail({ recordVersion: 1, actions: { SUBMIT_REVIEW: { allowed: false, blockCode: 'ALREADY_SUBMITTED', blockReason: '已提交' } } }))
+    const dialog = wrapper.getComponent({ name: 'DispatchWorkflowDialog' })
+    if (event === 'rejected') dialog.vm.$emit('rejected', { message: '本轮审核已经提交', code: 'A0409', requestId: 'detail-reject-request' })
+    else dialog.vm.$emit('saved')
+    dialog.vm.$emit('update:modelValue', false)
+    await flushPromises()
+    expect(getDispatch).toHaveBeenCalledTimes(2)
+    expect(wrapper.findAll('button').some(button => button.text() === '提交调度审核')).toBe(false)
+    expect(wrapper.findAll('[role="tab"]')).toHaveLength(4)
+    if (event === 'rejected') {
+      expect(wrapper.text()).toContain('本轮审核已经提交')
+      expect(wrapper.text()).toContain('A0409')
+      expect(wrapper.text()).toContain('detail-reject-request')
+    }
+    expect(wrapper.text()).not.toContain('结果尚待核对')
+    wrapper.unmount()
+  })
+  it('retains a workflow rejection when the parent detail refresh also fails', async () => {
+    const wrapper = mount(DispatchDetailView, options); await flushPromises()
+    vi.mocked(getDispatch).mockRejectedValueOnce(new Error('detail read failed'))
+    wrapper.getComponent({ name: 'DispatchWorkflowDialog' }).vm.$emit('rejected', { message: '已提交，请刷新', code: 'A0409' })
+    await flushPromises()
+    expect(wrapper.text()).toContain('已提交，请刷新')
+    expect(wrapper.text()).toContain('A0409')
+    expect(wrapper.text()).toContain('排车详情加载失败')
+    wrapper.unmount()
+  })
+  it('clears an earlier input rejection after the corrected workflow succeeds', async () => {
+    const wrapper = mount(DispatchDetailView, options); await flushPromises()
+    const dialog = wrapper.getComponent({ name: 'DispatchWorkflowDialog' })
+    dialog.vm.$emit('rejected', { message: '请补齐本趟资料', code: 'A0400' }); await flushPromises()
+    expect(wrapper.text()).toContain('请补齐本趟资料')
+    dialog.vm.$emit('saved'); await flushPromises()
+    expect(wrapper.text()).not.toContain('请补齐本趟资料')
+    wrapper.unmount()
+  })
 })

src/modules/overseas-warehouse/pages/DispatchDetailView.vue

@@ -21,6 +21,7 @@ import { overseasWarehousePermissions as permission } from '../permissions'
 const route = useRoute(), router = useRouter(), access = useAccessPreviewStore()
 const dispatchNo = computed(() => String(route.params.dispatchNo || ''))
 const detail = ref<DispatchDetail | null>(null), activeTab = ref('vehicle'), loading = ref(false), loadError = ref<ApiErrorDetails | null>(null)
+const rejectionError = ref<ApiErrorDetails | null>(null)
 const operation = ref<'ROUTE' | undefined>()
 const action = ref<DispatchAction>('EDIT'), actionOpen = ref(false)
 const detailActions: DispatchAction[] = ['EDIT', 'ADD_CARGO', 'REMOVE_CARGO', 'SUBMIT_REVIEW', 'DISPATCH_REVIEW', 'LOADING_REVIEW', 'RETURN_TO_REVIEW', 'LOADING_COMPLETE', 'ARRANGE_DELIVERY', 'DEPART', 'CANCEL']
@@ -65,13 +66,16 @@ async function load() {
   finally { if (current === generation) loading.value = false }
 }
 function back() { void router.push(inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' }) }
-function openAction(value: DispatchAction, requestedOperation?: 'ROUTE') { if (!canDispatchAction(detail.value?.actions, value, access.can)) return; operation.value = requestedOperation; action.value = value; actionOpen.value = true }
+function openAction(value: DispatchAction, requestedOperation?: 'ROUTE') { if (!canDispatchAction(detail.value?.actions, value, access.can)) return; rejectionError.value = null; operation.value = requestedOperation; action.value = value; actionOpen.value = true }
+async function handleRejection(details: ApiErrorDetails) { rejectionError.value = details; await load() }
+async function handleSaved() { rejectionError.value = null; await load() }
 watch(dispatchNo, load, { immediate: true })
 onBeforeUnmount(() => { generation++ })
 </script>
 
 <template>
   <OverseasDetailShell class="admin-density" dense title="排车详情" reference-label="排车单号" :reference-value="detail?.dispatchNo || dispatchNo" :back-text="inquiryReturnTarget(route.query) ? '返回原拼车登记' : undefined" :back-label="inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表'" domain="排车详情" :pending="false" :status-text="detail ? detail.status === 'CANCELLED' ? '已取消' : stageLabel(detail.stage) : '加载中'" @back="back">
+    <LoadErrorState v-if="rejectionError" title="排车操作未完成" :message="rejectionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="rejectionError" /></template></LoadErrorState>
     <LoadErrorState v-if="loadError" title="排车详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <div v-else v-loading="loading" class="dispatch-detail" :aria-busy="loading">
       <section v-if="detail" class="detail-section" aria-label="排车操作"><div class="density-actions"><el-button v-for="value in visibleActions" :key="value" class="density-action" @click="openAction(value)">{{ dispatchActionLabels[value] }}</el-button><el-button v-if="canDispatchAction(detail?.actions, 'EDIT', access.can)" @click="openAction('EDIT', 'ROUTE')">调整卸货顺序</el-button></div></section>
@@ -85,7 +89,7 @@ onBeforeUnmount(() => { generation++ })
         <el-tab-pane name="orders"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>关联订单明细</span></template><DataTable :data="relatedOrders" :columns="orderColumns" column-settings-mode="hide" row-key="sourceKey" empty-text="暂无关联订单明细" /></el-tab-pane>
       </el-tabs>
     </div>
-    <DispatchWorkflowDialog v-model="actionOpen" :dispatch-no="dispatchNo" :action="action" :operation="operation" @saved="load" />
+    <DispatchWorkflowDialog v-model="actionOpen" :dispatch-no="dispatchNo" :action="action" :operation="operation" @saved="handleSaved" @rejected="handleRejection" />
   </OverseasDetailShell>
 </template>
 

src/modules/overseas-warehouse/pages/DispatchesView.test.ts

@@ -6,7 +6,7 @@ import DispatchesView from './DispatchesView.vue'
 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 { command, detail, listRow, page } from '../dispatchTestFixtures'
 import type { DispatchPage } from '../dispatchContracts'
 import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
 const identity = vi.hoisted(() => ({ id: '' }))
@@ -69,3 +69,45 @@ it('navigates by the business number without arranging a separate trip', async (
 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()
 })
+it.each(['saved', 'rejected'] as const)('refreshes list actions after workflow %s without retaining a stale submit button', async event => {
+  vi.mocked(listDispatches).mockResolvedValueOnce(page([listRow({ actions: { SUBMIT_REVIEW: { allowed: true, blockCode: null, blockReason: null } } })]))
+  const wrapper = mount(DispatchesView, options); await flushPromises()
+  const row = wrapper.findAllComponents(RowActions).find(entry => entry.props('moreLabel') === '更多操作 · PC/1')!
+  expect(row.props('actions')).toContainEqual(expect.objectContaining({ key: 'SUBMIT_REVIEW' }))
+  row.vm.$emit('action', 'SUBMIT_REVIEW'); await flushPromises()
+  vi.mocked(listDispatches).mockResolvedValueOnce(page([listRow({ recordVersion: 1, actions: { SUBMIT_REVIEW: { allowed: false, blockCode: 'ALREADY_SUBMITTED', blockReason: '审核已提交' } } })]))
+  const dialog = wrapper.getComponent({ name: 'DispatchWorkflowDialog' })
+  if (event === 'rejected') dialog.vm.$emit('rejected', { message: '本轮审核已经提交', code: 'A0409', requestId: 'list-reject-request' })
+  else dialog.vm.$emit('saved')
+  dialog.vm.$emit('update:modelValue', false); await flushPromises()
+  expect(listDispatches).toHaveBeenCalledTimes(2)
+  expect(row.props('actions')).not.toContainEqual(expect.objectContaining({ key: 'SUBMIT_REVIEW' }))
+  if (event === 'rejected') {
+    expect(wrapper.text()).toContain('本轮审核已经提交')
+    expect(wrapper.text()).toContain('A0409')
+    expect(wrapper.text()).toContain('list-reject-request')
+  }
+  expect(wrapper.text()).not.toContain('结果尚待核对')
+  wrapper.unmount()
+})
+it('describes a proven command awaiting its GET as completed instead of unknown', async () => {
+  const recovery = useDispatchCommandRecovery(() => identity.id)
+  recovery.begin('PC/1', 'SUBMIT_REVIEW', { recordVersion: 0, idempotencyKey: 'known-key' })
+  recovery.pending.value!.attempted = true
+  recovery.pending.value!.result = command('SUBMIT_REVIEW', 'known-key')
+  const wrapper = mount(DispatchesView, options); await flushPromises()
+  expect(wrapper.text()).toContain('操作已完成，页面资料待刷新')
+  expect(wrapper.text()).not.toContain('结果尚待核对')
+  await wrapper.findAll('button').find(button => button.text() === '刷新页面资料')!.trigger('click')
+  expect(wrapper.getComponent({ name: 'DispatchWorkflowDialog' }).props()).toMatchObject({ modelValue: true, action: 'SUBMIT_REVIEW', dispatchNo: 'PC/1' })
+  wrapper.unmount()
+})
+it('clears an earlier input rejection after the corrected workflow succeeds', async () => {
+  const wrapper = mount(DispatchesView, options); await flushPromises()
+  const dialog = wrapper.getComponent({ name: 'DispatchWorkflowDialog' })
+  dialog.vm.$emit('rejected', { message: '请补齐本趟资料', code: 'A0400' }); await flushPromises()
+  expect(wrapper.text()).toContain('请补齐本趟资料')
+  dialog.vm.$emit('saved'); await flushPromises()
+  expect(wrapper.text()).not.toContain('请补齐本趟资料')
+  wrapper.unmount()
+})

src/modules/overseas-warehouse/pages/DispatchesView.vue

@@ -28,6 +28,7 @@ const route = useRoute(), router = useRouter(), access = useAccessPreviewStore()
 const auth = useAuthStore(), recovery = useDispatchCommandRecovery(() => auth.user?.id || '')
 const rows = ref<DispatchListRow[]>([]), statistics = ref<DispatchStatistics | null>(null)
 const loading = ref(false), loadError = ref<ApiErrorDetails | null>(null), mutationError = ref<ApiErrorDetails | null>(null)
+const rejectionError = ref<ApiErrorDetails | null>(null)
 const page = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
@@ -78,12 +79,15 @@ function rowActions(row: DispatchListRow): RowActionItem[] {
 function handleAction(value: string, row: DispatchListRow) {
   if (value === 'detail') return openDetail(row)
   if (value === 'bol') return void openBol(row)
+  rejectionError.value = null
   if (value === 'route-order') { if (!canDispatchAction(row.actions, 'EDIT', access.can)) return; operation.value = 'ROUTE'; action.value = 'EDIT'; actionNo.value = row.dispatchNo; actionOpen.value = true; return }
   operation.value = undefined
   const requested = value as DispatchAction
   if (!canDispatchAction(row.actions, requested, access.can)) return
   action.value = requested; actionNo.value = row.dispatchNo; actionOpen.value = true
 }
+async function handleRejection(details: ApiErrorDetails) { rejectionError.value = details; await load() }
+async function handleSaved() { rejectionError.value = null; await load() }
 function recoverPending() {
   const command = recovery.pending.value
   if (!command) return
@@ -109,7 +113,8 @@ onBeforeUnmount(() => { sequence++ })
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="海外仓排车列表">
     <OperationErrorToast :details="mutationError" />
-    <p v-if="recovery.pending.value" role="status">{{ recovery.pending.value.dispatchNo || '新排车单' }} 的{{ dispatchActionLabels[recovery.pending.value.action] }}结果尚待核对。<el-button link :disabled="recovery.busy.value" @click="recoverPending">核对原请求</el-button></p>
+    <LoadErrorState v-if="rejectionError" title="排车操作未完成" :message="rejectionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="rejectionError" /></template></LoadErrorState>
+    <p v-if="recovery.pending.value" role="status">{{ recovery.pending.value.dispatchNo || '新排车单' }} 的{{ dispatchActionLabels[recovery.pending.value.action] }}{{ recovery.pending.value.result ? '操作已完成，页面资料待刷新。' : '结果尚待核对。' }}<el-button link :disabled="recovery.busy.value" @click="recoverPending">{{ recovery.pending.value.result ? '刷新页面资料' : '核对原请求' }}</el-button></p>
     <DataTable v-model:page="page" v-model:page-size="pageSize" appearance="integrated" :stripe="false" :data="rows" :columns="columns" :loading="loading" :total="total" :preference-key="preferenceKey" row-key="dispatchNo" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
       <template #toolbar-start><el-button v-if="appointmentReturnTarget(route.query)" link @click="router.push(appointmentReturnTarget(route.query)!)">返回预约工作</el-button><h1>排车列表</h1></template>
       <template #toolbar-end><el-button v-if="access.can(dispatchActionPermissions.CREATE)" type="primary" @click="createOpen = true">新建排车</el-button></template>
@@ -122,6 +127,6 @@ onBeforeUnmount(() => { sequence++ })
     </DataTable>
   </ListPageLayout></AdminPage>
   <SmartDispatchDialog v-model="createOpen" :orders="[]" @created="load" />
-  <DispatchWorkflowDialog v-model="actionOpen" :dispatch-no="actionNo" :action="action" :operation="operation" @saved="load" />
+  <DispatchWorkflowDialog v-model="actionOpen" :dispatch-no="actionNo" :action="action" :operation="operation" @saved="handleSaved" @rejected="handleRejection" />
   <TransportRouteDialog v-model="routeOpen" :origin="routeOrigin" :destinations="routeDestinations" />
 </template>