Merge origin/release/test and combine transport photo workflows

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

@@ -6,13 +6,13 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
 import * as api from '../api/dispatches'
 import type { DispatchEvidenceFile } from '../dispatchContracts'
-import { downloadDriverLicense } from '@/modules/overseas-master-data'
-vi.mock('@/modules/overseas-master-data', () => ({ downloadDriverLicense: vi.fn() }))
+import { downloadDriverLicense, getResourcePhoto, downloadResourcePhoto } from '@/modules/overseas-master-data'
+vi.mock('@/modules/overseas-master-data', () => ({ downloadDriverLicense: vi.fn(), getResourcePhoto: vi.fn(), downloadResourcePhoto: vi.fn() }))
 vi.mock('../api/dispatches', () => ({ getDispatchEvidence: vi.fn(), getDispatchEvidenceContent: vi.fn(), uploadDispatchEvidence: vi.fn() }))
 const metadata = (fileId = '301', contentType = 'image/png'): DispatchEvidenceFile => ({ fileId, fileName: contentType === 'application/pdf' ? '本车证照.pdf' : '本车证据.png', contentType, sizeBytes: 3 })
 const options = { props: { modelValue: ['301'], dispatchNo: 'PC/1', kind: 'VEHICLE' as const }, global: { stubs: { ElButton: { props: ['disabled'], template: '<button :disabled="disabled"><slot /></button>' }, AppDialog: { name: 'AppDialog', props: ['modelValue', 'title'], template: '<section v-if="modelValue" role="dialog"><slot /><button @click="$emit(\'update:modelValue\', false)">关闭预览</button></section>' } } } }
 const button = (wrapper: ReturnType<typeof mount>, label: string) => wrapper.findAll('button').find(value => value.text() === label)!
-it.each(['VEHICLE', 'DRIVER_PHOTO', 'DRIVER'] as const)('does not count a PDF or failed upload as a %s photo', async kind => {
+it.each(['VEHICLE', 'DRIVER_PHOTO'] as const)('does not count a PDF or failed upload as a %s photo', async kind => {
   const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, kind, photoCard: true, modelValue: [] } }); await flushPromises()
   await selectFile(wrapper, new File(['pdf'], 'document.pdf', { type: 'application/pdf' }))
   expect(api.uploadDispatchEvidence).not.toHaveBeenCalled()
@@ -154,3 +154,36 @@ it('rejects mismatched file identity and a blocked PDF popup without fetching co
   vi.mocked(api.getDispatchEvidence).mockResolvedValueOnce(metadata('301', 'application/pdf')); const open = vi.spyOn(window, 'open').mockReturnValueOnce(null)
   const blocked = mount(DispatchEvidenceFiles, options); await flushPromises(); await button(blocked, '预览').trigger('click'); await flushPromises(); expect(blocked.text()).toContain('请允许本站打开PDF预览窗口'); expect(api.getDispatchEvidenceContent).not.toHaveBeenCalled(); blocked.unmount(); open.mockRestore()
 })
+
+it('accepts a PDF driver license in the photo card without requiring another image', async () => {
+  vi.mocked(api.uploadDispatchEvidence).mockResolvedValue(metadata('302', 'application/pdf'))
+  const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, kind: 'DRIVER', photoCard: true, modelValue: [] } })
+  await flushPromises(); await selectFile(wrapper, new File(['pdf'], 'license.pdf', { type: 'application/pdf' }))
+  expect(api.uploadDispatchEvidence).toHaveBeenCalledOnce()
+  expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([['302']]); wrapper.unmount()
+})
+it('previews a master photo without submitting its foreign file ID as dispatch evidence', async () => {
+  vi.mocked(getResourcePhoto).mockResolvedValue({ recordVersion: '1', photo: metadata('81') })
+  vi.mocked(downloadResourcePhoto).mockResolvedValue(new Blob(['png'], { type: 'image/png' }))
+  const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, photoCard: true, modelValue: [], masterResource: { kind: 'VEHICLE', id: '7' } } })
+  await flushPromises()
+  expect(wrapper.text()).toContain('已带入档案照片')
+  expect(api.getDispatchEvidence).not.toHaveBeenCalled()
+  expect(wrapper.emitted('update:modelValue')).toBeUndefined()
+  expect(wrapper.emitted('available')?.at(-1)).toEqual([true])
+  await wrapper.setProps({ modelValue: ['301'] }); await flushPromises()
+  expect(wrapper.text()).not.toContain('已带入档案照片')
+  expect(api.getDispatchEvidence).toHaveBeenCalledWith('PC/1', 'VEHICLE', '301')
+  expect(getResourcePhoto).toHaveBeenCalledOnce(); wrapper.unmount()
+})
+it('ignores late profile photo responses after changing the selected resource', async () => {
+  let finish!: (value: Awaited<ReturnType<typeof getResourcePhoto>>) => void
+  vi.mocked(getResourcePhoto).mockImplementationOnce(() => new Promise(resolve => { finish = resolve }))
+    .mockResolvedValueOnce({ recordVersion: '0', photo: null })
+  const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, photoCard: true, modelValue: [], masterResource: { kind: 'VEHICLE', id: '7' } } })
+  await wrapper.setProps({ masterResource: { kind: 'VEHICLE', id: '8' } }); await flushPromises()
+  finish({ recordVersion: '1', photo: metadata('81') }); await flushPromises()
+  expect(downloadResourcePhoto).not.toHaveBeenCalled()
+  expect(wrapper.text()).not.toContain('已带入档案照片')
+  expect(wrapper.emitted('available')?.at(-1)).toEqual([false]); wrapper.unmount()
+})

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

@@ -9,12 +9,13 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getDispatchEvidence, getDispatchEvidenceContent, uploadDispatchEvidence } from '../api/dispatches'
-import { downloadDriverLicense } from '@/modules/overseas-master-data'
+import { downloadDriverLicense, getResourcePhoto, downloadResourcePhoto, type ResourcePhotoKind } from '@/modules/overseas-master-data'
 import { DispatchInputError, type DispatchEvidenceFile, type DispatchEvidenceKind } from '../dispatchContracts'
-const props = defineProps<{ dispatchNo: string; kind: DispatchEvidenceKind; disabled?: boolean; readonly?: boolean; photoCard?: boolean; label?: string; saveHint?: string; referenceIds?: string[]; masterLicense?: { driverId: string; fileId: string } | null }>()
+const props = defineProps<{ dispatchNo: string; kind: DispatchEvidenceKind; disabled?: boolean; readonly?: boolean; photoCard?: boolean; label?: string; saveHint?: string; referenceIds?: string[]; masterResource?: { kind: ResourcePhotoKind; id: string } | null; masterLicense?: { driverId: string; fileId: string } | null }>()
 const ids = defineModel<string[]>({ required: true })
-const allIds = computed(() => [...new Set([...(props.referenceIds || []), ...ids.value])])
-const emit = defineEmits<{ busy: [value: boolean] }>()
+const profilePhotoId = ref<string | null>(null)
+const allIds = computed(() => [...new Set([...(props.referenceIds || []), ...ids.value, ...(profilePhotoId.value ? [profilePhotoId.value] : [])])])
+const emit = defineEmits<{ busy: [value: boolean]; available: [value: boolean] }>()
 const metadata = ref<Record<string, DispatchEvidenceFile>>({}), error = ref<ApiErrorDetails | null>(null), uploading = ref(false), input = ref<HTMLInputElement | null>(null)
 const imageOpen = ref(false), imageUrl = ref(''), imageName = ref(''), previewLoading = ref(false)
 const thumbnails = ref<Record<string, string>>({})
@@ -23,8 +24,8 @@ const previewId = ref(''), imageDecoding = ref(false), imageFailure = ref('')
 const previewBusy = computed(() => previewLoading.value || imageDecoding.value)
 const label = computed(() => props.label || (props.kind === 'VEHICLE' ? '本趟车辆证据' : props.kind === 'DRIVER_PHOTO' ? '司机照片' : '本趟司机证照'))
 const types = ['application/pdf', 'image/jpeg', 'image/png'], maximum = 10 * 1024 * 1024, urls = new Set<string>()
-const uploadTypes = computed(() => (props.photoCard || ['DRIVER_PHOTO', 'EXCEPTION'].includes(props.kind)) ? types.slice(1) : types)
-const uploadFormats = computed(() => ['DRIVER_PHOTO', 'EXCEPTION'].includes(props.kind) ? 'JPG、PNG' : 'PDF、JPG、PNG')
+const uploadTypes = computed(() => (props.kind !== 'DRIVER' && (props.photoCard || ['DRIVER_PHOTO', 'EXCEPTION'].includes(props.kind))) ? types.slice(1) : types)
+const uploadFormats = computed(() => uploadTypes.value.includes('application/pdf') ? 'PDF、JPG、PNG' : 'JPG、PNG')
 let generation = 0, previewGeneration = 0, replacing: string | null = null, pendingPopup: Window | null = null
 function valid(value: DispatchEvidenceFile, expected?: string) {
   if (!value || !/^[1-9]\d*$/.test(String(value.fileId)) || typeof value.fileId === 'number' && !Number.isSafeInteger(value.fileId) || expected && String(value.fileId) !== expected || !value.fileName?.trim() || !types.includes(value.contentType) || !Number.isSafeInteger(value.sizeBytes) || value.sizeBytes <= 0 || value.sizeBytes > maximum) throw new DispatchInputError('附件元数据未确认本车有效文件，请重新读取')
@@ -44,13 +45,30 @@ function imageFailed(event: Event) {
   imageFailure.value = '图片无法解码或加载，请重新预览；若仍失败，请核对原附件是否损坏。'
 }
 async function load() {
-  const current = ++generation, no = props.dispatchNo, kind = props.kind, values = [...allIds.value]
+  const current = ++generation, no = props.dispatchNo, kind = props.kind, values = [...new Set([...(props.referenceIds || []), ...ids.value])]
   for (const url of Object.values(thumbnails.value)) { URL.revokeObjectURL(url); urls.delete(url) }
   thumbnails.value = {}
-  closePreview(); metadata.value = {}; error.value = null; masterBlob = null
+  closePreview(); metadata.value = {}; error.value = null; masterBlob = null; profilePhotoId.value = null; emit('available', false)
   if (!no) return
+  // 未保存且没有本趟照片时展示档案图片；保存由服务端复制，不提交跨归属文件ID。
+  if (!values.length && props.masterResource) {
+    const resource = props.masterResource
+    try {
+      const source = await getResourcePhoto(resource.kind, resource.id)
+      if (current !== generation) return
+      if (source.photo) {
+        const blob = await downloadResourcePhoto(resource.kind, resource.id, source.photo.fileId)
+        if (current !== generation) return
+        const file = valid(source.photo)
+        if (blob.size !== file.sizeBytes || blob.type !== file.contentType) throw new DispatchInputError('档案照片内容与元数据不一致')
+        metadata.value[file.fileId] = file; masterBlob = { fileId: file.fileId, blob }
+        profilePhotoId.value = file.fileId; values.push(file.fileId); emit('available', true)
+      }
+    } catch (cause) { if (current === generation) fail(cause, '档案照片读取失败，请重试') }
+  }
   const master = props.kind === 'DRIVER' ? props.masterLicense : null
   const results = await Promise.allSettled(values.map(async id => {
+    if (id === profilePhotoId.value && metadata.value[id]) return metadata.value[id]!
     // 未保存的司机主档证照按司机身份读取；本车补传仍走排车文件归属。
     if (master && master.fileId === id) {
       const blob = await downloadDriverLicense(master.driverId, id)
@@ -89,7 +107,7 @@ async function upload(event: Event) {
 }
 function remove(id: string) { if (!props.readonly && !props.disabled && !uploading.value) ids.value = ids.value.filter(value => value !== id) }
 async function readContent(no: string, kind: DispatchEvidenceKind, id: string, file: DispatchEvidenceFile) {
-  const blob = kind === 'DRIVER' && masterBlob?.fileId === id ? masterBlob.blob : await getDispatchEvidenceContent(no, kind, id)
+  const blob = masterBlob?.fileId === id ? masterBlob.blob : await getDispatchEvidenceContent(no, kind, id)
   const type = blob.type.split(';')[0]?.toLowerCase()
   if (type?.includes('json')) {
     let body: Partial<{ code: string; message: string; requestId: string; traceId: string }>
@@ -115,7 +133,7 @@ async function preview(id: string) {
   } catch (cause) { if (current === previewGeneration) { closePreview(); fail(cause, '本车附件预览失败，原引用已保留') } }
   finally { if (current === previewGeneration) previewLoading.value = false }
 }
-watch(() => JSON.stringify([props.dispatchNo, props.kind, allIds.value, props.masterLicense]), load, { immediate: true })
+watch(() => JSON.stringify([props.dispatchNo, props.kind, ids.value, props.referenceIds, props.masterLicense, props.masterResource]), load, { immediate: true })
 onBeforeUnmount(() => { generation++; closePreview(); for (const url of urls) URL.revokeObjectURL(url); urls.clear(); emit('busy', false) })
 </script>
 <template>
@@ -125,11 +143,12 @@ onBeforeUnmount(() => { generation++; closePreview(); for (const url of urls) UR
       <div v-if="allIds.length" class="evidence-photo-list">
         <div v-for="id in allIds" :key="id" class="evidence-photo-item">
           <button type="button" class="evidence-photo-preview" :aria-label="'预览' + label + '：' + (metadata[id]?.fileName || id)" :disabled="!metadata[id] || previewLoading" @click="preview(id)"><img v-if="thumbnails[id]" :src="thumbnails[id]" :alt="label + '：' + metadata[id]?.fileName"><span v-else>{{ metadata[id]?.contentType === 'application/pdf' ? '查看 PDF' : '照片待加载' }}</span></button>
-          <p class="density-dialog-note evidence-photo-name">{{ metadata[id]?.fileName || '附件资料待核实' }}</p>
+          <p class="density-dialog-note evidence-photo-name" :title="metadata[id]?.fileName">{{ metadata[id]?.fileName || '附件资料待核实' }}</p>
           <div v-if="!readonly && ids.includes(id)" class="density-actions evidence-photo-actions"><el-button size="small" :disabled="disabled || uploading" @click="choose(id)">替换</el-button><el-button size="small" :disabled="disabled || uploading" @click="remove(id)">移除引用</el-button></div>
         </div>
       </div>
       <div v-else class="evidence-photo-empty">暂无照片</div>
+      <p v-if="profilePhotoId" class="density-dialog-note">已带入档案照片，保存后用于本趟排车</p>
       <figcaption>{{ label }}<InlineHelp v-if="!readonly" title="附件上传说明"><p>{{ uploadFormats }}，单文件最大10MiB；{{ saveHint || '上传后保存车辆信息才完成本车引用。' }}</p></InlineHelp></figcaption>
     </figure>
     <template v-else>
@@ -153,8 +172,9 @@ onBeforeUnmount(() => { generation++; closePreview(); for (const url of urls) UR
 .evidence-input { display: none; }
 .dispatch-evidence--photos { min-width: 0; display: flex; flex-direction: column; }
 .evidence-photo-card { margin: 0; text-align: center; flex: 1; display: flex; flex-direction: column; }
-.evidence-photo-list { display: grid; gap: var(--admin-space-3); }
-.evidence-photo-name { margin: var(--admin-space-3) 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.evidence-photo-list { display: grid; grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); align-items: start; gap: var(--admin-space-3); }
+.evidence-photo-item { min-width: 0; }
+.evidence-photo-name { margin: var(--admin-space-2) 0 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .evidence-photo-actions { justify-content: center; }
 .dispatch-evidence--photos > .evidence-upload-button { width: 100%; }
 .evidence-photo-preview, .evidence-photo-empty { box-sizing: border-box; width: 100%; height: 150px; display: flex; align-items: center; justify-content: center; border: 1px solid var(--el-border-color-lighter); border-radius: var(--el-border-radius-base); color: var(--el-text-color-secondary); }

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

@@ -10,11 +10,11 @@ vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: { id: 'operato
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
 vi.mock('../api/dispatchLoadingDocuments', async importOriginal => ({ ...await importOriginal<typeof api>(), getLoadingDocuments: vi.fn(), uploadLoadingPhoto: vi.fn(), recoverLoadingPhoto: vi.fn(), bindLoadingPhoto: vi.fn(), readLoadingPhoto: vi.fn() }))
 const photo: api.LoadingPhoto = { slot: 'LOADING_SCENE', fileId: '101', fileName: 'loading.png', contentType: 'image/png', savedAt: null }
-const data = (extra: Partial<api.LoadingDocuments> = {}): api.LoadingDocuments => ({ dispatchNo: 'PC/1', recordVersion: '0', dispatchRecordVersion: '3', stage: 'AFTER_LOADING', editable: true, complete: false, photos: [], ...extra })
+const data = (extra: Partial<api.LoadingDocuments> = {}): api.LoadingDocuments => ({ dispatchNo: 'PC/1', recordVersion: '0', dispatchRecordVersion: '3', reviewRound: '1', stage: 'AFTER_LOADING', editable: true, complete: false, photos: [], ...extra })
 function setup() { return mount(DispatchLoadingDocuments, { props: { dispatchNo: 'PC/1' }, global: { plugins: [ElementPlus] } }) }
-async function upload(wrapper: ReturnType<typeof setup>) {
-  const input = wrapper.get('input[aria-label="装车照片 1"]')
-  Object.defineProperty(input.element, 'files', { configurable: true, value: [new File(['image'], 'loading.png', { type: 'image/png' })] })
+async function upload(wrapper: ReturnType<typeof setup>, files = [new File(['image'], 'loading.png', { type: 'image/png' })]) {
+  const input = wrapper.get('input[aria-label="上传司机驾驶证"]')
+  Object.defineProperty(input.element, 'files', { configurable: true, value: files })
   await input.trigger('change'); await flushPromises()
 }
 beforeEach(() => {
@@ -24,20 +24,146 @@ beforeEach(() => {
   vi.mocked(api.bindLoadingPhoto).mockResolvedValue(data({ recordVersion: '1', photos: [photo] }))
   vi.mocked(api.readLoadingPhoto).mockRejectedValue(new Error('preview unavailable'))
 })
+it('refreshes photos added or replaced by PDA without writing and notifies the parent to reload the stage', async () => {
+  can.mockReturnValue(false)
+  vi.mocked(api.getLoadingDocuments).mockResolvedValue(data({ photos: [photo] }))
+  const wrapper = setup(); await flushPromises()
+  const photos = api.loadingPhotoSlots.flatMap((slot, category) => Array.from({ length: 5 }, (_, index) => ({
+    ...photo, slot, fileId: `${category + 2}${index}`, fileName: `pda-${category}-${index}.png`,
+  })))
+  vi.mocked(api.getLoadingDocuments).mockResolvedValue(data({ recordVersion: '26', stage: 'DELIVERING', complete: true, photos }))
+  await wrapper.get('[aria-label="刷新装车资料"]').trigger('click'); await flushPromises()
+  expect(wrapper.findAll('.loading-photo-row')).toHaveLength(25)
+  for (const item of photos) expect(wrapper.text()).not.toContain(item.fileName)
+  expect(wrapper.text()).not.toContain(photo.fileName)
+  expect(wrapper.findAll('.loading-document-heading').map(row => row.text())).toEqual(Object.values(api.loadingPhotoLabels).map(label => `${label}5/5 张`))
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  expect(api.uploadLoadingPhoto).not.toHaveBeenCalled(); expect(api.bindLoadingPhoto).not.toHaveBeenCalled()
+  vi.mocked(api.getLoadingDocuments).mockRejectedValueOnce(new Error('刷新失败'))
+  await wrapper.get('[aria-label="刷新装车资料"]').trigger('click'); await flushPromises()
+  expect(wrapper.findAll('.loading-photo-row')).toHaveLength(25)
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  wrapper.unmount()
+})
 it('offers five whole-dispatch slots and only reports saved after binding succeeds', async () => {
   const wrapper = setup(); await flushPromises()
   expect(wrapper.findAll('input[type="file"]')).toHaveLength(5)
-  const table = wrapper.get('table[aria-label="装车照片"]')
-  expect(table.findAll('thead th').map(cell => cell.text())).toEqual(['操作', '照片类别', '文件名称', '图片预览', '保存时间'])
-  expect(table.findAll('tbody tr').map(row => row.findAll('td')[1]!.text())).toEqual(['装车照片 1', '装车照片 2', '装车照片 3', '装车照片 4', '装车照片 5'])
+  const list = wrapper.get('[aria-label="装车照片"]')
+  expect(wrapper.find('table').exists()).toBe(false)
+  expect(list.findAll('h3').map(heading => heading.text())).toEqual(Object.values(api.loadingPhotoLabels))
+  expect(list.findAll('.photo-count').map(count => count.text())).toEqual(Array(5).fill('0/5 张'))
+  expect(list.findAll('.photo-empty')).toHaveLength(5)
   await upload(wrapper)
-  expect(api.uploadLoadingPhoto).toHaveBeenCalledWith('PC/1', 'LOADING_SCENE', expect.any(File), expect.any(String))
+  expect(api.uploadLoadingPhoto).toHaveBeenCalledWith('PC/1', 'LOADING_SCENE', expect.any(File), expect.any(String), '1')
   expect(api.bindLoadingPhoto).toHaveBeenCalledWith('PC/1', 'LOADING_SCENE', expect.objectContaining({ recordVersion: '0', fileId: '101' }))
+  expect(vi.mocked(api.bindLoadingPhoto).mock.calls[0]![2].uploadKey).toBe(vi.mocked(api.uploadLoadingPhoto).mock.calls[0]![3])
   expect(wrapper.emitted('saved')).toHaveLength(1)
   expect(wrapper.text()).toContain('图片读取失败')
-  expect(table.get('tbody tr').text()).toContain('loading.png')
+  expect(list.get('.loading-photo-row').attributes('aria-label')).toBe('司机驾驶证第1张')
+  expect(list.text()).not.toContain('loading.png')
   wrapper.unmount()
 })
+it('stops a batch when re-review changes the source during upload instead of rebasing old files', async () => {
+  const wrapper = setup(); await flushPromises()
+  vi.mocked(api.uploadLoadingPhoto).mockImplementationOnce(async () => {
+    vi.mocked(api.getLoadingDocuments).mockResolvedValue(data({ recordVersion: '8', dispatchRecordVersion: '12', reviewRound: '2' }))
+    return photo
+  })
+  await upload(wrapper, [new File(['a'], 'old-driver.png', { type: 'image/png' }), new File(['b'], 'old-driver-2.png', { type: 'image/png' })])
+  expect(api.bindLoadingPhoto).not.toHaveBeenCalled()
+  expect(api.uploadLoadingPhoto).toHaveBeenCalledTimes(1)
+  expect(vi.mocked(api.uploadLoadingPhoto).mock.calls[0]![4]).toBe('1')
+  expect(wrapper.text()).toContain('审核轮次已变化')
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  wrapper.unmount()
+})
+it('shows an imported PDF license as an authenticated document and accepts an exact PDF replacement', async () => {
+  vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:license')
+  vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => {})
+  const license = { ...photo, fileName: 'license.pdf', contentType: 'application/pdf' }
+  vi.mocked(api.getLoadingDocuments).mockResolvedValue(data({ photos: [license] }))
+  vi.mocked(api.readLoadingPhoto).mockResolvedValue(new Blob(['%PDF-1.4'], { type: 'application/pdf' }))
+  const wrapper = setup()
+  try {
+    await flushPromises()
+    expect(wrapper.get('a').attributes('href')).toBe('blob:license')
+    expect(wrapper.findComponent({ name: 'ElImage' }).exists()).toBe(false)
+    const input = wrapper.get('input[aria-label="更换司机驾驶证第1张"]')
+    expect(input.attributes('accept')).toContain('application/pdf')
+    expect(wrapper.get('input[aria-label="上传车牌照片"]').attributes('accept')).not.toContain('application/pdf')
+    Object.defineProperty(input.element, 'files', { configurable: true, value: [new File(['%PDF-1.4'], 'new.pdf', { type: 'application/pdf' })] })
+    await input.trigger('change'); await flushPromises()
+    expect(api.bindLoadingPhoto).toHaveBeenCalledWith('PC/1', 'LOADING_SCENE', expect.objectContaining({ replaceFileId: '101' }))
+  } finally { wrapper.unmount(); vi.restoreAllMocks() }
+})
+it('shows every photo in a category, stops at five and replaces the selected image only', async () => {
+  const photos = Array.from({ length: 5 }, (_, index) => ({ ...photo, fileId: String(101 + index), fileName: `photo-${index}.png`, savedAt: `2026-10-26T11:49:0${index}.978960362Z` }))
+  vi.mocked(api.getLoadingDocuments).mockResolvedValue(data({ recordVersion: '5', photos }))
+  const replacement = { ...photo, fileId: '999' }
+  vi.mocked(api.uploadLoadingPhoto).mockResolvedValue(replacement)
+  vi.mocked(api.bindLoadingPhoto).mockResolvedValue(data({ recordVersion: '6', photos: photos.map(item => item.fileId === '103' ? replacement : item) }))
+  const wrapper = setup(); await flushPromises()
+  expect(wrapper.get('input[aria-label="上传司机驾驶证"]').attributes('disabled')).toBeDefined()
+  const rows = wrapper.findAll('.loading-photo-row')
+  expect(rows).toHaveLength(5)
+  rows.forEach((row, index) => {
+    expect(row.attributes('aria-label')).toBe(`司机驾驶证第${index + 1}张`)
+    expect(row.get('.photo-time').text()).toMatch(new RegExp(`保存时间：2026-10-26 \\d{2}:49:0${index}$`))
+    expect(row.findAll('input[type="file"]')).toHaveLength(1)
+  })
+  for (const item of photos) expect(wrapper.text()).not.toContain(item.fileName)
+  const input = rows[2]!.get('input[aria-label="更换司机驾驶证第3张"]')
+  Object.defineProperty(input.element, 'files', { configurable: true, value: [new File(['new'], 'new.png', { type: 'image/png' })] })
+  await input.trigger('change'); await flushPromises()
+  expect(api.bindLoadingPhoto).toHaveBeenLastCalledWith('PC/1', 'LOADING_SCENE', expect.objectContaining({ recordVersion: '5', fileId: '999', replaceFileId: '103' }))
+  expect(wrapper.findAll('.loading-photo-row')).toHaveLength(5)
+  expect(wrapper.findAll('.loading-photo-row')[0]!.get('.photo-time').text()).toMatch(/:49:00$/)
+  expect(wrapper.findAll('.loading-photo-row')[2]!.get('.photo-time').text()).toBe('保存时间：—')
+  expect(wrapper.findAll('.loading-photo-row')[4]!.get('.photo-time').text()).toMatch(/:49:04$/)
+  wrapper.unmount()
+})
+it('saves a multiple selection with fresh versions and notifies the parent once', async () => {
+  let latest = data(), id = 200
+  vi.mocked(api.getLoadingDocuments).mockImplementation(async () => latest)
+  vi.mocked(api.uploadLoadingPhoto).mockImplementation(async () => ({ ...photo, fileId: String(++id) }))
+  vi.mocked(api.bindLoadingPhoto).mockImplementation(async (_no, _slot, body) => {
+    latest = data({ recordVersion: String(Number(body.recordVersion) + 1), photos: [...latest.photos, { ...photo, fileId: body.fileId }] }); return latest
+  })
+  const wrapper = setup(); await flushPromises()
+  expect(wrapper.get('input[aria-label="上传司机驾驶证"]').attributes('multiple')).toBeDefined()
+  await upload(wrapper, Array.from({ length: 3 }, () => new File(['image'], 'photo.png', { type: 'image/png' })))
+  expect(api.bindLoadingPhoto).toHaveBeenCalledTimes(3)
+  expect(vi.mocked(api.bindLoadingPhoto).mock.calls.map(call => call[2].recordVersion)).toEqual(['0', '1', '2'])
+  expect(wrapper.emitted('saved')).toHaveLength(1); expect(wrapper.text()).toContain('3/5 张')
+  await upload(wrapper, Array.from({ length: 3 }, () => new File(['image'], 'photo.png', { type: 'image/png' })))
+  expect(api.uploadLoadingPhoto).toHaveBeenCalledTimes(3)
+  wrapper.unmount()
+})
+it('stops a batch after an unknown binding result and displays the server snapshot', async () => {
+  let latest = data(), id = 200, binds = 0
+  vi.mocked(api.getLoadingDocuments).mockImplementation(async () => latest)
+  vi.mocked(api.uploadLoadingPhoto).mockImplementation(async () => ({ ...photo, fileId: String(++id) }))
+  vi.mocked(api.bindLoadingPhoto).mockImplementation(async (_no, _slot, body) => {
+    latest = data({ recordVersion: String(++binds), photos: [...latest.photos, { ...photo, fileId: body.fileId }] })
+    if (binds === 2) throw new Error('保存响应超时')
+    return latest
+  })
+  const wrapper = setup(); await flushPromises()
+  await upload(wrapper, Array.from({ length: 3 }, () => new File(['image'], 'photo.png', { type: 'image/png' })))
+  expect(api.uploadLoadingPhoto).toHaveBeenCalledTimes(2); expect(api.bindLoadingPhoto).toHaveBeenCalledTimes(2)
+  expect(wrapper.text()).toContain('2/5 张'); expect(wrapper.text()).toContain('已读取最新资料')
+  expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+})
+it('requires a successful refresh after both binding and reconciliation fail', async () => {
+  vi.mocked(api.getLoadingDocuments).mockResolvedValueOnce(data()).mockResolvedValueOnce(data()).mockRejectedValueOnce(new Error('读取失败')).mockResolvedValue(data())
+  vi.mocked(api.bindLoadingPhoto).mockRejectedValueOnce(new Error('保存超时'))
+  const wrapper = setup(); await flushPromises(); await upload(wrapper)
+  expect(wrapper.text()).toContain('保存状态尚未核实')
+  expect(wrapper.find('input[type="file"]').exists()).toBe(false)
+  wrapper.findComponent({ name: 'LoadErrorState' }).vm.$emit('retry'); await flushPromises()
+  expect(wrapper.find('input[aria-label="上传司机驾驶证"]').exists()).toBe(true)
+  expect(api.bindLoadingPhoto).toHaveBeenCalledTimes(1); wrapper.unmount()
+})
 it('unlocks after binding failure and accepts a new upload with a fresh key', async () => {
   vi.mocked(api.bindLoadingPhoto).mockRejectedValueOnce(new Error('network unknown'))
   const wrapper = setup(); await flushPromises(); await upload(wrapper)

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

@@ -1,24 +1,31 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 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, uploadLoadingPhoto, type LoadingDocuments, type LoadingPhotoSlot } from '../api/dispatchLoadingDocuments'
+import { bindLoadingPhoto, getLoadingDocuments, loadingPhotoSlots, loadingPhotoLabels, readLoadingPhoto, uploadLoadingPhoto, type LoadingDocuments, 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)
+const needsRefresh = ref(false)
 const images = ref<Record<string, string>>({})
 const actor = auth.user?.id || '', number = props.dispatchNo
-const editable = computed(() => access.can(permission.dispatchEdit) && snapshot.value?.editable === true)
+const editable = computed(() => access.can(permission.dispatchEdit) && snapshot.value?.editable === true && !needsRefresh.value)
 let active = true
 function ensureScope() { if (!active || auth.user?.id !== actor || props.dispatchNo !== number) throw new Error('资料操作身份已变化，请重新打开') }
-function accept(value: LoadingDocuments) { ensureScope(); if (value.dispatchNo !== number) throw new Error('装车资料与排车单不一致'); snapshot.value = value }
+function accept(value: LoadingDocuments) {
+  ensureScope(); if (value.dispatchNo !== number) throw new Error('装车资料与排车单不一致')
+  const current = new Set(value.photos.map(photo => photo.fileId))
+  for (const [id, url] of Object.entries(images.value)) if (!current.has(id)) { URL.revokeObjectURL(url); delete images.value[id] }
+  snapshot.value = value; needsRefresh.value = false
+}
 async function previews() {
   const photos = snapshot.value?.photos || []
   await Promise.allSettled(photos.map(async photo => {
@@ -29,58 +36,115 @@ async function previews() {
 async function load() {
   if (busy.value) return
   busy.value = true; error.value = null
-  try { accept(await getLoadingDocuments(number)); await previews() }
-  catch (cause) { if (active) error.value = getApiErrorDetails(cause, '装车资料读取失败') }
+  try { accept(await getLoadingDocuments(number)); await previews(); return true }
+  catch (cause) { if (active) { needsRefresh.value = true; 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 || !editable.value) return
-  if (!['image/jpeg','image/png'].includes(file.type) || !file.size || file.size > 10 * 1024 * 1024) { ElMessage.warning('请选择不超过10MiB的JPG或PNG图片'); return }
+async function refresh() { if (await load()) emit('saved') }
+function photosFor(slot: LoadingPhotoSlot) { return snapshot.value?.photos.filter(photo => photo.slot === slot) || [] }
+function savedTime(value?: string | null) {
+  return value && dayjs(value).isValid() ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '—'
+}
+async function upload(slot: LoadingPhotoSlot, event: Event, replaceFileId?: string) {
+  const input = event.target as HTMLInputElement, files = Array.from(input.files || []); input.value = ''
+  if (!files.length || busy.value || !editable.value) return
+  const reviewRound = snapshot.value!.reviewRound
+  const capacity = replaceFileId ? 1 : 5 - photosFor(slot).length
+  if (files.length > capacity) { ElMessage.warning(`本次最多可选择${capacity}张图片`); return }
+  if (files.some(file => !(['image/jpeg','image/png'].includes(file.type) || slot === 'LOADING_SCENE' && file.type === 'application/pdf') || !file.size || file.size > 10 * 1024 * 1024)) { ElMessage.warning('请选择不超过10MiB的JPG或PNG，司机驾驶证也支持PDF'); return }
   busy.value = true; error.value = null
+  let saved = 0, reconciled = false, bindingFailed = false, roundChanged = false
   try {
     ensureScope()
-    const photo = await uploadLoadingPhoto(number, slot, file, crypto.randomUUID()); ensureScope()
-    const latest = await getLoadingDocuments(number); ensureScope(); snapshot.value = latest
-    if (!latest.editable) throw new Error('当前状态不允许修改照片')
-    if (photo.slot !== slot || !photo.fileId) throw new Error('上传结果与照片类别不一致')
-    const result = await bindLoadingPhoto(number, slot, { recordVersion: latest.recordVersion, idempotencyKey: crypto.randomUUID(), fileId: photo.fileId }); ensureScope()
-    snapshot.value = result; emit('saved'); ElMessage.success('照片已保存')
-    await previews()
-  } catch (cause) { if (active) error.value = getApiErrorDetails(cause, '图片上传或保存失败，请重新选择图片') }
+    for (const file of files) {
+      const uploadKey = crypto.randomUUID()
+      const photo = await uploadLoadingPhoto(number, slot, file, uploadKey, reviewRound); ensureScope()
+      const latest = await getLoadingDocuments(number); accept(latest)
+      if (latest.reviewRound !== reviewRound) { reconciled = true; roundChanged = true; throw new Error('审核轮次已变化，请核对新车辆、司机后重新选择资料') }
+      if (!latest.editable) throw new Error('当前状态不允许修改照片')
+      if (photo.slot !== slot || !photo.fileId) throw new Error('上传结果与照片类别不一致')
+      try {
+        accept(await bindLoadingPhoto(number, slot, { recordVersion: latest.recordVersion, idempotencyKey: crypto.randomUUID(), fileId: photo.fileId, uploadKey, ...(replaceFileId ? { replaceFileId } : {}) }))
+      } catch (cause) {
+        // 保存可能已经提交；先核对当前事实，不重放请求或继续后续图片。
+        bindingFailed = true
+        needsRefresh.value = true
+        try {
+          const current = await getLoadingDocuments(number); accept(current)
+          reconciled = current.recordVersion !== latest.recordVersion || current.dispatchRecordVersion !== latest.dispatchRecordVersion || current.stage !== latest.stage
+          await previews()
+        } catch { /* 保留原错误与刷新入口。 */ }
+        throw cause
+      }
+      saved++; await previews()
+    }
+    ElMessage.success(`已保存${saved}张照片`)
+  } catch (cause) {
+    if (active) error.value = getApiErrorDetails(cause, roundChanged ? '审核轮次已变化，请核对新车辆、司机后重新选择资料' : bindingFailed
+      ? needsRefresh.value ? '保存结果尚未核实，请重新读取资料' : '保存响应未确认，已读取最新资料，请核对已保存图片后继续'
+      : '图片上传失败，已保存照片保留，请重新选择图片')
+  }
   finally { busy.value = false }
+  if (active && (saved || reconciled)) emit('saved')
 }
 onMounted(() => { void load() })
 onBeforeUnmount(() => { active = false; Object.values(images.value).forEach(url => URL.revokeObjectURL(url)) })
 defineExpose({ busy })
 </script>
 <template>
-  <div v-loading="busy" class="density-dialog-sections">
-    <p v-if="snapshot?.stage === 'LOADING'">可边装车边上传 5 张装车照片；装车确认完成且照片齐全后自动进入派送中。</p>
-    <p v-if="snapshot?.stage === 'AFTER_LOADING'">请上传 5 张装车照片，全部保存成功后自动进入派送中。</p>
+  <div v-loading="busy" class="loading-documents">
+    <p>可边装车边上传五类装车资料，每类至少 1 张、最多 5 张；装车确认完成且五类齐全后自动进入派送中。</p>
+    <p>司机驾驶证、车牌照片在理货审核通过后从本趟资料自动带入，可补充或更换；驾驶证支持 PDF。</p>
+    <div><el-button :loading="busy" :disabled="busy" aria-label="刷新装车资料" @click="refresh">刷新</el-button></div>
+    <p v-if="needsRefresh">保存状态尚未核实，请先重新读取资料后再上传。</p>
     <LoadErrorState v-if="error" compact title="装车资料操作失败" :message="error.message" :show-retry="true" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-    <table class="density-table loading-documents-table" aria-label="装车照片"><thead><tr><th class="photo-actions">操作</th><th class="photo-category">照片类别</th><th>文件名称</th><th class="photo-preview">图片预览</th><th class="photo-time">保存时间</th></tr></thead><tbody>
-      <tr v-for="(slot, index) in loadingPhotoSlots" :key="slot">
-        <td><label v-if="editable" class="photo-upload" :class="{ 'is-disabled': busy }">上传／替换<input type="file" accept="image/jpeg,image/png" :aria-label="`装车照片 ${index + 1}`" :disabled="busy" @change="upload(slot, $event)" /></label><span v-else>—</span></td>
-        <td>装车照片 {{ index + 1 }}</td>
-        <td><div v-for="photo in snapshot?.photos.filter(item => item.slot === slot) || []" :key="photo.fileId">{{ photo.fileName }}</div><span v-if="!snapshot?.photos.some(item => item.slot === slot)">未上传</span></td>
-        <td><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><span v-if="!snapshot?.photos.some(item => item.slot === slot)">—</span></td>
-        <td><div v-for="photo in snapshot?.photos.filter(item => item.slot === slot) || []" :key="photo.fileId">{{ photo.savedAt?.replace('T', ' ') || '—' }}</div><span v-if="!snapshot?.photos.some(item => item.slot === slot)">—</span></td>
-      </tr>
-    </tbody></table>
+    <div class="loading-document-list" aria-label="装车照片">
+      <section v-for="slot in loadingPhotoSlots" :key="slot" class="loading-document-category" :aria-label="loadingPhotoLabels[slot]">
+        <header class="loading-document-heading">
+          <h3>{{ loadingPhotoLabels[slot] }}</h3>
+          <span class="photo-count">{{ photosFor(slot).length }}/5 张</span>
+          <label v-if="editable" class="photo-upload category-upload" :class="{ 'is-disabled': busy || photosFor(slot).length >= 5 }">
+            {{ photosFor(slot).length >= 5 ? '已满 5 张' : '上传资料' }}
+            <input type="file" multiple :accept="slot === 'LOADING_SCENE' ? 'image/jpeg,image/png,application/pdf' : 'image/jpeg,image/png'" :aria-label="`上传${loadingPhotoLabels[slot]}`" :disabled="busy || photosFor(slot).length >= 5" @change="upload(slot, $event)" />
+          </label>
+        </header>
+        <ol v-if="photosFor(slot).length" class="loading-photo-list">
+          <li v-for="(photo, index) in photosFor(slot)" :key="photo.fileId" class="loading-photo-row" :aria-label="`${loadingPhotoLabels[slot]}第${index + 1}张`">
+            <span class="photo-index">{{ index + 1 }}</span>
+            <div class="photo-preview">
+              <a v-if="images[photo.fileId] && photo.contentType === 'application/pdf'" :href="images[photo.fileId]" target="_blank" rel="noopener noreferrer">查看驾驶证 PDF</a>
+              <el-image v-else-if="images[photo.fileId]" :src="images[photo.fileId]" :alt="`${loadingPhotoLabels[slot]}第${index + 1}张`" :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>
+            </div>
+            <span class="photo-time">保存时间：{{ savedTime(photo.savedAt) }}</span>
+            <label v-if="editable" class="photo-upload" :class="{ 'is-disabled': busy }">
+              更换
+              <input type="file" :accept="slot === 'LOADING_SCENE' ? 'image/jpeg,image/png,application/pdf' : 'image/jpeg,image/png'" :aria-label="`更换${loadingPhotoLabels[slot]}第${index + 1}张`" :disabled="busy" @change="upload(slot, $event, photo.fileId)" />
+            </label>
+          </li>
+        </ol>
+        <p v-else class="photo-empty">未上传</p>
+      </section>
+    </div>
   </div>
 </template>
 <style scoped>
-.loading-documents-table { table-layout: fixed; }
-.loading-documents-table td { overflow-wrap: anywhere; }
-.photo-actions { width: 110px; }
-.photo-category { width: 120px; }
-.photo-preview { width: 140px; }
-.photo-time { width: 190px; }
-.loading-photo-image { display: block; width: 100px; height: 64px; }
+.loading-documents { display: flex; flex-direction: column; gap: 12px; }
+.loading-documents > p { margin: 0; }
+.loading-document-list { border: 1px solid var(--cc-border, var(--el-border-color)); }
+.loading-document-category + .loading-document-category { border-top: 1px solid var(--cc-border, var(--el-border-color)); }
+.loading-document-heading { display: flex; align-items: center; gap: 12px; padding: 8px 12px; background: var(--el-fill-color-light); }
+.loading-document-heading h3 { margin: 0; font-size: 14px; }
+.photo-count, .photo-time, .photo-index, .photo-empty { color: var(--el-text-color-secondary); }
+.category-upload { margin-left: auto; }
+.loading-photo-list { display: flex; flex-direction: column; margin: 0; padding: 0 12px; list-style: none; }
+.loading-photo-row { display: flex; align-items: center; flex-wrap: wrap; gap: 16px; padding: 8px 0; }
+.loading-photo-row + .loading-photo-row { border-top: 1px solid var(--el-border-color-lighter); }
+.photo-index { width: 20px; text-align: center; }
+.photo-preview { display: flex; align-items: center; flex: 0 0 160px; min-height: 96px; }
+.loading-photo-image { display: block; width: 160px; height: 96px; }
+.photo-time { font-variant-numeric: tabular-nums; }
+.photo-empty { margin: 0; padding: 12px; }
 .photo-upload { position: relative; display: inline-flex; color: var(--el-color-primary); cursor: pointer; }
 .photo-upload input { position: absolute; inset: 0; width: 100%; height: 100%; opacity: 0; cursor: pointer; }
 .photo-upload:focus-within { outline: 2px solid var(--el-color-primary); outline-offset: 2px; }

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

@@ -3,9 +3,10 @@ import { ApiResponseError } from '@/shared/api/http'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, expect, it, vi } from 'vitest'
 import DispatchWorkflowDialog from './DispatchWorkflowDialog.vue'
+import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
 import * as api from '../api/dispatches'
 import { command, detail, loadingPreview } from '../dispatchTestFixtures'
-import type { CommandResult, DispatchAction, DispatchDetail } from '../dispatchContracts'
+import type { CommandResult, DispatchAction, DispatchDetail, Driver, Vehicle } from '../dispatchContracts'
 import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
 const identity = vi.hoisted(() => ({ id: '' }))
 vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
@@ -102,6 +103,14 @@ it('refuses a route that drops an authoritative destination', async () => {
   vi.mocked(api.getDispatchRoute).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, edit: { allowed: true, blockCode: null, blockReason: null }, stops: [{ index: 0, name: '起运仓', address: null, destinationKey: null }, { index: 1, name: 'ONT8', address: null, destinationKey: 'CODE:ONT8' }, { index: 2, name: '外接点', address: null, destinationKey: 'EXTERNAL:destination' }] })
   const route = await open('EDIT'); await route.wrapper.setProps({ operation: 'ROUTE' }); await flushPromises(); (route.wrapper.vm as unknown as { stops: unknown[] }).stops.pop(); route.state.form.reason = '调整'; await route.state.submit(); expect(api.reorderDispatchRoute).not.toHaveBeenCalled(); expect(route.wrapper.text()).toContain('完整保留'); route.wrapper.unmount()
 })
+it.each(['PICKUP', 'LOCAL_TRUCK'] as const)('requires saved vehicle and driver identities for %s review submission', async taskType => {
+  vi.mocked(transportApi.getTransport).mockResolvedValue({ dispatchNo: 'PC/1', pickups: [] } as unknown as Awaited<ReturnType<typeof transportApi.getTransport>>)
+  const { wrapper, state } = await open('SUBMIT_REVIEW', true, { taskType })
+  await state.submit()
+  expect(api.submitDispatchReview).not.toHaveBeenCalled()
+  expect(wrapper.text()).toContain('车辆信息尚未维护完整')
+  wrapper.unmount()
+})
 it('reports A0409 and immediately releases the form without a forced readback', async () => {
   const { wrapper, state } = await open('SUBMIT_REVIEW')
   vi.mocked(api.submitDispatchReview).mockRejectedValueOnce(new ApiResponseError('本轮调度审核已提交，请勿重复提交', 'A0409', 409, undefined, 'review-request', 'review-trace'))
@@ -292,3 +301,45 @@ it('saves a cleared unavailable master vehicle as an empty draft resource', asyn
   expect(api.submitDispatchReview).not.toHaveBeenCalled()
   wrapper.unmount()
 })
+
+it.each(['VEHICLE', 'DRIVER_PHOTO', 'DRIVER'] as const)('does not silently discard %s files when the master resource is missing', async kind => {
+  const { wrapper, state } = await open('EDIT')
+  const editor = wrapper.vm as unknown as { vehicle: Vehicle; driver: Driver }
+  editor.vehicle.mode = 'MASTER'; editor.vehicle.vehicleId = null
+  editor.driver.mode = 'MASTER'; editor.driver.driverId = null
+  await flushPromises()
+  const card = wrapper.findAllComponents(DispatchEvidenceFiles).find(item => item.props('kind') === kind)!
+  expect(card.get('.evidence-upload-button').attributes('disabled')).toBeUndefined()
+  expect(wrapper.text()).not.toContain('请先在“排车信息”')
+  // A pending reference must also be guarded at save time, rather than being converted to null.
+  card.vm.$emit('update:modelValue', ['301'])
+  await state.submit(); await flushPromises()
+  expect(api.updateDispatch).not.toHaveBeenCalled()
+  expect(wrapper.emitted('saved')).toBeUndefined()
+  expect(card.props('modelValue')).toEqual(['301'])
+  expect(wrapper.text()).toContain(kind === 'VEHICLE' ? '请先选择车辆' : '请先选择司机')
+  wrapper.unmount()
+})
+
+it.each(['MASTER', 'EXTERNAL'] as const)('keeps all three %s photo references after saving, reopening and saving again', async mode => {
+  const { wrapper, state } = await open('EDIT')
+  const editor = wrapper.vm as unknown as { vehicle: Vehicle; driver: Driver }
+  editor.vehicle.mode = mode; editor.vehicle.vehicleId = mode === 'MASTER' ? '11' : null
+  editor.driver.mode = mode; editor.driver.driverId = mode === 'MASTER' ? '12' : null
+  const expected = { VEHICLE: ['301'], DRIVER_PHOTO: ['302'], DRIVER: ['303'] }
+  for (const card of wrapper.findAllComponents(DispatchEvidenceFiles)) card.vm.$emit('update:modelValue', expected[card.props('kind') as keyof typeof expected])
+  let saved: DispatchDetail | undefined
+  vi.mocked(api.updateDispatch).mockImplementation(async (_, body) => {
+    saved = detail({ recordVersion: 1, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null } }, vehicleInfo: JSON.parse(JSON.stringify({ vehicle: body.vehicle, driver: body.driver, maintenance: body.maintenance })) })
+    vi.mocked(api.getDispatch).mockImplementation(async () => JSON.parse(JSON.stringify(saved)))
+    return command('EDIT', body.idempotencyKey)
+  })
+  await state.submit(); await flushPromises()
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
+  for (const card of wrapper.findAllComponents(DispatchEvidenceFiles)) expect(card.props('modelValue')).toEqual(expected[card.props('kind') as keyof typeof expected])
+  await state.submit()
+  expect(api.updateDispatch).toHaveBeenCalledTimes(2)
+  expect(vi.mocked(api.updateDispatch).mock.calls[1]![1]).toMatchObject({ vehicle: { evidenceFileIds: ['301'] }, driver: { evidence: { photoFileIds: ['302'], fileIds: ['303'] } } })
+  wrapper.unmount()
+})

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

@@ -41,6 +41,8 @@ const measurements = ref<Array<{ warehousePalletId: string; palletNo: string; pa
 const blankVehicle = (): Vehicle => ({ mode: 'MASTER', vehicleId: null, plate: null, carrierName: null, capacity: { palletSpaces: null, maxLoadKg: null, maxVolumeCbm: null }, evidenceFileIds: [] })
 const blankDriver = (): Driver => ({ mode: 'MASTER', driverId: null, name: null, phone: null, evidence: { licenseNo: null, licenseExpiresOn: null, fileIds: [], expectedTaskEndAt: null } })
 const vehicle = ref<Vehicle>(blankVehicle()), driver = ref<Driver>(blankDriver())
+const missingVehicle = computed(() => vehicle.value.mode === 'MASTER' && !vehicle.value.vehicleId)
+const missingDriver = computed(() => driver.value.mode === 'MASTER' && !driver.value.driverId)
 const driverPhotos = computed({ get: () => driver.value.evidence?.photoFileIds || [], set: (ids: string[]) => { if (driver.value.evidence) driver.value.evidence.photoFileIds = ids } })
 // 新选司机的主档证照先按司机读取，已保存的冻结证照仍按排车读取。
 const masterLicenseReference = computed(() => driver.value.mode === 'MASTER' ? driver.value.evidence?.masterLicenseFileId : null)
@@ -134,7 +136,10 @@ function payload(): object {
     case 'MARK_EXCEPTION':
       if (!exception.exceptionType) throw new DispatchInputError('请选择异常类型')
       return { ...common, exceptionType: exception.exceptionType, returnDirection: exception.returnDirection || null, description: exception.description.trim() || null, imageFileIds: [...exception.imageFileIds] } satisfies MarkDispatchException
-    case 'EDIT': return { ...common, vehicle: vehicle.value.mode === 'MASTER' && !vehicle.value.vehicleId ? null : vehicle.value, driver: driver.value.mode === 'MASTER' && !driver.value.driverId ? null : driver.value, maintenance: vehicleMaintenancePayload(form.maintenance), plannedDepartureAt: form.plannedDepartureAt || null, estimatedArrivalAt: form.estimatedArrivalAt || null, remark: form.remark || null } satisfies UpdateDispatch
+    case 'EDIT':
+      if (missingVehicle.value && vehicle.value.evidenceFileIds.length) throw new DispatchInputError('请先选择车辆，再保存车辆图片；当前图片尚未保存')
+      if (missingDriver.value && (driver.value.evidence?.fileIds.length || driverPhotos.value.length)) throw new DispatchInputError('请先选择司机，再保存司机照片和驾驶证照片；当前图片尚未保存')
+      return { ...common, vehicle: missingVehicle.value ? null : vehicle.value, driver: missingDriver.value ? null : driver.value, maintenance: vehicleMaintenancePayload(form.maintenance), plannedDepartureAt: form.plannedDepartureAt || null, estimatedArrivalAt: form.estimatedArrivalAt || null, remark: form.remark || null } satisfies UpdateDispatch
     case 'DISPATCH_REVIEW': case 'LOADING_REVIEW':
       if (form.decision === 'APPROVED' && approvalBlock.value) throw new DispatchInputError(approvalBlock.value)
       if (form.decision === 'REJECTED' && !form.reason.trim()) throw new DispatchInputError('驳回时必须填写原因')
@@ -148,7 +153,7 @@ function payload(): object {
       return { recordVersion: requireVersion(preview.value.recordVersion), idempotencyKey: common.idempotencyKey, manifestHash: preview.value.manifestHash, remark: form.remark || null } satisfies LoadingComplete
     }
     case 'SUBMIT_REVIEW':
-      if (!detail.value.vehicleInfo.vehicle?.vehicleId || !detail.value.vehicleInfo.driver?.driverId) {
+      if (['PICKUP', 'LOCAL_TRUCK'].includes(detail.value.taskType || '') && (!detail.value.vehicleInfo.vehicle?.vehicleId || !detail.value.vehicleInfo.driver?.driverId)) {
         throw new DispatchInputError('车辆信息尚未维护完整，请先点击“维护车辆”并保存车辆、司机后再提交审核')
       }
       return { ...common, remark: null }
@@ -263,8 +268,8 @@ watch([open, () => props.dispatchNo, () => props.action, () => props.operation],
             <template #fees><DispatchVehicleMaintenanceFees :dispatch-no="currentNo" :deliveries="detail.documents.deliveries" /></template>
             <template #attachments>
               <div class="workflow-photo-grid density-dialog-sections" aria-label="车辆司机照片">
-                <DispatchEvidenceFiles photo-card v-model="vehicle.evidenceFileIds" :dispatch-no="currentNo" kind="VEHICLE" label="车辆图片" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.VEHICLE = $event" />
-                <DispatchEvidenceFiles photo-card v-model="driverPhotos" :dispatch-no="currentNo" kind="DRIVER_PHOTO" label="司机照片" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER_PHOTO = $event" />
+                <DispatchEvidenceFiles photo-card v-model="vehicle.evidenceFileIds" :dispatch-no="currentNo" kind="VEHICLE" label="车辆图片" :master-resource="vehicle.mode === 'MASTER' && vehicle.vehicleId ? { kind: 'VEHICLE', id: vehicle.vehicleId } : null" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.VEHICLE = $event" />
+                <DispatchEvidenceFiles photo-card v-model="driverPhotos" :dispatch-no="currentNo" kind="DRIVER_PHOTO" label="司机照片" :master-resource="driver.mode === 'MASTER' && driver.driverId ? { kind: 'DRIVER', id: driver.driverId } : null" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER_PHOTO = $event" />
                 <DispatchEvidenceFiles photo-card v-if="driver.evidence" v-model="driver.evidence.fileIds" :dispatch-no="currentNo" kind="DRIVER" label="驾驶证照片" :reference-ids="masterLicenseReference ? [masterLicenseReference] : []" :master-license="unsavedMasterLicense" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER = $event" />
               </div>
             </template>
@@ -279,7 +284,7 @@ watch([open, () => props.dispatchNo, () => props.action, () => props.operation],
               <tr v-else><th scope="row">起运地</th><td>{{ detail.dispatchInfo.route?.split(' → ')[0] || '—' }}</td><th scope="row">目的地</th><td colspan="3">{{ detail.dispatchInfo.route?.split(' → ').slice(1).join(' → ') || '—' }}</td></tr>
               <tr><th scope="row">计划发车</th><td>{{ reviewTime(detail.dispatchInfo.plannedDepartureAt) }}</td><th scope="row">预计送达</th><td>{{ reviewTime(detail.dispatchInfo.estimatedArrivalAt) }}</td><th scope="row">货量</th><td>{{ detail.counts.palletCount }} 托 / {{ detail.counts.packageCount }} 箱</td></tr>
             </tbody></table>
-            <el-alert v-if="!detail.vehicleInfo.vehicle?.vehicleId || !detail.vehicleInfo.driver?.driverId" title="车辆信息尚未维护完整，请先点击“维护车辆”并保存车辆、司机后再提交审核。" type="warning" :closable="false" show-icon />
+            <el-alert v-if="['PICKUP', 'LOCAL_TRUCK'].includes(detail.taskType || '') && (!detail.vehicleInfo.vehicle?.vehicleId || !detail.vehicleInfo.driver?.driverId)" title="车辆信息尚未维护完整，请先点击“维护车辆”并保存车辆、司机后再提交审核。" type="warning" :closable="false" show-icon />
           </section>
         </template>
         <template v-else-if="currentAction === 'DISPATCH_REVIEW' || currentAction === 'LOADING_REVIEW'">
@@ -328,7 +333,7 @@ watch([open, () => props.dispatchNo, () => props.action, () => props.operation],
 </template>
 <style scoped>
 .workflow-order-actions { width: 160px; white-space: nowrap; }
-.workflow-photo-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: var(--admin-space-4); }
+.workflow-photo-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); align-items: start; gap: var(--admin-space-4); }
 .workflow-review-actions { display: flex; justify-content: flex-end; gap: var(--admin-space-3); }
 .workflow-review-actions > .el-button { margin-left: 0; }
 </style>

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

@@ -0,0 +1,57 @@
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { confirmInboundShortage, type InboundPlanDetailDto } from '../api/inboundPlans'
+import InboundShortageConfirmation from './InboundShortageConfirmation.vue'
+
+const access = vi.hoisted(() => ({ can: vi.fn(() => true) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => access }))
+vi.mock('../api/inboundPlans', () => ({ confirmInboundShortage: vi.fn() }))
+const dialog = { name: 'AppDialog', props: ['modelValue', 'confirmDisabled', 'confirmLoading'], emits: ['confirm'], template: '<div v-if="modelValue"><slot /><button data-confirm :disabled="confirmDisabled || confirmLoading" @click="$emit(\'confirm\')">确认并按实收入库</button></div>' }
+function detail(overrides: Partial<InboundPlanDetailDto> = {}): InboundPlanDetailDto {
+  return { id: '1', planNo: 'IP-1', customerId: '9007199254741001', sourceOrderId: '2', version: 4,
+    orderType: 'FIRST_LEG', status: 'PENDING_RECONCILIATION', expectedPackageCount: 21, pickedPackageCount: 20,
+    lineCount: 1, palletCount: 2, totalGrossWeightKg: 0, totalNetWeightKg: 0, totalVolumeCbm: 0,
+    lines: [{ id: '3', orderId: '2', fbaWarehouseCode: 'ONT8', requiredPackageCount: 21, plannedPalletCount: 2 }],
+    pallets: [], allocations: [], ...overrides }
+}
+function render(value = detail()) {
+  return mount(InboundShortageConfirmation, { props: { detail: value }, global: { plugins: [ElementPlus], stubs: { AppDialog: dialog } } })
+}
+describe('入库短少确认', () => {
+  beforeEach(() => { access.can.mockReturnValue(true); vi.mocked(confirmInboundShortage).mockReset().mockResolvedValue({ status: 'PARTIAL_INBOUND' }) })
+  it('requires a reason and submits actual counts without overwriting the expected count', async () => {
+    const wrapper = render()
+    await wrapper.find('button').trigger('click')
+    expect(wrapper.text()).toContain('21')
+    expect(wrapper.text()).toContain('20')
+    expect(wrapper.get('[data-confirm]').attributes('disabled')).toBeDefined()
+    await wrapper.get('textarea').setValue('现场清点短少1箱')
+    await wrapper.get('[data-confirm]').trigger('click')
+    await flushPromises()
+    expect(confirmInboundShortage).toHaveBeenCalledWith('IP-1', { customerId: '9007199254741001', version: 4, expectedPackageCount: 21, receivedPackageCount: 20, reason: '现场清点短少1箱' }, expect.any(String))
+    expect(wrapper.emitted('refresh')).toHaveLength(1)
+    expect(wrapper.find('textarea').exists()).toBe(false)
+    wrapper.unmount()
+  })
+  it('preserves the reason on failure and uses fresh facts and a new key for retry', async () => {
+    vi.mocked(confirmInboundShortage).mockRejectedValueOnce(new Error('记录已变化'))
+    const wrapper = render()
+    await wrapper.find('button').trigger('click'); await wrapper.get('textarea').setValue('短少1箱')
+    await wrapper.get('[data-confirm]').trigger('click'); await flushPromises()
+    expect((wrapper.get('textarea').element as HTMLTextAreaElement).value).toBe('短少1箱')
+    await wrapper.setProps({ detail: detail({ version: 5 }) })
+    await wrapper.get('[data-confirm]').trigger('click'); await flushPromises()
+    const calls = vi.mocked(confirmInboundShortage).mock.calls
+    expect(calls[1]?.[1].version).toBe(5)
+    expect(calls[1]?.[2]).not.toBe(calls[0]?.[2])
+    wrapper.unmount()
+  })
+  it('hides the action without edit permission', () => {
+    access.can.mockReturnValue(false)
+    const wrapper = render(); expect(wrapper.find('button').exists()).toBe(false); wrapper.unmount()
+  })
+  it.each([{ status: 'PARTIAL_INBOUND' }, { pickedPackageCount: 21 }, { pickedPackageCount: 22 }, { pickedPackageCount: 0 }, { version: undefined }, { orderType: 'ONE_CLICK_DROPSHIP' }])('rejects ineligible facts %o', (overrides) => {
+    const wrapper = render(detail(overrides)); expect(wrapper.find('button').exists()).toBe(false); wrapper.unmount()
+  })
+})

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

@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { confirmInboundShortage, type InboundPlanDetailDto } from '../api/inboundPlans'
+import { overseasWarehousePermissions } from '../permissions'
+
+const props = defineProps<{ detail: InboundPlanDetailDto }>()
+const emit = defineEmits<{ refresh: [] }>()
+const access = useAccessPreviewStore()
+const open = ref(false)
+const saving = ref(false)
+const reason = ref('')
+const error = ref<ApiErrorDetails | null>(null)
+const expected = computed(() => props.detail.expectedPackageCount)
+const received = computed(() => props.detail.pickedPackageCount)
+const shortage = computed(() => (expected.value ?? 0) - (received.value ?? 0))
+const eligible = computed(() => access.can(overseasWarehousePermissions.inboundOrderEdit)
+  && props.detail.status === 'PENDING_RECONCILIATION' && props.detail.version != null
+  && props.detail.orderType !== 'ONE_CLICK_DROPSHIP' && props.detail.lines.length > 0
+  && props.detail.lines.every(line => !!line.fbaWarehouseCode)
+  && expected.value != null && received.value != null && received.value > 0 && shortage.value > 0)
+
+function show() {
+  if (!eligible.value || saving.value) return
+  reason.value = ''; error.value = null; open.value = true
+}
+async function confirm() {
+  if (!open.value || saving.value || !eligible.value || !reason.value.trim()
+    || props.detail.version == null || expected.value == null || received.value == null) return
+  saving.value = true; error.value = null
+  try {
+    await confirmInboundShortage(props.detail.planNo, {
+      customerId: props.detail.customerId, version: props.detail.version,
+      expectedPackageCount: expected.value, receivedPackageCount: received.value, reason: reason.value.trim(),
+    }, crypto.randomUUID())
+    ElMessage.success(`已确认短少，${received.value} 箱实收已入库`)
+    open.value = false
+    emit('refresh')
+  } catch (cause) {
+    error.value = getApiErrorDetails(cause, '短少确认失败，请核对最新收货记录后重试')
+    emit('refresh')
+  } finally { saving.value = false }
+}
+</script>
+
+<template>
+  <el-button v-if="eligible" class="density-action" size="small" :disabled="saving" @click="show">确认短少入库</el-button>
+  <AppDialog v-model="open" class="admin-density-dialog" title="确认短少入库" width="560px"
+    confirm-text="确认并按实收入库" :confirm-loading="saving" :confirm-disabled="!eligible || !reason.trim()" @confirm="confirm">
+    <div class="density-dialog-sections">
+      <table class="density-table"><tbody>
+        <tr><th scope="row">入库单号</th><td>{{ detail.planNo }}</td></tr>
+        <tr><th scope="row">应收箱数</th><td>{{ expected }}</td></tr>
+        <tr><th scope="row">实收入库箱数</th><td>{{ received }}</td></tr>
+        <tr><th scope="row">确认短少箱数</th><td>{{ shortage }}</td></tr>
+      </tbody></table>
+      <el-form class="density-form" label-position="left" label-width="100px" :disabled="saving">
+        <el-form-item label="确认原因" required><el-input v-model="reason" aria-label="短少确认原因" type="textarea" :rows="2" maxlength="200" /></el-form-item>
+      </el-form>
+      <LoadErrorState v-if="error" compact title="短少确认未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    </div>
+  </AppDialog>
+</template>

src/modules/overseas-warehouse/components/TransportExecutionPanel.resourcePhotos.test.ts

@@ -0,0 +1,122 @@
+import { mount, flushPromises } from '@vue/test-utils'
+import ElementPlus from 'element-plus'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import TransportExecutionPanel from './TransportExecutionPanel.vue'
+import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
+import { assignTransport, getTransport, type TransportDetail } from '../api/transportTasks'
+import { getDispatchEvidence, getDispatchEvidenceContent } from '../api/dispatches'
+import { getDriver, getResourcePhoto, downloadResourcePhoto, downloadDriverLicense } from '@/modules/overseas-master-data'
+
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('@/modules/overseas-master-data', () => ({ listVehicles: vi.fn(), listDrivers: vi.fn(), getDriver: vi.fn(), getResourcePhoto: vi.fn(), downloadResourcePhoto: vi.fn(), downloadDriverLicense: vi.fn(), pickupStatusLabels: { ASSIGNED: '待取货' } }))
+vi.mock('../api/transportTasks', () => ({ getTransport: vi.fn(), assignTransport: vi.fn(), transportOccupancy: vi.fn(), cancelTransport: vi.fn(), releaseTransport: vi.fn(), commandTransport: vi.fn(), uploadTransport: vi.fn(), downloadTransportEvidence: vi.fn(), transportLabels: { PICKUP: '到仓取货' } }))
+vi.mock('../api/dispatches', () => ({ getDispatchEvidence: vi.fn(), getDispatchEvidenceContent: vi.fn(), uploadDispatchEvidence: vi.fn() }))
+
+const facts = (): TransportDetail => ({ dispatchNo: 'PC1', taskType: 'PICKUP', dispatchRecordVersion: 9, execution: { trip: { status: 'PLANNED', recordVersion: 4, vehicleId: '1', vehiclePlate: 'CA-1', driverId: '2', driverName: '司机甲' } }, pickups: [{ customerId: 'C1', transferNo: 'WT1', packageCount: 5, status: 'ASSIGNED', evidence: [] }], completionEvidence: [] }) as unknown as TransportDetail
+const photo = (fileId: string) => ({ fileId, fileName: `${fileId}.jpg`, contentType: 'image/jpeg', sizeBytes: 5 })
+const blob = () => new Blob(['photo'], { type: 'image/jpeg' })
+const mountPanel = () => mount(TransportExecutionPanel, { props: { dispatchNo: 'PC1', editResources: true }, global: { plugins: [ElementPlus] } })
+const saveButton = (wrapper: ReturnType<typeof mountPanel>) => wrapper.findAll('button').find(button => button.text() === '保存车辆司机')!
+
+beforeEach(() => {
+  vi.resetAllMocks()
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+  vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:resource-photo')
+  vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => {})
+  vi.mocked(getTransport).mockImplementation(async () => facts())
+  vi.mocked(getDriver).mockResolvedValue({ id: '2', licenseFileId: '33' } as Awaited<ReturnType<typeof getDriver>>)
+  vi.mocked(getResourcePhoto).mockImplementation(async kind => ({ recordVersion: '1', photo: photo(kind === 'VEHICLE' ? '91' : '92') }))
+  vi.mocked(downloadResourcePhoto).mockImplementation(async () => blob())
+  vi.mocked(downloadDriverLicense).mockImplementation(async () => blob())
+  vi.mocked(getDispatchEvidence).mockImplementation(async (_no, _kind, id) => photo(id))
+  vi.mocked(getDispatchEvidenceContent).mockImplementation(async () => blob())
+})
+afterEach(() => { vi.restoreAllMocks(); vi.unstubAllGlobals() })
+
+it('keeps automatically loaded photos available after refreshing the open form', async () => {
+  const wrapper = mountPanel()
+  try {
+    await flushPromises()
+    expect(saveButton(wrapper).attributes('disabled')).toBeUndefined()
+    expect(getResourcePhoto).toHaveBeenCalledTimes(2)
+    await wrapper.get('[aria-label="刷新运输任务"]').trigger('click')
+    await flushPromises()
+    expect(wrapper.findAll('.evidence-photo-preview')).toHaveLength(3)
+    expect(saveButton(wrapper).attributes('disabled')).toBeUndefined()
+    vi.mocked(assignTransport).mockResolvedValue(facts())
+    await saveButton(wrapper).trigger('click')
+    await flushPromises()
+    expect(assignTransport).toHaveBeenCalledWith('PC1', expect.objectContaining({ reviewPhotos: { vehicleFileIds: [], driverPhotoFileIds: [], licenseFileIds: [] } }))
+  } finally { wrapper.unmount() }
+})
+
+it('loads local truck vehicle and driver archives while retaining the trip license upload requirement', async () => {
+  const truck = facts()
+  truck.taskType = 'LOCAL_TRUCK'
+  truck.pickups = []
+  truck.execution.trip.stops = []
+  vi.mocked(getTransport).mockResolvedValue(truck)
+  vi.mocked(assignTransport).mockResolvedValue(truck)
+  const wrapper = mountPanel()
+  try {
+    await flushPromises()
+    expect(getResourcePhoto).toHaveBeenCalledWith('VEHICLE', '1')
+    expect(getResourcePhoto).toHaveBeenCalledWith('DRIVER', '2')
+    expect(saveButton(wrapper).attributes('disabled')).toBeDefined()
+    const cards = wrapper.findAllComponents(DispatchEvidenceFiles)
+    expect(cards[2]!.props('masterLicense')).toBeNull()
+    cards[2]!.vm.$emit('update:modelValue', ['103'])
+    await flushPromises()
+    expect(saveButton(wrapper).attributes('disabled')).toBeUndefined()
+    await saveButton(wrapper).trigger('click')
+    await flushPromises()
+    expect(assignTransport).toHaveBeenCalledWith('PC1', expect.objectContaining({
+      dispatchRecordVersion: 9, masterLicenseFileId: null,
+      reviewPhotos: { vehicleFileIds: [], driverPhotoFileIds: [], licenseFileIds: ['103'] },
+    }))
+  } finally { wrapper.unmount() }
+})
+
+it('resubmits saved snapshots when reopening maintenance even if archive photos change', async () => {
+  const saved = facts()
+  saved.execution.trip.recordVersion = 5
+  saved.dispatchRecordVersion = 10
+  saved.resources = { vehicle: { vehicleId: '1', evidenceFileIds: ['101'] }, driver: { driverId: '2', evidence: { photoFileIds: ['102'], fileIds: ['33'], masterLicenseFileId: '33' } } } as TransportDetail['resources']
+  vi.mocked(assignTransport).mockResolvedValue(saved)
+  const wrapper = mountPanel()
+  try {
+    await flushPromises()
+    await saveButton(wrapper).trigger('click')
+    await flushPromises()
+    expect(assignTransport).toHaveBeenCalledTimes(1)
+    vi.mocked(getResourcePhoto).mockResolvedValue({ recordVersion: '2', photo: photo('999') })
+    await wrapper.findAll('button').find(button => button.text() === '维护车辆信息')!.trigger('click')
+    await flushPromises()
+    const reopened = wrapper.findAllComponents(DispatchEvidenceFiles)
+    expect(reopened[0]!.props('modelValue')).toEqual(['101'])
+    expect(reopened[1]!.props('modelValue')).toEqual(['102'])
+    expect(getResourcePhoto).toHaveBeenCalledTimes(2)
+    expect(getDispatchEvidence).toHaveBeenCalledWith('PC1', 'VEHICLE', '101')
+    expect(saveButton(wrapper).attributes('disabled')).toBeUndefined()
+    await saveButton(wrapper).trigger('click')
+    await flushPromises()
+    expect(assignTransport).toHaveBeenLastCalledWith('PC1', expect.objectContaining({ recordVersion: 5, dispatchRecordVersion: 10, reviewPhotos: { vehicleFileIds: ['101'], driverPhotoFileIds: ['102'], licenseFileIds: [] } }))
+  } finally { wrapper.unmount() }
+})
+
+it.each([0, 1])('requires a new photo when resource selector %s changes to an archive without a photo', async index => {
+  const wrapper = mountPanel()
+  try {
+    await flushPromises()
+    expect(saveButton(wrapper).attributes('disabled')).toBeUndefined()
+    vi.mocked(getResourcePhoto).mockResolvedValue({ recordVersion: '0', photo: null })
+    wrapper.findAllComponents({ name: 'ElSelect' })[index]!.vm.$emit('update:modelValue', '4')
+    await flushPromises()
+    expect(saveButton(wrapper).attributes('disabled')).toBeDefined()
+    expect(wrapper.findAllComponents(DispatchEvidenceFiles)[index]!.props('modelValue')).toEqual([])
+    expect(getResourcePhoto).toHaveBeenLastCalledWith(index === 0 ? 'VEHICLE' : 'DRIVER', '4')
+    await saveButton(wrapper).trigger('click')
+    expect(assignTransport).not.toHaveBeenCalled()
+  } finally { wrapper.unmount() }
+})

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

@@ -23,9 +23,10 @@ const vehicles = ref<VehicleDetail[]>([]), drivers = ref<DriverDetail[]>([]), ve
 const occupancy = ref<Record<string, boolean>>({}), candidateBusy = ref(false)
 const vehiclePhotos = ref<string[]>([]), driverPhotos = ref<string[]>([]), licensePhotos = ref<string[]>([])
 const masterLicense = ref<{ driverId: string; fileId: string } | null>(null), licenseLoading = ref(false)
+const masterPhotoAvailable = reactive({ vehicle: false, driver: false })
 const photoBusy = reactive({ vehicle: false, driver: false, license: false })
 const activeMasterLicense = computed(() => detail.value?.taskType === 'PICKUP' && !licensePhotos.value.length ? masterLicense.value : null)
-const photosComplete = computed(() => !['PICKUP', 'LOCAL_TRUCK'].includes(detail.value?.taskType || '') || !!(vehiclePhotos.value.length && driverPhotos.value.length && (licensePhotos.value.length || activeMasterLicense.value)))
+const photosComplete = computed(() => !['PICKUP', 'LOCAL_TRUCK'].includes(detail.value?.taskType || '') || !!((vehiclePhotos.value.length || masterPhotoAvailable.vehicle) && (driverPhotos.value.length || masterPhotoAvailable.driver) && (licensePhotos.value.length || activeMasterLicense.value)))
 const selected = ref<PickupTask | null>(null), pickupOpen = ref(false), actual = ref<number>(), evidence = ref<PickupEvidence[]>([])
 const truckPickupEvidence = ref<PickupEvidence[]>([]), truckDeliveryEvidence = ref<PickupEvidence[]>([])
 const truckPreviewUrls = ref<Record<string, string>>({})
@@ -74,7 +75,10 @@ function restoreVehiclePhotos() {
   const saved = detail.value?.resources?.vehicle
   vehiclePhotos.value = saved?.vehicleId === vehicleId.value ? [...saved.evidenceFileIds] : []
 }
-watch(vehicleId, restoreVehiclePhotos, { flush: 'sync' })
+// 同一资源刷新沿用照片组件的可用状态；切换资源时立即清空，等待新照片确认。
+watch(vehicleId, () => { masterPhotoAvailable.vehicle = false }, { flush: 'sync' })
+watch(driverId, () => { masterPhotoAvailable.driver = false }, { flush: 'sync' })
+watch(() => [vehicleId.value, resourceFormOpen.value, detail.value] as const, restoreVehiclePhotos, { flush: 'sync' })
 /** 切换司机后重读其主档驾驶证，迟到响应不得覆盖新司机或新单据。 */
 watch(() => [driverId.value, resourceFormOpen.value, detail.value] as const, async ([id, open], _, onCleanup) => {
   let current = true
@@ -214,8 +218,8 @@ onBeforeUnmount(clearTruckPreviewUrls)
           <el-form-item label="车辆"><el-select v-model="vehicleId" filterable placeholder="选择车辆" @visible-change="(value: boolean) => value && !vehicles.length && candidates()"><el-option v-if="vehicleId && !vehicles.some(row => row.id === vehicleId)" :value="vehicleId" :label="trip.vehiclePlate || '当前车辆'" /><el-option v-for="row in vehicles" :key="row.id" :value="row.id" :disabled="occupancy[`V:${row.id}`] !== true" :label="`${row.plateNumber} · ${row.maxPalletSpaces}托位`" /></el-select></el-form-item>
           <el-form-item label="司机"><el-select v-model="driverId" filterable placeholder="选择司机" @visible-change="(value: boolean) => value && !drivers.length && candidates()"><el-option v-if="driverId && !drivers.some(row => row.id === driverId)" :value="driverId" :label="`${trip.driverName || '当前司机'} · ${trip.driverPhone || ''}`" /><el-option v-for="row in drivers" :key="row.id" :value="row.id" :disabled="occupancy[`D:${row.id}`] !== true || !row.qualification.canDispatch" :label="`${row.details.name} · ${row.details.phone}`" /></el-select></el-form-item>
           <section v-if="['PICKUP', 'LOCAL_TRUCK'].includes(detail.taskType)" class="transport-review-photos" aria-label="调度审核照片">
-            <DispatchEvidenceFiles photo-card v-model="vehiclePhotos" :dispatch-no="dispatchNo" kind="VEHICLE" label="车辆图片" :disabled="locked" @busy="photoBusy.vehicle = $event" />
-            <DispatchEvidenceFiles photo-card v-model="driverPhotos" :dispatch-no="dispatchNo" kind="DRIVER_PHOTO" label="司机照片" :disabled="locked" @busy="photoBusy.driver = $event" />
+            <DispatchEvidenceFiles photo-card v-model="vehiclePhotos" :dispatch-no="dispatchNo" kind="VEHICLE" label="车辆图片" :master-resource="vehicleId ? { kind: 'VEHICLE', id: vehicleId } : null" @available="masterPhotoAvailable.vehicle = $event" :disabled="locked" @busy="photoBusy.vehicle = $event" />
+            <DispatchEvidenceFiles photo-card v-model="driverPhotos" :dispatch-no="dispatchNo" kind="DRIVER_PHOTO" label="司机照片" :master-resource="driverId ? { kind: 'DRIVER', id: driverId } : null" @available="masterPhotoAvailable.driver = $event" :disabled="locked" @busy="photoBusy.driver = $event" />
             <DispatchEvidenceFiles photo-card v-model="licensePhotos" :dispatch-no="dispatchNo" kind="DRIVER" label="驾驶证照片" :master-license="activeMasterLicense" :reference-ids="activeMasterLicense ? [activeMasterLicense.fileId] : []" :disabled="locked" @busy="photoBusy.license = $event" />
             <p class="transport-photo-hint workbench-meta">请补齐车辆图片、司机照片和驾驶证照片；保存后供调度员和理货员审核。</p>
           </section>