优化

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

@@ -12,6 +12,15 @@ const options = { props: { modelValue: ['301'], dispatchNo: 'PC/1', kind: 'VEHIC
 const button = (wrapper: ReturnType<typeof mount>, label: string) => wrapper.findAll('button').find(value => value.text() === label)!
 async function selectFile(wrapper: ReturnType<typeof mount>, file: File) { const input = wrapper.get('input[type="file"]'); Object.defineProperty(input.element, 'files', { configurable: true, value: [file] }); await input.trigger('change'); await flushPromises() }
 beforeEach(() => { vi.resetAllMocks(); vi.mocked(api.getDispatchEvidence).mockResolvedValue(metadata()); vi.mocked(api.uploadDispatchEvidence).mockResolvedValue(metadata('302')); vi.mocked(api.getDispatchEvidenceContent).mockResolvedValue(new Blob(['png'], { type: 'image/png' })); URL.createObjectURL = vi.fn().mockReturnValue('blob:authenticated'); URL.revokeObjectURL = vi.fn() })
+it('keeps previously provided references read-only and only submits newly uploaded audit files', async () => {
+  const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, modelValue: [], referenceIds: ['301'], kind: 'DRIVER_PHOTO', label: '司机照片' } }); await flushPromises()
+  expect(wrapper.findAll('tbody button').map(item => item.text())).toEqual(['预览'])
+  await selectFile(wrapper, new File(['pdf'], 'photo.pdf', { type: 'application/pdf' })); expect(api.uploadDispatchEvidence).not.toHaveBeenCalled()
+  await selectFile(wrapper, new File(['png'], 'photo.png', { type: 'image/png' }))
+  expect(api.uploadDispatchEvidence).toHaveBeenCalledWith('PC/1', 'DRIVER_PHOTO', expect.any(File))
+  expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([['302']])
+  wrapper.unmount()
+})
 it('previews and replaces real string-size metadata through the JSON parser and API boundary', async () => {
   const actual = await vi.importActual<typeof import('../api/dispatches')>('../api/dispatches')
   const envelope = (fileId: string) => parseApiJsonResponse(JSON.stringify({ code: '200', data: { ...metadata(fileId), sizeBytes: '3' } }))

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

@@ -10,13 +10,16 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getDispatchEvidence, getDispatchEvidenceContent, uploadDispatchEvidence } from '../api/dispatches'
 import { DispatchInputError, type DispatchEvidenceFile, type DispatchEvidenceKind } from '../dispatchContracts'
-const props = defineProps<{ dispatchNo: string; kind: DispatchEvidenceKind; disabled?: boolean; readonly?: boolean }>()
+const props = defineProps<{ dispatchNo: string; kind: DispatchEvidenceKind; disabled?: boolean; readonly?: boolean; label?: string; saveHint?: string; referenceIds?: string[] }>()
 const ids = defineModel<string[]>({ required: true })
+const allIds = computed(() => [...new Set([...(props.referenceIds || []), ...ids.value])])
 const emit = defineEmits<{ busy: [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 label = computed(() => props.kind === 'VEHICLE' ? '本趟车辆证据' : '本趟司机证照')
+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.kind === 'DRIVER_PHOTO' ? types.slice(1) : types)
+const uploadFormats = computed(() => props.kind === 'DRIVER_PHOTO' ? 'JPG、PNG' : 'PDF、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('附件元数据未确认本车有效文件，请重新读取')
@@ -25,7 +28,7 @@ function valid(value: DispatchEvidenceFile, expected?: string) {
 function fail(cause: unknown, fallback: string) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : fallback) }
 function closePreview() { previewGeneration++; pendingPopup?.close(); pendingPopup = null; imageOpen.value = false; previewLoading.value = false; if (imageUrl.value) { URL.revokeObjectURL(imageUrl.value); urls.delete(imageUrl.value); imageUrl.value = '' } }
 async function load() {
-  const current = ++generation, no = props.dispatchNo, kind = props.kind, values = [...ids.value]
+  const current = ++generation, no = props.dispatchNo, kind = props.kind, values = [...allIds.value]
   closePreview(); metadata.value = {}; error.value = null
   if (!no) return
   const results = await Promise.allSettled(values.map(async id => valid(await getDispatchEvidence(no, kind, id), id)))
@@ -37,7 +40,7 @@ async function upload(event: Event) {
   const element = event.target as HTMLInputElement, file = element.files?.[0]; element.value = ''
   if (!file || props.readonly || props.disabled || uploading.value) return
   error.value = null
-  if (!types.includes(file.type) || file.size <= 0 || file.size > maximum) { fail(new DispatchInputError('请选择10MiB以内的PDF、JPG或PNG文件'), '附件不符合要求'); return }
+  if (!uploadTypes.value.includes(file.type) || file.size <= 0 || file.size > maximum) { fail(new DispatchInputError(`请选择10MiB以内的${uploadFormats.value}文件`), '附件不符合要求'); return }
   const current = generation, no = props.dispatchNo, kind = props.kind, replaceId = replacing
   uploading.value = true; emit('busy', true)
   try {
@@ -71,15 +74,15 @@ 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, ids.value]), load, { immediate: true })
+watch(() => JSON.stringify([props.dispatchNo, props.kind, allIds.value]), load, { immediate: true })
 onBeforeUnmount(() => { generation++; closePreview(); for (const url of urls) URL.revokeObjectURL(url); urls.clear(); emit('busy', false) })
 </script>
 <template>
-  <section class="dispatch-evidence density-dialog-section" data-tone="source" :class="{ 'dispatch-evidence--readonly': readonly }" :aria-label="label"><h4 class="density-dialog-section__title">{{ label }}<InlineHelp title="附件上传说明"><p>PDF、JPG、PNG，单文件最大10MiB；上传后保存车辆信息才完成本车引用。</p></InlineHelp></h4>
+  <section class="dispatch-evidence density-dialog-section" data-tone="source" :class="{ 'dispatch-evidence--readonly': readonly }" :aria-label="label"><h4 class="density-dialog-section__title">{{ label }}<InlineHelp title="附件上传说明"><p>{{ uploadFormats }}，单文件最大10MiB；{{ saveHint || '上传后保存车辆信息才完成本车引用。' }}</p></InlineHelp></h4>
     <LoadErrorState v-if="error" title="本趟附件操作未完成" :message="error.message" compact retry-text="重新读取资料" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-    <table v-if="ids.length" class="density-table dispatch-evidence-table"><thead><tr><th class="dispatch-evidence__actions">操作</th><th>附件名称</th></tr></thead><tbody><tr v-for="id in ids" :key="id"><td class="dispatch-evidence__actions"><div class="density-actions"><el-button link :disabled="!metadata[id] || previewLoading" @click="preview(id)">预览</el-button><template v-if="!readonly"><el-button link :disabled="disabled || uploading" @click="choose(id)">替换</el-button><el-button link :disabled="disabled || uploading" @click="remove(id)">移除引用</el-button></template></div></td><td><LineClampText :content="metadata[id]?.fileName || '附件资料待核实'" /></td></tr></tbody></table>
+    <table v-if="allIds.length" class="density-table dispatch-evidence-table"><thead><tr><th class="dispatch-evidence__actions">操作</th><th>附件名称</th></tr></thead><tbody><tr v-for="id in allIds" :key="id"><td class="dispatch-evidence__actions"><div class="density-actions"><el-button link :disabled="!metadata[id] || previewLoading" @click="preview(id)">预览</el-button><template v-if="!readonly && ids.includes(id)"><el-button link :disabled="disabled || uploading" @click="choose(id)">替换</el-button><el-button link :disabled="disabled || uploading" @click="remove(id)">移除引用</el-button></template></div></td><td><LineClampText :content="metadata[id]?.fileName || '附件资料待核实'" /></td></tr></tbody></table>
     <p v-else class="density-dialog-note">暂无本趟附件。</p>
-    <template v-if="!readonly"><input ref="input" class="evidence-input" type="file" accept="application/pdf,image/jpeg,image/png" :aria-label="'上传' + label" :disabled="disabled || uploading || !dispatchNo" @change="upload"><el-button :disabled="disabled || uploading || !dispatchNo" :loading="uploading" @click="choose()">上传{{ label }}</el-button></template>
+    <template v-if="!readonly"><input ref="input" class="evidence-input" type="file" :accept="uploadTypes.join(',')" :aria-label="'上传' + label" :disabled="disabled || uploading || !dispatchNo" @change="upload"><el-button :disabled="disabled || uploading || !dispatchNo" :loading="uploading" @click="choose()">上传{{ label }}</el-button></template>
     <AppDialog append-to-body class="admin-density-dialog admin-workbench is-dialog" :model-value="imageOpen" :title="imageName || '附件预览'" width="min(900px, calc(100vw - 28px))" fullscreenable :loading="previewLoading" :show-confirm="false" cancel-text="关闭" @update:model-value="closePreview">
       <div class="density-dialog-sections"><section class="density-dialog-section" data-tone="source" aria-label="本车附件预览信息"><h3 class="density-dialog-section__title">附件信息</h3><table class="density-table"><tbody><tr><th scope="row">排车单号</th><td>{{ dispatchNo || '—' }}</td></tr><tr><th scope="row">附件名称</th><td>{{ imageName || '—' }}</td></tr></tbody></table></section><p v-if="previewLoading" class="density-dialog-note" role="status">正在读取本车附件…</p><img v-if="imageUrl" class="evidence-image" :src="imageUrl" :alt="imageName"></div>
     </AppDialog>

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

@@ -92,7 +92,37 @@ describe('dispatch workflow native layout', () => {
     dialog.vm.$emit('confirm'); await flushPromises(); expect(review).not.toHaveBeenCalled()
     await dialog.get('textarea').setValue(' 证据不完整 '); dialog.vm.$emit('confirm'); await flushPromises()
     expect(review).toHaveBeenCalledExactlyOnceWith('PC/1', { recordVersion: 0, idempotencyKey: expect.any(String), decision: 'REJECTED', reason: '证据不完整' })
-    expect(dialog.findAll('input[type="file"]')).toHaveLength(0)
+    expect(dialog.findAll('input[type="file"]')).toHaveLength(3)
+  })
+  it.each(['DISPATCH_REVIEW', 'LOADING_REVIEW'] as const)('uploads three audit attachments with only %s permission and retries the same rejected review', async action => {
+    can.mockImplementation(code => code === (action === 'DISPATCH_REVIEW' ? 'platform:fleet:trip:dispatch-review' : 'platform:fleet:trip:loading-review'))
+    const review = action === 'DISPATCH_REVIEW' ? api.reviewDispatch : api.reviewDispatchLoading
+    vi.mocked(review).mockRejectedValueOnce(new Error('unknown review')).mockImplementationOnce(async (_, body) => command(action, body.idempotencyKey))
+    const { wrapper, dialog } = await render(action, undefined, true)
+    const fields = dialog.findAllComponents(DispatchEvidenceFiles)
+    expect(fields.map(item => item.props('label'))).toEqual(['车辆图片', '司机照片', '驾驶证照片'])
+    expect(fields[0]!.props('referenceIds')).toEqual(['301'])
+    expect(fields[0]!.findAll('button').some(button => button.text() === '替换')).toBe(false)
+    for (const [index, files] of fields.entries()) {
+      let resolve!: (value: DispatchEvidenceFile) => void
+      vi.mocked(api.uploadDispatchEvidence).mockReturnValueOnce(new Promise(done => { resolve = done }))
+      const input = files.get('input[type="file"]'), file = new File(['png'], 'audit.png', { type: 'image/png' })
+      Object.defineProperty(input.element, 'files', { configurable: true, value: [file] })
+      await input.trigger('change'); await flushPromises()
+      expect(dialog.props('confirmLoading')).toBe(true)
+      dialog.vm.$emit('confirm'); await flushPromises(); expect(review).not.toHaveBeenCalled()
+      resolve(evidence(String(401 + index))); await flushPromises()
+    }
+    expect(vi.mocked(api.uploadDispatchEvidence).mock.calls.map(call => call[1])).toEqual(['VEHICLE', 'DRIVER_PHOTO', 'DRIVER'])
+    field(dialog, '审核结果').getComponent({ name: 'ElRadioGroup' }).vm.$emit('update:modelValue', 'REJECTED'); await flushPromises()
+    await dialog.get('textarea').setValue('需重新核对车牌')
+    dialog.vm.$emit('confirm'); await flushPromises()
+    const original = structuredClone(vi.mocked(review).mock.calls[0]![1])
+    expect(original).toMatchObject({ decision: 'REJECTED', reason: '需重新核对车牌', attachments: { vehicleFileIds: ['401'], driverPhotoFileIds: ['402'], licenseFileIds: ['403'] } })
+    await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
+    dialog.vm.$emit('confirm'); await flushPromises()
+    expect(vi.mocked(review).mock.calls[1]![1]).toEqual(original)
+    expect(api.updateDispatch).not.toHaveBeenCalled()
   })
   it.each(['CANCEL', 'RETURN_TO_REVIEW', 'SUBMIT_REVIEW'] as const)('preserves the %s confirmation branch and its exact reason or remark', async action => {
     const { dialog } = await render(action)

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

@@ -13,7 +13,7 @@ import * as api from '../api/dispatches'
 import type { CommandResult, DispatchAction, DispatchDetail, Driver, LoadingComplete, LoadingPreview, ReasonCommand, ReviewCommand, UpdateDispatch, Vehicle, VersionCommand } from '../dispatchContracts'
 import type { DispatchRoute, DispatchRouteCommand, DispatchRouteStop } from '../dispatchContracts'
 import { DispatchInputError, requireVersion } from '../dispatchContracts'
-import { canDispatchAction, dispatchActionLabels, dispatchRejectionReason } from '../dispatchPresentation'
+import { canDispatchAction, dispatchActionLabels, dispatchRejectionReason, dispatchReviewAttachmentFields, dispatchReviewEvidence, emptyReviewAttachments } from '../dispatchPresentation'
 import { isDefiniteDispatchRejection, useDispatchCommandRecovery, type PendingDispatchCommand } from '../dispatchCommandRecovery'
 import DispatchResourceFields from './DispatchResourceFields.vue'
 import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
@@ -36,6 +36,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 reviewAttachments = ref(emptyReviewAttachments())
+const reviewEvidence = computed(() => dispatchReviewEvidence(detail.value))
 const form = reactive({ plannedDepartureAt: '', estimatedArrivalAt: '', remark: '', decision: 'APPROVED' as 'APPROVED' | 'REJECTED', reason: '' })
 let generation = 0
 let editorRequestKey = ''
@@ -44,8 +46,8 @@ const cargoEntryMessage = '货物安排统一在智能排车中修改；如有
 const allowed = computed(() => !cargoAction.value && !factsStale.value && !pending.value && canDispatchAction(detail.value?.actions, currentAction.value, access.can) && (currentOperation.value !== 'ROUTE' || route.value?.edit.allowed === true))
 const width = computed(() => ['EDIT', 'LOADING_COMPLETE'].includes(currentAction.value) ? '1120px' : ['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction.value) ? '760px' : '560px')
 const frozen = computed(() => busy.value || Boolean(pending.value))
-const evidenceBusy = reactive({ VEHICLE: false, DRIVER: false })
-const uploadingEvidence = computed(() => evidenceBusy.VEHICLE || evidenceBusy.DRIVER)
+const evidenceBusy = reactive({ VEHICLE: false, DRIVER_PHOTO: false, DRIVER: false })
+const uploadingEvidence = computed(() => Object.values(evidenceBusy).some(Boolean))
 
 async function load() {
   const sequence = ++generation, no = currentNo.value, action = currentAction.value
@@ -59,6 +61,7 @@ async function load() {
     if (sequence !== generation) return
     if (value.dispatchNo !== no) throw new DispatchInputError('排车业务号不一致，请重新打开')
     detail.value = value
+    reviewAttachments.value = emptyReviewAttachments()
     const oldVehicle = value.vehicleInfo.vehicle
     vehicle.value = oldVehicle ? { mode: oldVehicle.mode, vehicleId: oldVehicle.vehicleId, plate: oldVehicle.plate, carrierName: oldVehicle.carrierName, capacity: oldVehicle.capacity ? { ...oldVehicle.capacity } : null, evidenceFileIds: [...oldVehicle.evidenceFileIds] } : blankVehicle()
     driver.value = value.vehicleInfo.driver ? structuredClone(value.vehicleInfo.driver) : blankDriver()
@@ -98,7 +101,7 @@ function payload(): object {
     case 'EDIT': return { ...common, vehicle: vehicle.value, driver: driver.value, plannedDepartureAt: form.plannedDepartureAt || null, estimatedArrivalAt: form.estimatedArrivalAt || null, remark: form.remark || null } satisfies UpdateDispatch
     case 'DISPATCH_REVIEW': case 'LOADING_REVIEW':
       if (form.decision === 'REJECTED' && !form.reason.trim()) throw new DispatchInputError('驳回时必须填写原因')
-      return { ...common, decision: form.decision, reason: form.reason.trim() || null } satisfies ReviewCommand
+      return { ...common, decision: form.decision, reason: form.reason.trim() || null, ...(Object.values(reviewAttachments.value).some(ids => ids.length) ? { attachments: reviewAttachments.value } : {}) } satisfies ReviewCommand
     case 'CANCEL': case 'RETURN_TO_REVIEW':
       if (!form.reason.trim()) throw new DispatchInputError('请填写操作原因')
       return { ...common, reason: form.reason.trim() } satisfies ReasonCommand
@@ -207,9 +210,12 @@ watch([open, () => props.dispatchNo, () => props.action, () => props.operation],
         </template>
         <el-alert v-else-if="currentAction === 'RETURN_TO_REVIEW'" title="仅零真实扫码允许退回装车前，保留原排车号，修改后两级审核重新提交。" type="warning" :closable="false" show-icon />
         <el-alert v-else-if="currentAction === 'CANCEL'" title="确认取消本排车单；服务端将核对真实作业和来源占用，不自动回库。" type="warning" :closable="false" show-icon />
-        <template v-if="currentOperation !== 'ROUTE' && ['EDIT', 'DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)">
-          <DispatchEvidenceFiles v-model="vehicle.evidenceFileIds" :dispatch-no="currentNo" kind="VEHICLE" :readonly="currentAction !== 'EDIT'" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.VEHICLE = $event" />
-          <DispatchEvidenceFiles v-if="driver.evidence" v-model="driver.evidence.fileIds" :dispatch-no="currentNo" kind="DRIVER" :readonly="currentAction !== 'EDIT'" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER = $event" />
+        <template v-if="currentOperation !== 'ROUTE' && currentAction === 'EDIT'">
+          <DispatchEvidenceFiles v-model="vehicle.evidenceFileIds" :dispatch-no="currentNo" kind="VEHICLE" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.VEHICLE = $event" />
+          <DispatchEvidenceFiles v-if="driver.evidence" v-model="driver.evidence.fileIds" :dispatch-no="currentNo" kind="DRIVER" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER = $event" />
+        </template>
+        <template v-else-if="['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)">
+          <DispatchEvidenceFiles v-for="field in dispatchReviewAttachmentFields" :key="field.key" v-model="reviewAttachments[field.key]" :reference-ids="reviewEvidence[field.key]" :dispatch-no="currentNo" :kind="field.kind" :label="field.label" save-hint="上传后提交审核，附件与本次审核结果一起保存。" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy[field.kind] = $event" />
         </template>
         <section v-if="currentOperation === 'ROUTE' || ['CANCEL', 'RETURN_TO_REVIEW', 'DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)" class="density-dialog-section" data-tone="work" aria-label="操作原因与意见"><h3 class="density-dialog-section__title">操作说明</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item :label="currentOperation === 'ROUTE' || form.decision === 'REJECTED' || ['CANCEL', 'RETURN_TO_REVIEW'].includes(currentAction) ? '原因（必填）' : '审核意见（选填）'"><el-input v-model="form.reason" :disabled="frozen || loading || uploadingEvidence || !allowed" type="textarea" :rows="3" /></el-form-item></td></tr></tbody></table></section>
         <section v-else class="density-dialog-section" data-tone="work" aria-label="本次操作备注"><h3 class="density-dialog-section__title">本次备注</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="备注"><el-input v-model="form.remark" aria-label="本次操作备注" :disabled="frozen || loading || uploadingEvidence || !allowed" type="textarea" :rows="3" /></el-form-item></td></tr></tbody></table></section>

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

@@ -135,7 +135,7 @@ describe('smart dispatch three-column cargo board', () => {
     expect(wrapper.emitted('changePage')).toEqual([[2]])
     expect(wrapper.get('[aria-label="托盘明细"]').text()).toContain('请选择左侧订单')
     await wrapper.setProps({ page: 2, candidates: [candidate({ orderNo: 'NEXT-PAGE', palletNo: 'NEXT-PALLET' })] })
-    expect(wrapper.get('[aria-label="待排订单"]').text()).toContain('货物分页，同一订单可能分布在多页')
+    expect(wrapper.get('[aria-label="待排订单"]').text()).not.toContain('货物分页，同一订单可能分布在多页')
     expect(wrapper.get('[aria-label="第 1 辆车"]').text()).toContain('PALLET-1')
     expect(wrapper.findAll('[aria-label="车辆装载"] article')).toHaveLength(2)
   })
@@ -174,7 +174,8 @@ describe('smart dispatch three-column cargo board', () => {
       slots: { vehicles: ({ dragOver, drop }: { dragOver: (event: DragEvent, id: string) => void; drop: (event: DragEvent, id: string) => void }) => h('section', { 'aria-label': '真实本车清单', onDragover: (event: DragEvent) => dragOver(event, 'PC/1'), onDrop: (event: DragEvent) => drop(event, 'PC/1') }, 'PALLET-EXISTING') },
       global: { plugins: [ElementPlus] },
     })
-    expect(wrapper.find('[aria-label="车辆装载"]').exists()).toBe(false)
+    expect(wrapper.find('[aria-label="车辆装载"]').exists()).toBe(true)
+    expect(wrapper.get('[aria-label="车辆装载"]').text()).not.toContain('添加车辆')
     expect(wrapper.text()).toContain('PALLET-EXISTING')
     await select(wrapper)
     const dataTransfer = transfer()

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

@@ -161,7 +161,7 @@ watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeC
 <template>
   <div class="dispatch-cargo-board" aria-label="智能排车三栏选货">
     <section class="cargo-board-panel cargo-board-orders" aria-label="待排订单">
-      <header class="cargo-board-heading"><h3>待排订单</h3><span class="cargo-board-muted">本页 {{ orders.length }} 单</span><InlineHelp title="货物分页说明"><p>货物分页，同一订单可能分布在多页。点击订单查看本页货物关联托盘；关联托数包含必须同车的完整托盘组。</p></InlineHelp></header>
+      <header class="cargo-board-heading"><h3>待排订单</h3><span class="cargo-board-muted">本页 {{ orders.length }} 单</span></header>
       <div class="cargo-board-order-content">
       <div class="cargo-board-table-wrap">
         <table class="density-table cargo-board-table">
@@ -178,7 +178,7 @@ watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeC
           </tbody>
         </table>
       </div>
-      <footer class="cargo-board-pagination"><span class="cargo-board-muted">货物分页，同一订单可能分布在多页</span><el-pagination aria-label="候选货物分页" :current-page="page" :page-size="size" :page-sizes="[10, 20, 50]" :total="total" :disabled="disabled" layout="total, sizes, prev, pager, next" @update:current-page="changePage" @update:page-size="changeSize" /></footer>
+      <footer class="cargo-board-pagination"><el-pagination aria-label="候选货物分页" :current-page="page" :page-size="size" :page-sizes="[10, 20, 50]" :total="total" :disabled="disabled" layout="total, sizes, prev, pager, next" @update:current-page="changePage" @update:page-size="changeSize" /></footer>
       </div>
     </section>
 
@@ -206,7 +206,7 @@ watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeC
     </section>
 
     <section class="cargo-board-panel cargo-board-vehicles" aria-label="车辆装载">
-      <header class="cargo-board-heading"><slot name="vehicle-heading"><h3>装车托盘</h3><InlineHelp title="车辆装载说明"><p>将中间托盘拖入任意车辆，或选中车辆后点击“加入这辆车”。已装货物需先移除才能加入其他车辆。计划托位仅用于新车辆预排，不代表真实载重或容积；体积、重量以装车核对为准。</p></InlineHelp><div class="cargo-board-vehicle-tools"><slot name="vehicle-controls" /><el-button type="primary" :disabled="disabled || !warehouseSelected" @click="emit('addVehicle')">添加车辆</el-button></div></slot></header>
+      <header class="cargo-board-heading"><slot name="vehicle-heading"><template v-if="!slots.vehicles"><h3>装车托盘</h3><InlineHelp title="车辆装载说明"><p>将中间托盘拖入任意车辆，或选中车辆后点击“加入这辆车”。已装货物需先移除才能加入其他车辆。计划托位仅用于新车辆预排，不代表真实载重或容积；体积、重量以装车核对为准。</p></InlineHelp><div class="cargo-board-vehicle-tools"><slot name="vehicle-controls" /><el-button type="primary" :disabled="disabled || !warehouseSelected" @click="emit('addVehicle')">添加车辆</el-button></div></template></slot></header>
       <div class="cargo-board-vehicle-content">
       <slot name="vehicles" :drag-over="dragOver" :drop="drop" :drop-target="dropTarget">
       <div class="cargo-board-vehicle-list">
@@ -230,13 +230,13 @@ watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeC
 </template>
 
 <style scoped>
-.dispatch-cargo-board { display: grid; grid-template-columns: minmax(0, 44fr) minmax(0, 22fr) minmax(0, 34fr); grid-template-rows: auto auto; align-items: start; gap: var(--admin-space-5) var(--admin-space-6); }
-.cargo-board-panel { display: grid; grid-row: 1 / span 2; grid-template-rows: subgrid; min-width: 0; background: var(--admin-surface); }
+.dispatch-cargo-board { display: grid; grid-template-columns: minmax(0, 44fr) minmax(0, 22fr) minmax(0, 34fr); grid-template-rows: auto auto; align-items: stretch; gap: var(--admin-space-5) var(--admin-space-6); }
+.cargo-board-panel { display: grid; grid-row: 1 / span 2; grid-template-rows: subgrid; align-items: start; min-width: 0; background: var(--admin-surface); }
 .cargo-board-orders { grid-column: 1; }
 .cargo-board-pallets { grid-column: 2; }
 .cargo-board-vehicles { grid-column: 3; }
 .cargo-board-order-content, .cargo-board-vehicle-content { min-width: 0; }
-.cargo-board-heading { display: flex; align-items: center; gap: var(--admin-space-3); min-height: var(--admin-control-height); box-sizing: border-box; margin: 0; flex-wrap: wrap; }
+.cargo-board-heading { align-self: stretch; display: flex; align-items: center; gap: var(--admin-space-3); min-height: var(--admin-control-height); box-sizing: border-box; margin: 0; flex-wrap: wrap; }
 .cargo-board-heading h3 { margin: 0; font-size: var(--admin-font-section); }
 .cargo-board-vehicle-tools { display: flex; align-items: center; gap: var(--admin-space-3); margin-left: auto; flex-wrap: wrap; }
 .cargo-board-vehicle-tools > .el-button { margin-left: 0; }
@@ -251,7 +251,7 @@ watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeC
 .cargo-board-table tbody tr { cursor: pointer; }
 .cargo-board-table tr.is-selected td { background: var(--admin-action-primary-hover); }
 .cargo-board-business-no { font-weight: 600; }
-.cargo-board-pagination { display: flex; flex-direction: column; align-items: flex-start; gap: var(--admin-space-3); padding: var(--admin-space-4); overflow-x: auto; }
+.cargo-board-pagination { display: flex; align-items: center; padding-top: var(--admin-space-5); overflow-x: auto; }
 .cargo-board-order-caption { margin-left: auto; max-width: 65%; overflow-wrap: anywhere; color: var(--cc-muted); font-size: var(--admin-font-caption); }
 .cargo-board-order-caption small { display: block; }
 .cargo-board-empty { padding: var(--admin-space-7); color: var(--cc-muted); text-align: center; margin: 0; }
@@ -266,7 +266,6 @@ watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeC
 .cargo-board-group-details summary { cursor: pointer; }
 .cargo-board-group-details ul { margin: var(--admin-space-2) 0; padding-left: var(--admin-space-6); }
 .cargo-board-block { color: var(--admin-action-danger); font-size: var(--admin-font-caption); margin: var(--admin-space-2) 0; }
-.cargo-board-vehicles { min-width: 0; }
 .cargo-board-vehicle-list { display: flex; flex-direction: column; gap: var(--admin-space-5); max-height: 58vh; overflow-y: auto; }
 .cargo-board-vehicle { border: 2px dashed var(--admin-table-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-surface); }
 .cargo-board-vehicle.is-current { border-color: var(--admin-action-primary-border); }

src/modules/overseas-warehouse/components/SmartDispatchDialog.layout.test.ts

@@ -46,14 +46,47 @@ beforeEach(() => {
 async function render() { const wrapper = mount(SmartDispatchDialog, { attachTo: document.body, props: { modelValue: true, orders: [] }, global: { plugins: [ElementPlus] } }); await flushPromises(); return { wrapper, dialog: wrapper.findComponent(AppDialog) } }
 function view(dialog: VueWrapper) { return dialog.getComponent({ name: 'ElDialogContent' }) }
 function field(dialog: VueWrapper, label: string) { return dialog.findAllComponents({ name: 'ElFormItem' }).find(item => item.props('label') === label)! }
-async function selectWarehouse(dialog: VueWrapper) { const select = field(dialog, '起运仓').getComponent({ name: 'ElSelect' }); select.vm.$emit('update:modelValue', '321'); select.vm.$emit('change', '321'); await flushPromises() }
+async function selectWarehouse(dialog: VueWrapper) { const select = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '请选择起运仓')!; select.vm.$emit('update:modelValue', '321'); select.vm.$emit('change', '321'); await flushPromises() }
 async function emptyMode(dialog: VueWrapper) { field(dialog, '建单方式').getComponent({ name: 'ElRadioGroup' }).vm.$emit('update:modelValue', 'empty'); await flushPromises() }
 async function restore(dialog: VueWrapper) { dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '继续待完成排车')!.vm.$emit('change', 'server-token'); await flushPromises() }
 async function selectFirstOrder(dialog: VueWrapper) { await view(dialog).get('[aria-label="待排订单"] tbody tr button').trigger('click'); await flushPromises() }
 describe('new dispatch native layout', () => {
+  it('selects the first warehouse and loads its cargo immediately without creating a draft', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([warehouse, { ...warehouse, id: '654', warehouseName: '纽约仓' }])
+    const { dialog } = await render()
+    const picker = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '请选择起运仓')!
+    expect(picker.props('modelValue')).toBe('321')
+    expect(api.listDispatchCandidates).toHaveBeenCalledWith(expect.objectContaining({ warehouseId: '321', page: 1 }))
+    expect(api.createDispatchDraft).not.toHaveBeenCalled()
+  })
+  it('keeps the warehouse empty and skips cargo loading when no warehouse is available', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([])
+    const { dialog } = await render()
+    expect(api.listDispatchCandidates).not.toHaveBeenCalled()
+    expect(view(dialog).text()).toContain('请先选择起运仓')
+  })
+  it('retains the restored draft warehouse instead of selecting the first warehouse on reopen', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([warehouse, { ...warehouse, id: '654', warehouseName: '纽约仓' }])
+    vi.mocked(api.listDispatchDrafts).mockResolvedValue([{ ...draft(), warehouseId: '654', sources: [], containers: [] }])
+    vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 0, page: 1, size: 20, pages: 0, candidates: [], complete: true, snapshotAt: '' })
+    const { wrapper, dialog } = await render()
+    await restore(dialog)
+    await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
+    expect(api.listDispatchCandidates).toHaveBeenLastCalledWith(expect.objectContaining({ warehouseId: '654' }))
+  })
+
   it('keeps the restored workbench controls together and shows the selected warehouse tab', async () => {
     const { dialog } = await render()
     const content = view(dialog)
+    const searchPanel = content.get('[aria-label="候选货物查询"]')
+    expect(searchPanel.find('.el-form-item__label').exists()).toBe(false)
+    expect(searchPanel.find('[aria-label="起运仓"]').exists()).toBe(true)
+    expect(searchPanel.find('input[placeholder="订单号／入仓码"]').exists()).toBe(true)
+    const settingsToggle = searchPanel.findAll('button').find(button => button.text() === '排车设置')!
+    expect(content.get('[aria-label="排车设置"]').isVisible()).toBe(false)
+    await settingsToggle.trigger('click')
+    expect(settingsToggle.attributes('aria-expanded')).toBe('true')
+    expect(content.get('[aria-label="排车设置"]').isVisible()).toBe(true)
     expect(content.get('[aria-label="排车设置"]').text()).toContain('建单方式')
     expect(content.get('[aria-label="排车设置"]').find('[aria-label="车辆选货安排"]').exists()).toBe(true)
     expect(content.text()).not.toContain('1. 排车设置')

src/modules/overseas-warehouse/components/SmartDispatchDialog.planning.test.ts

@@ -89,7 +89,7 @@ async function selectOrder(dialog: VueWrapper, palletNo: string) {
   await row.get('button').trigger('click'); await flushPromises()
 }
 async function warehouseSelected(dialog: VueWrapper) {
-  const picker = field(dialog, '起运仓').getComponent({ name: 'ElSelect' })
+  const picker = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '请选择起运仓')!
   picker.vm.$emit('update:modelValue', '321'); picker.vm.$emit('change', '321'); await flushPromises()
 }
 async function join(dialog: VueWrapper, palletNo: string) { await selectOrder(dialog, palletNo); await cargoRow(dialog, palletNo).findAll('button').find(row => row.text() === '加入这辆车')!.trigger('click'); await flushPromises() }

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

@@ -94,7 +94,8 @@ it.each([undefined, null, 'bad', 9007199254740992])('requires rereading a restor
     expect(api.convertDispatchDraft).not.toHaveBeenCalled(); expect(wrapper.getComponent({ name: 'ElDialogContent' }).text()).toContain('预约批次版本缺失或无效，请重新读取候选')
   } finally { wrapper.unmount() }
 })
-it('requires an explicit warehouse and allows saving a true empty dispatch with no fake cargo', async () => {
+it('requires a warehouse when the directory is empty and allows saving a true empty dispatch with no fake cargo', async () => {
+  vi.mocked(listAllPlatformWarehouses).mockResolvedValue([])
   const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
   const state = wrapper.vm as unknown as { mode: string; warehouseId: string; submit: () => Promise<void> }
   state.mode = 'empty'; await wrapper.getComponent(AppDialog).vm.$emit('confirm'); await flushPromises(); expect(api.createDispatch).not.toHaveBeenCalled()

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

@@ -117,6 +117,7 @@ async function init() {
     if (!warehouseId.value) {
       const selectedWarehouses = new Set(props.orders.map(row => row.originWarehouseId).filter(Boolean))
       if (selectedWarehouses.size === 1 && directory.some(row => String(row.id) === [...selectedWarehouses][0])) warehouseId.value = [...selectedWarehouses][0]!
+      else if (directory[0]) warehouseId.value = String(directory[0].id)
     }
     if (warehouseId.value) await loadCandidates(sequence)
   } catch (cause) { if (sequence === generation) error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '排车候选或草稿恢复失败，请保留原选择重试') }
@@ -240,15 +241,13 @@ watch(() => props.modelValue, value => { if (value) void init(); else { generati
     </div>
     <SmartDispatchExistingCargo v-if="workspace === 'existing' && modelValue" @saved="emit('created')" @busy="existingBusy = $event" />
     <template v-else-if="workspace === 'create'">
-    <div class="density-dialog-sections">
+    <div class="density-dialog-sections dispatch-workspace">
       <LoadErrorState v-if="error" title="排车未完成" :message="error.message" :loading="loading || saving || recovery.busy.value" @retry="pending || recovery.pending.value ? submit() : init()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <el-alert v-if="pending || recovery.pending.value" role="status" title="原请求结果尚待核对，请勿更改选择、版本或重新建单。" type="warning" :closable="false" show-icon />
       <el-button v-if="pending?.rejected" :disabled="saving || loading" @click="pending = null; persist(); init()">按明确驳回结果重新核对</el-button>
         <section class="density-dialog-section dispatch-search" aria-label="候选货物查询">
           <div class="dispatch-candidate-query">
-            <el-form inline label-position="left" label-width="60px" class="density-form dispatch-origin-field">
-          <el-form-item class="dispatch-warehouse-field" label="起运仓" required><el-select class="dispatch-warehouse-picker" v-model="warehouseId" :disabled="frozen || loading || Boolean(draft)" placeholder="请选择起运仓" @change="changeWarehouse"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :value="String(warehouse.id)" :label="warehouse.warehouseName" /></el-select></el-form-item>
-            </el-form>
+            <el-select class="dispatch-warehouse-picker" aria-label="起运仓" v-model="warehouseId" :disabled="frozen || loading || Boolean(draft)" placeholder="请选择起运仓" @change="changeWarehouse"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :value="String(warehouse.id)" :label="warehouse.warehouseName" /></el-select>
             <template v-if="mode === 'cargo'"><el-input v-model="query.orderNo" :disabled="frozen || loading" placeholder="订单号／入仓码" /><el-input v-model="query.destinationWarehouseCode" :disabled="frozen || loading" placeholder="目的仓码" /><el-select v-model="query.sourceStage" :disabled="frozen || loading" clearable placeholder="全部来源"><el-option label="在途预排（已离港）" value="PLAN" /><el-option label="已收货实物" value="RECEIVED" /><el-option label="待出库换标" value="RELABEL" /></el-select><el-button type="primary" :disabled="frozen || loading || !warehouseId" @click="search">查询</el-button><el-button :disabled="frozen || loading || !warehouseId" @click="resetSearch">重置</el-button></template><el-button :aria-expanded="settingsExpanded" aria-controls="smart-dispatch-settings" @click="settingsExpanded = !settingsExpanded">排车设置</el-button></div>
         </section>
       <section v-show="settingsExpanded" id="smart-dispatch-settings" class="dispatch-context-toolbar" aria-label="排车设置">
@@ -290,10 +289,6 @@ watch(() => props.modelValue, value => { if (value) void init(); else { generati
 .dispatch-context-toolbar { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3) var(--admin-space-6); }
 .dispatch-setup-fields { display: flex; flex-wrap: wrap; align-items: center; gap: var(--admin-space-4) var(--admin-space-6); }
 .dispatch-setup-fields :deep(.el-form-item) { margin: 0; }
-.dispatch-origin-field { width: 260px; }
-.dispatch-origin-field :deep(.el-form-item) { margin: 0; width: 100%; }
-.dispatch-origin-field :deep(.el-form-item__content) { min-width: 0; }
-.dispatch-warehouse-picker { width: 100%; }
 .dispatch-draft-tools { flex-wrap: wrap; align-items: center; }
 .dispatch-draft-picker { width: 240px; }
 .dispatch-capacity-field { display: inline-flex; align-items: center; gap: var(--admin-space-3); margin: 0; }
@@ -301,6 +296,7 @@ watch(() => props.modelValue, value => { if (value) void init(); else { generati
 .dispatch-candidate-query { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); }
 .dispatch-candidate-query > .el-input { width: 180px; }
 .dispatch-candidate-query > .el-select { width: 170px; }
+.dispatch-candidate-query > .dispatch-warehouse-picker { width: 200px; }
 .dispatch-candidate-query > .el-button { margin-left: 0; }
-.dispatch-search { margin-top: var(--admin-space-5); }
+.dispatch-workspace { margin-top: var(--admin-space-5); }
 </style>

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

@@ -35,6 +35,20 @@ beforeEach(() => {
   vi.mocked(api.listDispatchCandidates).mockImplementation(async query => ({ candidates: [candidate()], page: query.page || 1, size: query.size || 20, total: 1, pages: 1, complete: true, snapshotAt: '' }))
 })
 
+it('keeps both searches in one panel and the manifest inside the shared board column', async () => {
+  const wrapper = await open()
+  const search = wrapper.get('[aria-label="已有排车查询"]')
+  expect(search.find('[aria-label="选择已有排车"]').exists()).toBe(true)
+  expect(search.text()).not.toContain('查询排车')
+  expect(search.find('input[aria-label="查找可排货物"]').exists()).toBe(true)
+  expect(search.findAll('.existing-cargo-query > label')).toHaveLength(0)
+  const column = wrapper.get('[aria-label="车辆装载"]')
+  expect(column.get(':scope > .cargo-board-heading').text()).toContain('本车货物 · PC/1')
+  expect(column.find(':scope > .cargo-board-vehicle-content [aria-label="当前排车货物"]').exists()).toBe(true)
+  expect(wrapper.get('.dispatch-cargo-board').findAll(':scope > section > .cargo-board-heading')).toHaveLength(3)
+  expect(column.text()).not.toContain('添加车辆')
+})
+
 it('adds the complete hidden shared-pallet group through real board buttons, then reloads current versions', async () => {
   const [first, second] = sharedPalletCandidates()
   vi.mocked(api.listDispatchCandidates).mockImplementation(async query => ({ candidates: query.size === 100 ? [first!, second!] : [first!], page: query.page!, size: query.size!, total: 2, pages: 1, complete: true, snapshotAt: '' }))
@@ -177,15 +191,17 @@ it('does not let a late previous dispatch read overwrite the selected dispatch',
   const wrapper = await open()
   await wrapper.setProps({ dispatchNo: 'PC/2' }); await flushPromises()
   resolve(current()); await flushPromises()
-  expect(wrapper.get('[aria-label="当前排车货物"]').text()).toContain('PC/2')
-  expect(wrapper.get('[aria-label="当前排车货物"]').text()).not.toContain('PC/1')
+  expect(wrapper.get('[aria-label="车辆装载"] > .cargo-board-heading').text()).toContain('PC/2')
+  expect(wrapper.get('[aria-label="车辆装载"] > .cargo-board-heading').text()).not.toContain('PC/1')
 })
 
 it('queries and paginates active before-loading dispatches using the entered business number', async () => {
   const wrapper = await open(null)
   vi.mocked(api.listDispatches).mockImplementation(async query => ({ ...page([listRow({ taskType: 'DELIVERY' })]), page: query.page, size: query.size, total: 22, pages: 3 }))
-  await wrapper.get('input[aria-label="查找已有排车"]').setValue('PC2026')
-  await button(wrapper, '查询排车').trigger('click'); await flushPromises()
-  await wrapper.get('[aria-label="已有排车分页"] button.btn-next').trigger('click'); await flushPromises()
+  const picker = wrapper.getComponent({ name: 'ElSelect' })
+  expect(picker.props('remote')).toBe(true)
+  await picker.get('.el-select__wrapper').trigger('click'); await flushPromises()
+  await picker.props('remoteMethod')('PC2026'); await flushPromises()
+  await wrapper.getComponent({ name: 'ElPagination' }).get('button.btn-next').trigger('click'); await flushPromises()
   expect(api.listDispatches).toHaveBeenLastCalledWith({ page: 2, size: 10, status: 'ACTIVE', stage: 'BEFORE_LOADING', dispatchNo: 'PC2026' })
 })

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

@@ -24,7 +24,7 @@ const error = ref<ApiErrorDetails | null>(null)
 const candidatePage = useDispatchCandidates(error)
 const { candidates, page: cargoPage, size: cargoSize, total: cargoTotal } = candidatePage
 const rows = ref<DispatchListRow[]>([]), page = ref(1), size = ref(10), total = ref(0)
-const keyword = ref(''), queriedKeyword = ref(''), cargoKeyword = ref(''), queriedCargoKeyword = ref('')
+const queriedKeyword = ref(''), cargoKeyword = ref(''), queriedCargoKeyword = ref('')
 const selectedNo = ref(''), warehouseId = ref(''), warehouseName = ref('')
 const detail = ref<DispatchDetail | null>(null), items = ref<DispatchItems | null>(null)
 const reading = ref(false), listing = ref(false), preparing = ref(false), stale = ref(true)
@@ -54,9 +54,9 @@ async function loadList() {
   } catch (cause) { if (alive && sequence === listGeneration) { rows.value = []; report(cause, '排车列表读取失败') } }
   finally { if (alive && sequence === listGeneration) listing.value = false }
 }
-async function searchDispatches() {
+async function searchDispatches(value: string) {
   if (frozen.value) return
-  queriedKeyword.value = keyword.value.trim(); page.value = 1
+  queriedKeyword.value = value.trim(); page.value = 1
   await loadList()
 }
 async function changePage(value: number) { if (!frozen.value) { page.value = value; await loadList() } }
@@ -205,18 +205,16 @@ onBeforeUnmount(() => { alive = false; generation++; listGeneration++; candidate
     <LoadErrorState v-if="error" title="排车货物资料待核对" :message="error.message" :loading="loading || busy" retry-text="重新核对" @retry="retry"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <section class="density-dialog-section existing-cargo-search" aria-label="已有排车查询">
     <div class="existing-cargo-query">
-      <label for="existing-dispatch-number">排车单号</label>
-      <el-input id="existing-dispatch-number" v-model="keyword" aria-label="查找已有排车" placeholder="排车单号" :disabled="frozen || listing" @keyup.enter="searchDispatches" />
-      <el-button type="primary" :disabled="frozen || listing" @click="searchDispatches">查询排车</el-button>
-      <el-select :model-value="selectedNo" aria-label="选择已有排车" placeholder="选择装车前排车" :disabled="frozen || listing" @update:model-value="(value: string) => selectDispatch(value, rows.find(row => row.dispatchNo === value))">
+      <el-select :model-value="selectedNo" aria-label="选择已有排车" placeholder="输入单号搜索并选择排车" filterable remote :remote-method="searchDispatches" :loading="listing" :disabled="frozen" @update:model-value="(value: string) => selectDispatch(value, rows.find(row => row.dispatchNo === value))">
         <el-option v-for="row in rows" :key="row.dispatchNo" :value="row.dispatchNo" :label="`${row.dispatchNo} · ${row.warehouseName || row.warehouseCode || '—'}`" :disabled="row.taskType !== 'DELIVERY' || row.status !== 'ACTIVE' || row.stage !== 'BEFORE_LOADING'" />
         <el-option v-if="selectedNo && !rows.some(row => row.dispatchNo === selectedNo)" :value="selectedNo" :label="selectedNo" disabled />
+        <template #footer><el-pagination aria-label="已有排车分页" :current-page="page" :page-size="size" :total="total" :disabled="frozen || listing" layout="total, prev, pager, next" @update:current-page="changePage" /></template>
       </el-select>
-      <el-pagination aria-label="已有排车分页" :current-page="page" :page-size="size" :total="total" :disabled="frozen || listing" layout="total, prev, pager, next" @update:current-page="changePage" />
+
+            <template v-if="selectedNo"><el-input id="existing-cargo-keyword" v-model="cargoKeyword" aria-label="查找可排货物" placeholder="订单号／入仓码" :disabled="locked || !canAdd" @keyup.enter="searchCargo" /><el-button type="primary" :disabled="locked || !canAdd" @click="searchCargo">查询货物</el-button><el-button :disabled="locked" @click="selectDispatch(selectedNo)">刷新本车</el-button></template>
     </div>
-      <div v-if="selectedNo" class="existing-cargo-query existing-cargo-filter"><label for="existing-cargo-keyword">货物查询</label><el-input id="existing-cargo-keyword" v-model="cargoKeyword" aria-label="查找可排货物" placeholder="订单号／入仓码" :disabled="locked || !canAdd" @keyup.enter="searchCargo" /><el-button type="primary" :disabled="locked || !canAdd" @click="searchCargo">查询货物</el-button><el-button :disabled="locked" @click="selectDispatch(selectedNo)">刷新本车</el-button></div>
+
     </section>
-    <p v-if="!selectedNo" class="density-dialog-note">选择已有排车后，在这里统一增减本车计划货物。</p>
     <template v-if="selectedNo">
 
       <p v-if="detail && !editable" class="density-dialog-note">仅有效、装车前的仓库派送排车允许调整计划货物。真实拣货仍在 PDA 完成。</p>
@@ -243,9 +241,9 @@ onBeforeUnmount(() => { alive = false; generation++; listGeneration++; candidate
 </template>
 
 <style scoped>
-.existing-cargo-search { display: flex; flex-direction: column; gap: var(--admin-space-5); margin-top: var(--admin-space-5); }
+.existing-cargo { margin-top: var(--admin-space-5); }
+.existing-cargo-search { display: flex; flex-direction: column; gap: var(--admin-space-5); }
 .existing-cargo-query { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); }
-.existing-cargo-query > label { width: 64px; flex: none; color: var(--cc-muted); }
 .existing-cargo-query > .el-button { margin-left: 0; }
 .existing-cargo-query > .el-input { width: 240px; }
 .existing-cargo-query > .el-select { width: 350px; }