优化

src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
-import { computed, ref, watch } from 'vue'
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { ElMessage, ElMessageBox, type UploadFile } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LineClampText from '@/shared/components/LineClampText.vue'
@@ -33,6 +33,7 @@ const visibleGroups = computed(() => draft.value.filter(item => !props.categorie
 const dirty = computed(() => Boolean(snapshot.value) && (bolNo.value !== (snapshot.value?.bolNo || '') || draft.value.some(group => JSON.stringify(group.files.map(file => file.fileId)) !== JSON.stringify(snapshot.value?.categories.find(item => item.category === group.category)?.files.map(file => file.fileId) || []))))
 defineExpose({ busy, dirty, canEdit, loading, conflict, save })
 let sequence = 0
+onBeforeUnmount(() => { sequence++ })
 function isCurrent(current: number, deliveryNo: string, customerId: string) { return current === sequence && open.value && props.deliveryNo === deliveryNo && props.customerId === customerId }
 let attempt: { body: string; key: string } | null = null
 async function load() {

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

@@ -0,0 +1,62 @@
+import ElementPlus, { ElMessageBox } from 'element-plus'
+import { defineComponent, h } from 'vue'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import DispatchDocumentsDialog from './DispatchDocumentsDialog.vue'
+import DeliveryDocumentsDialog from './DeliveryDocumentsDialog.vue'
+import { detail } from '../dispatchTestFixtures'
+import { getDispatch } from '../api/dispatches'
+import { deliveryDocumentCategories, getDeliveryDocuments, saveDeliveryDocuments, type DeliveryDocuments } from '../api/deliveryDocuments'
+const can = vi.hoisted(() => vi.fn(() => true))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
+vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn() }))
+vi.mock('../api/deliveryDocuments', async original => ({ ...await original<typeof import('../api/deliveryDocuments')>(), getDeliveryDocuments: vi.fn(), saveDeliveryDocuments: vi.fn() }))
+const dialogStub = defineComponent({ props: ['modelValue', 'showConfirm'], emits: ['confirm'], setup(props, { slots, emit }) { return () => props.modelValue ? h('section', [slots.default?.(), props.showConfirm ? h('button', { class: 'save', onClick: () => emit('confirm') }, '保存资料') : null]) : null } })
+function documents(no = 'DL-1', customerId = '101'): DeliveryDocuments {
+  return { deliveryNo: no, customerId, version: 1, bolNo: 'BOL-ORIGINAL', uploadedCategoryCount: 1, totalCategoryCount: 3, allowedActions: ['MANAGE_DOCUMENTS'], replayed: false, categories: deliveryDocumentCategories.map(item => ({ category: item.category, status: item.category === 'RECEIPT' ? 'UPLOADED' : 'MISSING', fileCount: item.category === 'RECEIPT' ? 1 : 0, files: item.category === 'RECEIPT' ? [{ fileId: '99', fileName: 'existing-pod.pdf', contentType: 'application/pdf', sizeBytes: 10, uploadedAt: '2026-10-21T00:00:00' }] : [] })) }
+}
+function setup() { return mount(DispatchDocumentsDialog, { props: { modelValue: true, dispatchNo: 'PC/1' }, global: { plugins: [ElementPlus], stubs: { AppDialog: dialogStub, DispatchVehicleDocuments: true, DispatchLoadingDocuments: true, DispatchEvidenceFiles: true } } }) }
+beforeEach(() => {
+  vi.clearAllMocks(); can.mockReturnValue(true)
+  const value = detail(); value.stage = 'DELIVERING'
+  value.documents.deliveries = [
+    { deliveryNo: 'DL-1', customerId: '101', customerName: '客户甲', groupKey: 'A', outboundNo: 'OB-1', destination: { key: 'FBA:A', type: 'FBA', warehouseId: null, warehouseCode: 'A', warehouseName: null, address: null, postalCode: null, contactName: null, contactPhone: null }, status: 'DELIVERING', packageCount: 1, palletCount: 1 },
+    { deliveryNo: 'DL-2', customerId: '102', customerName: '客户乙', groupKey: 'B', outboundNo: 'OB-2', destination: { key: 'FBA:B', type: 'FBA', warehouseId: null, warehouseCode: 'B', warehouseName: null, address: null, postalCode: null, contactName: null, contactPhone: null }, status: 'DELIVERING', packageCount: 1, palletCount: 1 },
+  ]
+  vi.mocked(getDispatch).mockResolvedValue(value)
+  vi.mocked(getDeliveryDocuments).mockImplementation(async (no, customer) => documents(no, customer))
+  vi.mocked(saveDeliveryDocuments).mockResolvedValue({ ...documents(), version: 2 })
+})
+it('reads existing delivery files in one dialog and saves receipt without requiring loading or BOL files', async () => {
+  const wrapper = setup(); await flushPromises()
+  expect(getDeliveryDocuments).toHaveBeenCalledWith('DL-1', '101')
+  expect(wrapper.text()).toContain('existing-pod.pdf')
+  expect(wrapper.findAllComponents(DeliveryDocumentsDialog)).toHaveLength(1)
+  await wrapper.get('.save').trigger('click'); await flushPromises()
+  expect(saveDeliveryDocuments).toHaveBeenCalledWith('DL-1', '101', expect.objectContaining({ bolNo: 'BOL-ORIGINAL', documents: [{ category: 'LOADING_PHOTO', fileIds: [] }, { category: 'BOL', fileIds: [] }, { category: 'RECEIPT', fileIds: ['99'] }] }))
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  expect(wrapper.getComponent(DeliveryDocumentsDialog).props('modelValue')).toBe(true)
+  wrapper.unmount()
+})
+it('switches customer scope exactly and keeps unsaved delivery edits when switching tabs', async () => {
+  const wrapper = setup(); await flushPromises()
+  await wrapper.findAll('[role="tab"]').find(tab => tab.text() === '装车资料')!.trigger('click')
+  await wrapper.getComponent(DeliveryDocumentsDialog).find('input').setValue('BOL-CHANGED')
+  await wrapper.findAll('[role="tab"]').find(tab => tab.text() === '油耗图片')!.trigger('click')
+  expect(getDeliveryDocuments).toHaveBeenCalledTimes(1)
+  const confirmation = vi.spyOn(ElMessageBox, 'confirm').mockRejectedValue('cancel')
+  wrapper.getComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'DL-2'); await flushPromises()
+  expect(getDeliveryDocuments).toHaveBeenCalledTimes(1)
+  confirmation.mockResolvedValue('confirm' as Awaited<ReturnType<typeof ElMessageBox.confirm>>)
+  wrapper.getComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'DL-2'); await flushPromises()
+  expect(getDeliveryDocuments).toHaveBeenLastCalledWith('DL-2', '102')
+  expect(saveDeliveryDocuments).not.toHaveBeenCalled()
+  confirmation.mockRestore(); wrapper.unmount()
+})
+it('does not request delivery documents without delivery list permission', async () => {
+  can.mockImplementation((value?: string) => value !== 'platform:overseas-warehouse:delivery:list')
+  const wrapper = setup(); await flushPromises()
+  expect(getDeliveryDocuments).not.toHaveBeenCalled()
+  expect(wrapper.text()).toContain('当前账号无派送资料查看权限')
+  wrapper.unmount()
+})

src/modules/overseas-warehouse/components/DispatchDocumentsDialog.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { computed, ref, watch } from 'vue'
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { ElMessageBox } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -13,6 +13,7 @@ import type { DispatchDetail } from '../dispatchContracts'
 import { dispatchReviewAttachmentFields, dispatchReviewEvidence } from '../dispatchPresentation'
 import DeliveryDocumentsDialog from './DeliveryDocumentsDialog.vue'
 import DispatchVehicleDocuments from './DispatchVehicleDocuments.vue'
+import DispatchLoadingDocuments from './DispatchLoadingDocuments.vue'
 import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
 
 const open = defineModel<boolean>({ default: false })
@@ -22,18 +23,21 @@ const access = useAccessPreviewStore()
 const detail = ref<DispatchDetail | null>(null), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
 const tab = ref('RECEIPT'), selected = ref(''), fuelVisited = ref(false)
 const editor = ref<InstanceType<typeof DeliveryDocumentsDialog>>(), vehicleEditor = ref<InstanceType<typeof DispatchVehicleDocuments>>()
+const loadingEditor = ref<InstanceType<typeof DispatchLoadingDocuments>>()
 const deliveries = computed(() => detail.value?.documents.deliveries || [])
 const delivery = computed(() => deliveries.value.find(item => item.deliveryNo === selected.value))
 const reviewEvidence = computed(() => dispatchReviewEvidence(detail.value))
-const busy = computed(() => Boolean(editor.value?.busy || vehicleEditor.value?.busy))
+const busy = computed(() => Boolean(editor.value?.busy || vehicleEditor.value?.busy || loadingEditor.value?.busy))
 let sequence = 0
+onBeforeUnmount(() => { sequence++ })
 async function load() {
   const current = ++sequence; loading.value = true; error.value = null
   try {
     const value = await getDispatch(props.dispatchNo)
     if (current !== sequence || !open.value) return
     if (value.dispatchNo !== props.dispatchNo) throw new Error('资料与当前排车单不一致')
-    if (value.status !== 'ACTIVE' || !['DELIVERING', 'DELIVERED'].includes(value.stage)) throw new Error('仅派送中和配送完成可管理资料')
+    if (value.status !== 'ACTIVE' || !['AFTER_LOADING', 'DELIVERING', 'DELIVERED'].includes(value.stage)) throw new Error('仅装车后、派送中和配送完成可管理资料')
+    if (!detail.value && value.stage === 'AFTER_LOADING') tab.value = 'LOADING'
     detail.value = value
     if (!value.documents.deliveries.some(item => item.deliveryNo === selected.value)) selected.value = value.documents.deliveries[0]?.deliveryNo || ''
   } catch (cause) { if (current === sequence) error.value = getApiErrorDetails(cause, '排车资料读取失败') }
@@ -48,6 +52,7 @@ async function selectDelivery(value: string) { if (value !== selected.value && a
 async function beforeClose(done: () => void) { if (await canLeave()) done() }
 function selectTab(value: string) { if (!busy.value) { tab.value = value; if (value === 'FUEL') fuelVisited.value = true } }
 function saved() { emit('saved') }
+async function loadingSaved() { emit('saved'); await load() }
 watch(() => [open.value, props.dispatchNo] as const, ([visible]) => {
   sequence++; detail.value = null; selected.value = ''; tab.value = 'RECEIPT'; fuelVisited.value = false; error.value = null
   if (visible && props.dispatchNo) void load()
@@ -58,12 +63,14 @@ watch(() => [open.value, props.dispatchNo] as const, ([visible]) => {
     <LoadErrorState v-if="error" compact title="排车资料读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <template v-if="detail">
       <div class="density-status-tabs" role="tablist" aria-label="排车资料类别"><button v-for="item in [{ key: 'RECEIPT', label: '签收文件' }, { key: 'FUEL', label: '油耗图片' }, { key: 'LOADING', label: '装车资料' }]" :key="item.key" role="tab" :aria-selected="tab === item.key" :disabled="busy" :class="{ 'is-active': tab === item.key }" @click="selectTab(item.key)">{{ item.label }}</button></div>
-      <div v-show="tab !== 'FUEL'">
+      <DispatchLoadingDocuments v-if="tab === 'LOADING'" ref="loadingEditor" :key="dispatchNo" :dispatch-no="dispatchNo" @saved="loadingSaved" />
+      <div v-show="tab !== 'FUEL'" v-if="detail.stage !== 'AFTER_LOADING'">
         <el-form class="density-form" label-position="left" label-width="80px"><el-form-item label="派送单"><el-select :model-value="selected" :disabled="busy || !access.can(permission.deliveryList)" aria-label="选择派送单" @update:model-value="selectDelivery"><el-option v-for="item in deliveries" :key="item.deliveryNo" :value="item.deliveryNo" :label="item.deliveryNo" /></el-select></el-form-item></el-form>
-        <DeliveryDocumentsDialog v-if="delivery && access.can(permission.deliveryList)" ref="editor" :key="delivery.customerId + ':' + delivery.deliveryNo" :model-value="open" embedded :delivery-no="delivery.deliveryNo" :customer-id="delivery.customerId" :categories="tab === 'RECEIPT' ? ['RECEIPT'] : ['LOADING_PHOTO', 'BOL']" @saved="saved" />
+        <DeliveryDocumentsDialog v-if="delivery && access.can(permission.deliveryList)" ref="editor" :key="delivery.customerId + ':' + delivery.deliveryNo" :model-value="open" embedded :delivery-no="delivery.deliveryNo" :customer-id="delivery.customerId" :categories="tab === 'RECEIPT' ? ['RECEIPT'] : ['BOL']" @saved="saved" />
         <p v-else>{{ access.can(permission.deliveryList) ? '暂无关联派送单' : '当前账号无派送资料查看权限' }}</p>
       </div>
-      <DispatchVehicleDocuments v-if="fuelVisited" v-show="tab === 'FUEL'" ref="vehicleEditor" :key="dispatchNo" :dispatch-no="dispatchNo" @saved="saved" />
+      <p v-if="detail.stage === 'AFTER_LOADING' && tab !== 'LOADING'">请先补齐装车资料，进入派送中后管理{{ tab === 'FUEL' ? '油耗图片' : '签收文件' }}。</p>
+      <DispatchVehicleDocuments v-if="fuelVisited && detail.stage !== 'AFTER_LOADING'" v-show="tab === 'FUEL'" ref="vehicleEditor" :key="dispatchNo" :dispatch-no="dispatchNo" @saved="saved" />
       <section v-if="tab === 'LOADING'" class="density-dialog-section"><h3 class="density-dialog-section__title">车辆及司机附件</h3><DispatchEvidenceFiles v-for="field in dispatchReviewAttachmentFields" :key="field.key" :model-value="reviewEvidence[field.key]" :dispatch-no="dispatchNo" :kind="field.kind" :label="field.label" readonly /></section>
     </template>
   </AppDialog>

src/modules/overseas-warehouse/components/DispatchLoadingDocuments.vue

@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useAuthStore } from '@/core/auth/auth'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { overseasWarehousePermissions as permission } from '../permissions'
+import { bindLoadingPhoto, getLoadingDocuments, loadingPhotoSlots, readLoadingPhoto, recoverLoadingPhoto, uploadLoadingPhoto, type BindLoadingPhoto, type LoadingDocuments, type LoadingPhoto, type LoadingPhotoSlot } from '../api/dispatchLoadingDocuments'
+
+const props = defineProps<{ dispatchNo: string }>()
+const emit = defineEmits<{ saved: [] }>()
+const auth = useAuthStore(), access = useAccessPreviewStore()
+const snapshot = ref<LoadingDocuments | null>(null), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
+interface Pending { slot: LoadingPhotoSlot; key: string; photo?: LoadingPhoto; binding?: BindLoadingPhoto; conflict?: boolean }
+const pending = ref<Pending | null>(null), corrupted = ref(false), images = ref<Record<string, string>>({})
+const actor = auth.user?.id || '', number = props.dispatchNo, storageKey = `dispatch-loading-documents:${actor}:${number}`
+const editable = computed(() => !corrupted.value && access.can(permission.dispatchEdit) && snapshot.value?.editable === true)
+let active = true
+function ensureScope() { if (!active || auth.user?.id !== actor || props.dispatchNo !== number) throw new Error('资料操作身份已变化，请重新打开') }
+function persist() { if (pending.value) sessionStorage.setItem(storageKey, JSON.stringify(pending.value)); else sessionStorage.removeItem(storageKey) }
+function accept(value: LoadingDocuments) { ensureScope(); if (value.dispatchNo !== number) throw new Error('装车资料与排车单不一致'); snapshot.value = value }
+async function previews() {
+  const photos = snapshot.value?.photos || []
+  await Promise.allSettled(photos.map(async photo => {
+    if (images.value[photo.fileId]) return
+    const blob = await readLoadingPhoto(number, photo); ensureScope(); images.value[photo.fileId] = URL.createObjectURL(blob)
+  }))
+}
+async function load() {
+  busy.value = true; error.value = null
+  try { accept(await getLoadingDocuments(number)); await previews() }
+  catch (cause) { if (active) error.value = getApiErrorDetails(cause, '装车资料读取失败') }
+  finally { if (active) busy.value = false }
+}
+async function bind() {
+  const item = pending.value
+  if (!item?.photo || !snapshot.value) return
+  if (item.photo.slot !== item.slot) throw new Error('上传结果与装车照片框不一致')
+  if (!item.binding) { item.binding = { recordVersion: snapshot.value.recordVersion, idempotencyKey: crypto.randomUUID(), fileId: item.photo.fileId }; persist() }
+  try {
+    const result = await bindLoadingPhoto(number, item.slot, item.binding)
+    accept(result); pending.value = null; persist(); emit('saved')
+    ElMessage.success(result.stage === 'DELIVERING' && result.complete ? '装车资料已齐全，本车已进入派送中' : '装车照片已保存')
+    await previews()
+  } catch (cause) {
+    const failure = getApiErrorDetails(cause, '装车照片保存失败')
+    if (pending.value && /^(?:A0|HTTP_)?409$/.test(String(failure.code))) { pending.value.conflict = true; persist() }
+    throw cause
+  }
+}
+async function recover() {
+  if (busy.value || !editable.value || !pending.value) return
+  busy.value = true; error.value = null
+  try {
+    ensureScope()
+    if (pending.value.conflict) { accept(await getLoadingDocuments(number)); pending.value.binding = undefined; pending.value.conflict = false; persist() }
+    if (!pending.value.photo) { pending.value.photo = await recoverLoadingPhoto(number, pending.value.key); ensureScope(); persist() }
+    await bind()
+  } catch (cause) { if (active) error.value = getApiErrorDetails(cause, '原上传或保存结果尚未确认') }
+  finally { if (active) busy.value = false }
+}
+async function upload(slot: LoadingPhotoSlot, event: Event) {
+  const input = event.target as HTMLInputElement, file = input.files?.[0]; input.value = ''
+  if (!file || busy.value || pending.value || !editable.value) return
+  if (!['image/jpeg', 'image/png'].includes(file.type) || !file.size || file.size > 10 * 1024 * 1024) { ElMessage.warning('请选择不超过10MiB的JPG或PNG图片'); return }
+  busy.value = true; error.value = null
+  try {
+    ensureScope(); pending.value = { slot, key: crypto.randomUUID() }; persist()
+    pending.value.photo = await uploadLoadingPhoto(number, slot, file, pending.value.key); ensureScope(); persist(); await bind()
+  } catch (cause) { if (active) error.value = getApiErrorDetails(cause, '装车照片上传或保存失败，请核对原请求') }
+  finally { if (active) busy.value = false }
+}
+onMounted(() => {
+  try {
+    const raw = sessionStorage.getItem(storageKey)
+    if (raw) { const value = JSON.parse(raw) as Pending; if (!loadingPhotoSlots.includes(value.slot) || typeof value.key !== 'string' || !value.key) throw new Error('原装车照片请求记录无法读取'); pending.value = value }
+  } catch (cause) { corrupted.value = true; error.value = getApiErrorDetails(cause, '原装车照片请求记录无法读取') }
+  if (!corrupted.value) void load()
+})
+onBeforeUnmount(() => { active = false; Object.values(images.value).forEach(URL.revokeObjectURL) })
+defineExpose({ busy })
+</script>
+<template>
+  <div v-loading="busy" class="density-dialog-sections">
+    <p v-if="snapshot?.stage === 'AFTER_LOADING'">请上传 5 张装车照片，全部保存成功后自动进入派送中。</p>
+    <LoadErrorState v-if="error" compact title="装车资料操作失败" :message="error.message" :show-retry="!pending && !corrupted" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <div v-if="pending" role="status">有装车照片尚未确认保存。<el-button :disabled="busy || !editable" @click="recover">{{ pending.conflict ? '刷新并重试保存' : '核对原请求并继续保存' }}</el-button></div>
+    <div class="loading-photo-grid">
+      <section v-for="(slot, index) in loadingPhotoSlots" :key="slot" class="density-dialog-section loading-photo-card">
+        <h3 class="density-dialog-section__title">装车照片 {{ index + 1 }}</h3>
+        <template v-for="photo in snapshot?.photos.filter(item => item.slot === slot) || []" :key="photo.fileId">
+          <el-image v-if="images[photo.fileId]" :src="images[photo.fileId]" :preview-src-list="[images[photo.fileId]!]" fit="contain" class="loading-photo-image" preview-teleported />
+          <el-button v-else link :disabled="busy" @click="load">图片读取失败，点击重试</el-button>
+        </template>
+        <div v-if="!snapshot?.photos.some(item => item.slot === slot)" class="loading-photo-empty">未上传</div>
+        <label v-if="editable">上传／替换图片<input type="file" accept="image/jpeg,image/png" :aria-label="`装车照片 ${index + 1}`" :disabled="busy || Boolean(pending)" @change="upload(slot, $event)" /></label>
+      </section>
+    </div>
+  </div>
+</template>
+<style scoped>
+.loading-photo-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-4); }
+.loading-photo-image, .loading-photo-empty { width: 100%; height: 150px; margin-bottom: var(--admin-space-3); }
+.loading-photo-empty { display: grid; place-items: center; background: var(--cc-bg-soft, #f3f7ff); color: var(--cc-text-secondary, #64748b); }
+.loading-photo-card input { display: block; margin-top: var(--admin-space-2); max-width: 100%; }
+</style>

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

@@ -0,0 +1,63 @@
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import { ApiResponseError } from '@/shared/api/http'
+import DispatchVehicleDocuments from './DispatchVehicleDocuments.vue'
+import { bindVehiclePhoto, getVehicleDocuments, recoverVehiclePhoto, uploadVehiclePhoto, type VehicleDocuments, type VehiclePhoto } from '../api/dispatchVehicleDocuments'
+const can = vi.hoisted(() => vi.fn(() => true))
+vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: { id: 'operator' } }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
+vi.mock('../api/dispatchVehicleDocuments', () => ({ bindVehiclePhoto: vi.fn(), getVehicleDocuments: vi.fn(), recoverVehiclePhoto: vi.fn(), uploadVehiclePhoto: vi.fn(), readVehiclePhoto: vi.fn() }))
+const photo: VehiclePhoto = { slot: 'FUEL_START', fileId: '9007199254740995', fileName: 'fuel.png', contentType: 'image/png', savedAt: null }
+function response(version = '3'): VehicleDocuments { return { dispatchNo: 'PC/1', recordVersion: version, editable: true, photos: [] } }
+function setup() { return mount(DispatchVehicleDocuments, { props: { dispatchNo: 'PC/1' }, global: { plugins: [ElementPlus] } }) }
+async function upload(wrapper: ReturnType<typeof setup>) { const input = wrapper.get('input'); Object.defineProperty(input.element, 'files', { value: [new File(['image'], 'fuel.png', { type: 'image/png' })], configurable: true }); await input.trigger('change'); await flushPromises() }
+beforeEach(() => {
+  vi.clearAllMocks(); sessionStorage.clear(); can.mockReturnValue(true)
+  vi.mocked(getVehicleDocuments).mockResolvedValue(response())
+  vi.mocked(uploadVehiclePhoto).mockResolvedValue(photo)
+  vi.mocked(recoverVehiclePhoto).mockResolvedValue(photo)
+  vi.mocked(bindVehiclePhoto).mockResolvedValue({ ...response('4'), photos: [{ ...photo, savedAt: '2026-10-21T00:00:00Z' }] })
+})
+it('binds the uploaded file to the car and restores the original binding after reopening without uploading twice', async () => {
+  vi.mocked(bindVehiclePhoto).mockRejectedValueOnce(new Error('network timeout'))
+  const first = setup(); await flushPromises(); await upload(first)
+  const original = vi.mocked(bindVehiclePhoto).mock.calls[0]![2]
+  expect(original).toMatchObject({ recordVersion: '3', fileId: photo.fileId })
+  first.unmount()
+  const reopened = setup(); await flushPromises()
+  await reopened.findAll('button').find(button => button.text() === '核对原请求并继续保存')!.trigger('click'); await flushPromises()
+  expect(bindVehiclePhoto).toHaveBeenLastCalledWith('PC/1', 'FUEL_START', original)
+  expect(uploadVehiclePhoto).toHaveBeenCalledTimes(1)
+  expect(reopened.text()).toContain('fuel.png')
+  expect(sessionStorage.length).toBe(0)
+  reopened.unmount()
+})
+it('keeps uncertain uploads for original-key recovery and never resubmits the file', async () => {
+  vi.mocked(uploadVehiclePhoto).mockRejectedValueOnce(new Error('connection lost'))
+  const wrapper = setup(); await flushPromises(); await upload(wrapper)
+  const originalKey = vi.mocked(uploadVehiclePhoto).mock.calls[0]![3]
+  await wrapper.findAll('button').find(button => button.text() === '核对原请求并继续保存')!.trigger('click'); await flushPromises()
+  expect(recoverVehiclePhoto).toHaveBeenCalledWith('PC/1', originalKey)
+  expect(uploadVehiclePhoto).toHaveBeenCalledTimes(1)
+  expect(bindVehiclePhoto).toHaveBeenCalledTimes(1)
+  wrapper.unmount()
+})
+it('refreshes only a known version conflict and reuses the uploaded file', async () => {
+  vi.mocked(bindVehiclePhoto).mockRejectedValueOnce(new ApiResponseError('运营记录版本已变化，请刷新后重试', 'A0409', 409))
+  const wrapper = setup(); await flushPromises(); await upload(wrapper)
+  const originalKey = vi.mocked(bindVehiclePhoto).mock.calls[0]![2].idempotencyKey
+  vi.mocked(getVehicleDocuments).mockResolvedValue(response('8'))
+  await wrapper.findAll('button').find(button => button.text() === '刷新版本并保存已上传图片')!.trigger('click'); await flushPromises()
+  expect(bindVehiclePhoto).toHaveBeenLastCalledWith('PC/1', 'FUEL_START', { recordVersion: '8', fileId: photo.fileId, idempotencyKey: expect.any(String) })
+  expect(vi.mocked(bindVehiclePhoto).mock.calls[1]![2].idempotencyKey).not.toBe(originalKey)
+  expect(uploadVehiclePhoto).toHaveBeenCalledTimes(1)
+  wrapper.unmount()
+})
+it('does not offer upload with list permission alone', async () => {
+  can.mockReturnValue(false)
+  const wrapper = setup(); await flushPromises()
+  expect(wrapper.find('input[type="file"]').exists()).toBe(false)
+  expect(uploadVehiclePhoto).not.toHaveBeenCalled()
+  wrapper.unmount()
+})

src/modules/overseas-warehouse/components/DispatchVehicleDocuments.vue

@@ -13,7 +13,7 @@ const props = defineProps<{ dispatchNo: string }>()
 const auth = useAuthStore(), access = useAccessPreviewStore()
 const emit = defineEmits<{ saved: [] }>()
 const snapshot = ref<VehicleDocuments | null>(null), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
-interface Pending { slot: FuelSlot; key: string; photo?: VehiclePhoto; binding?: BindVehiclePhoto }
+interface Pending { slot: FuelSlot; key: string; photo?: VehiclePhoto; binding?: BindVehiclePhoto; versionConflict?: boolean }
 const pending = ref<Pending | null>(null), preview = ref(''), corrupted = ref(false)
 const actor = auth.user?.id || '', number = props.dispatchNo
 const storageKey = `dispatch-vehicle-documents:${actor}:${number}`
@@ -33,7 +33,13 @@ async function bind() {
   if (!item?.photo || !snapshot.value) return
   if (item.photo.slot !== item.slot) throw new Error('上传结果与图片分类不一致')
   if (!item.binding) { item.binding = { recordVersion: snapshot.value.recordVersion, idempotencyKey: crypto.randomUUID(), fileId: item.photo.fileId }; persist() }
-  const result = await bindVehiclePhoto(number, item.slot, item.binding)
+  let result: VehicleDocuments
+  try { result = await bindVehiclePhoto(number, item.slot, item.binding) }
+  catch (cause) {
+    const details = getApiErrorDetails(cause, '图片保存失败')
+    if (details.code === 'A0409' && /记录版本已变化|记录版本竞争失败/.test(details.message)) { item.versionConflict = true; persist() }
+    throw cause
+  }
   ensureScope(); snapshot.value = result; pending.value = null; persist(); emit('saved'); ElMessage.success('油耗图片已保存')
 }
 async function recover() {
@@ -43,6 +49,13 @@ async function recover() {
   catch (cause) { if (active) error.value = getApiErrorDetails(cause, '原上传或保存结果尚未确认') }
   finally { if (active) busy.value = false }
 }
+async function refreshBinding() {
+  if (busy.value || !editable.value || !pending.value?.versionConflict) return
+  await load()
+  if (error.value || !pending.value) return
+  pending.value.binding = undefined; pending.value.versionConflict = false; persist()
+  await recover()
+}
 async function upload(slot: FuelSlot, event: Event) {
   const input = event.target as HTMLInputElement, file = input.files?.[0]; input.value = ''
   if (!file || busy.value || pending.value || !editable.value) return
@@ -51,7 +64,12 @@ async function upload(slot: FuelSlot, event: Event) {
   try {
     ensureScope(); pending.value = { slot, key: crypto.randomUUID() }; persist()
     pending.value.photo = await uploadVehiclePhoto(number, slot, file, pending.value.key); ensureScope(); persist(); await bind()
-  } catch (cause) { if (active) error.value = getApiErrorDetails(cause, '图片上传或保存失败，请核对原请求') }
+  } catch (cause) {
+    if (active) {
+      error.value = getApiErrorDetails(cause, '图片上传或保存失败，请核对原请求')
+      if (!pending.value?.photo && ['A0400', 'A0403'].includes(error.value.code || '')) { pending.value = null; persist() }
+    }
+  }
   finally { if (active) busy.value = false }
 }
 async function view(photo: VehiclePhoto) {
@@ -74,7 +92,7 @@ defineExpose({ busy })
 <template>
   <div v-loading="busy" class="density-dialog-sections">
     <LoadErrorState v-if="error" compact title="车辆资料操作失败" :message="error.message" :show-retry="!pending && !corrupted" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-    <div v-if="pending" role="status">有图片尚未确认保存。<el-button :disabled="busy || !editable" @click="recover">核对原请求并继续保存</el-button></div>
+    <div v-if="pending" role="status">有图片尚未确认保存。<el-button v-if="pending.versionConflict" :disabled="busy || !editable" @click="refreshBinding">刷新版本并保存已上传图片</el-button><el-button v-else :disabled="busy || !editable" @click="recover">核对原请求并继续保存</el-button></div>
     <section v-for="role in roles" :key="role.slot" class="density-dialog-section">
       <h3 class="density-dialog-section__title">{{ role.label }}</h3>
       <div v-for="photo in snapshot?.photos.filter(item => item.slot === role.slot) || []" :key="photo.fileId"><el-button link :disabled="busy" @click="view(photo)">{{ photo.fileName }}</el-button></div>

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.vue

@@ -147,7 +147,7 @@ async function submit() {
     const reviewReturned = ['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(pending.value?.action || '') && pending.value?.body.decision === 'REJECTED'
     const result = await recovery.execute(send, api.getDispatch, api.getDispatchCommand)
     if (!result) return
-    ElMessage.success(reviewReturned ? '已退回客服处理（车辆信息），修改后需重新提交调度审核' : result.action === 'LOADING_COMPLETE' ? '装车完成，已进入派送中' : routeCommand ? '卸货顺序调整已确认，请重新核对两级审核' : result.alreadyArranged ? '已引用本车原派送安排，未重复生成单据和费用' : result.replayed ? '原操作结果已核对' : `${dispatchActionLabels[result.action]}已确认`)
+    ElMessage.success(reviewReturned ? '已退回客服处理（车辆信息），修改后需重新提交调度审核' : result.action === 'LOADING_COMPLETE' ? '装车完成，请在装车后补齐装车资料' : routeCommand ? '卸货顺序调整已确认，请重新核对两级审核' : result.alreadyArranged ? '已引用本车原派送安排，未重复生成单据和费用' : result.replayed ? '原操作结果已核对' : `${dispatchActionLabels[result.action]}已确认`)
     emit('saved'); open.value = false
   } catch (cause) {
     error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : pending.value?.result ? '操作已完成，页面资料待刷新' : pending.value ? '操作结果尚未确认，请保留原请求核对' : '本次操作未通过，请核对后再提交')