优化

src/modules/trucking/components/TruckAppointmentForm.test.ts

@@ -55,7 +55,10 @@ describe('TruckAppointmentForm interaction contract', () => {
     expect(source).toContain('label="关联柜次（可选）"')
     expect(source).toContain('label="关联订舱（可选）"')
     expect(source).toContain("relationWarning.value = '所选关联资源与当前客户不一致")
-    expect(source).not.toContain("status === 'RELEASED'")
+    expect(source).toContain("item.status === 'RELEASED'")
+    expect(source).toContain('已从放舱订舱回填并锁定')
+    expect(source).toContain(':disabled="Boolean(selectedReleasedBooking)"')
+    expect(source).toContain('草稿可暂不填写，派车前必填')
     expect(source).not.toContain('尚未建立装柜计划')
   })
 

src/modules/trucking/components/TruckAppointmentForm.vue

@@ -14,6 +14,7 @@ const emit = defineEmits<{ 'update:modelValue': [SaveTruckAppointmentRequest]; s
 const formRef = ref<FormInstance>()
 const relationWarning = ref('')
 const derivedCustomerSource = ref<'booking' | 'container' | null>(null)
+const billOfLadingFromBooking = ref(false)
 const defaults: Partial<SaveTruckAppointmentRequest> = { expectedVersion: 0, currency: 'RMB', payableAmount: '0.00', receivableAmount: '0.00', packageCount: 0, palletCount: 0, transitMinutes: 0 }
 function normalizeDraft(value: SaveTruckAppointmentRequest): SaveTruckAppointmentRequest { return { ...defaults, ...value, currency: value.currency?.trim().toUpperCase() || 'RMB' } }
 const draft = reactive<SaveTruckAppointmentRequest>(normalizeDraft(props.modelValue))
@@ -52,6 +53,7 @@ const selectableWarehouses = computed(() => warehouses.value.filter((item) => (
 const selectableCarriers = computed(() => carriers.value.filter((item) => (
   item.status === 'ACTIVE'
 )))
+const selectedReleasedBooking = computed(() => bookings.value.find((item) => item.id === draft.oceanBookingId && item.status === 'RELEASED') || null)
 function customerLabel(customer: PlatformTenantResource) { return customer.tenantName }
 function selectCustomer(customerId: string) { const customer = selectableCustomers.value.find((item) => String(item.id) === customerId); draft.customerId = customer?.id ? String(customer.id) : null; draft.customerName = customer ? customerLabel(customer) : null; derivedCustomerSource.value = null; relationWarning.value = '' }
 function selectCarrier(carrierId: string) { const carrier = selectableCarriers.value.find((item) => String(item.id) === carrierId); draft.carrierId = carrier?.id || null; draft.carrierName = carrier?.name || null }
@@ -74,13 +76,24 @@ function selectContainer(containerId: string) {
 }
 function selectBooking(bookingId: string) {
   const item = bookings.value.find((entry) => entry.id === bookingId)
+  const previouslyDerivedBillOfLading = billOfLadingFromBooking.value
   draft.oceanBookingId = item?.id || null
   relationWarning.value = ''
   if (!item) {
+    if (billOfLadingFromBooking.value) draft.billOfLadingNo = null
+    billOfLadingFromBooking.value = false
     if (derivedCustomerSource.value === 'booking') { draft.customerId = null; draft.customerName = null; derivedCustomerSource.value = null }
     return
   }
   applyRelatedCustomer(item.customerId, item.customerName, 'booking')
+  if (item.status === 'RELEASED') {
+    if (draft.billOfLadingNo && draft.billOfLadingNo !== item.billOfLadingNo) relationWarning.value = '已放舱订舱的提单号与当前填写值不一致，已使用订舱冻结快照'
+    draft.billOfLadingNo = item.billOfLadingNo || null
+    billOfLadingFromBooking.value = true
+  } else {
+    if (previouslyDerivedBillOfLading) draft.billOfLadingNo = null
+    billOfLadingFromBooking.value = false
+  }
 }
 async function loadOptions() {
   optionsLoading.value = true; optionsError.value = ''
@@ -118,6 +131,7 @@ watch(() => props.readonly, (readonly) => { if (!readonly && !customers.value.le
       <el-col :xs="24" :sm="12"><el-form-item label="客户" prop="customerId"><el-select :model-value="draft.customerId" filterable clearable placeholder="请选择客户" :loading="optionsLoading" no-data-text="暂无启用的客户" style="width:100%" @update:model-value="selectCustomer(String($event || ''))"><el-option v-if="draft.customerId && !selectableCustomers.some((item) => String(item.id) === String(draft.customerId))" :label="draft.customerName || '历史客户（需重新选择）'" :value="String(draft.customerId)" disabled /><el-option v-for="item in selectableCustomers" :key="String(item.id)" :label="customerLabel(item)" :value="String(item.id)" /></el-select></el-form-item></el-col>
       <el-col :xs="24" :sm="12"><el-form-item label="承运商" prop="carrierId"><el-select :model-value="draft.carrierId" filterable clearable placeholder="请选择承运商" :loading="optionsLoading" no-data-text="暂无可用拖车供应商" style="width:100%" @update:model-value="selectCarrier(String($event || ''))"><el-option v-if="draft.carrierId && !selectableCarriers.some((item) => String(item.id) === String(draft.carrierId))" :label="draft.carrierName || '当前承运商（需重新选择）'" :value="String(draft.carrierId)" disabled /><el-option v-for="item in selectableCarriers" :key="String(item.id)" :label="item.name" :value="String(item.id)" /></el-select></el-form-item></el-col>
       <el-col :xs="24" :sm="12"><el-form-item label="预计装箱时间" prop="plannedLoadingAt"><el-date-picker v-model="draft.plannedLoadingAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计装箱时间" style="width:100%" /></el-form-item></el-col>
+      <el-col :xs="24" :sm="12"><el-form-item label="提单号"><el-input v-model="draft.billOfLadingNo" :disabled="Boolean(selectedReleasedBooking)" maxlength="128" placeholder="草稿可暂不填写，派车前必填" /><div v-if="selectedReleasedBooking" class="field-hint">已从放舱订舱回填并锁定</div></el-form-item></el-col>
       <el-col :xs="24"><el-divider content-position="left">可选关联</el-divider></el-col>
       <el-col :xs="24" :sm="12"><el-form-item label="关联柜次（可选）"><el-select :model-value="draft.containerBookingId" filterable clearable placeholder="可选择柜次辅助补全" :loading="optionsLoading" no-data-text="暂无可关联柜次" style="width:100%" @update:model-value="selectContainer(String($event || ''))"><el-option v-for="item in containers" :key="item.id" :label="`柜次号：${item.cabinetNo || item.bookingNo || '待生成'} / 集装箱号：${item.containerNo || '待录入'}`" :value="item.id" /></el-select></el-form-item></el-col>
       <el-col :xs="24" :sm="12"><el-form-item label="关联订舱（可选）"><el-select :model-value="draft.oceanBookingId" filterable clearable placeholder="可选择订舱辅助补全" :loading="optionsLoading" no-data-text="暂无可关联订舱" style="width:100%" @update:model-value="selectBooking(String($event || ''))"><el-option v-for="item in bookings" :key="item.id" :label="item.bookingNo || '订舱号缺失'" :value="item.id" /></el-select></el-form-item></el-col>
@@ -160,7 +174,8 @@ watch(() => props.readonly, (readonly) => { if (!readonly && !customers.value.le
 .form-actions { display: flex; justify-content: flex-end; gap: 8px; flex-wrap: wrap; }
  :deep(.el-divider) { margin: 18px 0 12px; }
  :deep(.el-divider__text) { color: var(--el-text-color-primary); font-size: 14px; font-weight: 600; }
- :deep(.el-input), :deep(.el-textarea), :deep(.el-date-editor) { max-width: 100%; }
+:deep(.el-input), :deep(.el-textarea), :deep(.el-date-editor) { max-width: 100%; }
+.field-hint { margin-top:4px; color:var(--cc-muted); font-size:12px; }
 @media (max-width: 480px) {
   .truck-form { padding-inline: 2px; }
   .form-actions { position: sticky; bottom: 0; z-index: 2; margin: 8px -2px -4px; padding: 10px 2px; background: var(--el-bg-color); border-top: 1px solid var(--el-border-color-lighter); }

src/modules/trucking/components/TruckAttachmentDialog.test.ts

@@ -13,6 +13,7 @@ describe('TruckAttachmentDialog interaction governance', () => {
   })
 
   it('provides scoped upload and deletion without exposing manual file ids', () => {
+    expect(source).toContain("BILL_OF_LADING: '提单文件'")
     expect(source).not.toContain('referenceTruckAppointmentAttachment')
     expect(source).not.toContain('输入文件服务 ID')
     expect(source).toContain('uploadTruckAppointmentAttachment')

src/modules/trucking/components/TruckAttachmentDialog.vue

@@ -9,7 +9,7 @@ const emit = defineEmits<{ 'update:modelValue': [boolean]; changed: [] }>()
 const busy = ref(false)
 const selectedFile = ref<File | null>(null)
 const selectedType = ref('OTHER')
-const attachmentTypeLabels: Record<string, string> = { DISPATCH_ORDER: '派车单', DRIVER_DOCUMENT: '司机证件', VEHICLE_DOCUMENT: '车辆证件', OTHER: '其他附件' }
+const attachmentTypeLabels: Record<string, string> = { BILL_OF_LADING: '提单文件', DISPATCH_ORDER: '派车单', DRIVER_DOCUMENT: '司机证件', VEHICLE_DOCUMENT: '车辆证件', OTHER: '其他附件' }
 function attachmentTypeLabel(value: string | null | undefined) { return value ? attachmentTypeLabels[value] || '业务附件' : '业务附件' }
 function selectFile(upload: { raw?: File }) { selectedFile.value = upload.raw || null }
 async function upload() { if (!props.appointmentId || !selectedFile.value) return; busy.value = true; try { await uploadTruckAppointmentAttachment(props.appointmentId, selectedFile.value, selectedType.value); selectedFile.value = null; emit('changed'); ElMessage.success('附件上传成功') } catch { ElMessage.error('上传失败') } finally { busy.value = false } }

src/modules/trucking/pages/TruckAppointmentDetailView.test.ts

@@ -17,4 +17,12 @@ describe('TruckAppointmentDetailView status contract', () => {
     expect(source).toContain("customerId: null, carrierId: null, plannedLoadingAt: null")
     expect(source).toContain("error.value = getApiErrorDetails(err, '保存失败，请稍后重试')")
   })
+
+  it('blocks dispatch until a bill number and bill attachment are present', () => {
+    expect(source).toContain("return '确认派车前请先填写提单号'")
+    expect(source).toContain("item.attachmentType === 'BILL_OF_LADING'")
+    expect(source).toContain("return '确认派车前请上传“提单文件”附件'")
+    expect(source).toContain("status === 'DISPATCHED' && dispatchBlockReason.value")
+    expect(source).toContain('attachmentOpen.value = true')
+  })
 })

src/modules/trucking/pages/TruckAppointmentDetailView.vue

@@ -29,7 +29,17 @@ const availableTargets = computed<TruckAppointmentStatus[]>(() => {
   return targets
     .filter((status, index, statuses) => status !== resource.value?.status && statuses.indexOf(status) === index)
 })
-async function changeStatus(status: TruckAppointmentStatus) { if (!resource.value || status === resource.value.status) return; try { await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`, '状态变更确认', { type: 'warning' }); statusSaving.value = true; if (status === 'RESCHEDULED') { await rescheduleTruckAppointment(id.value, form.plannedLoadingAt || '', form.expectedVersion || 0, '后台改约') } else { const action = actionByTarget[status]; if (!action) throw new Error('当前状态没有可用动作'); await performTruckAppointmentAction(id.value, action, form.expectedVersion || 0) } ElMessage.success('状态已更新'); await load() } catch (err) { if (err !== 'cancel' && !(err instanceof Error && err.message === 'cancel')) error.value = getApiErrorDetails(err, '状态更新失败，请稍后重试') } finally { statusSaving.value = false } }
+const dispatchBlockReason = computed(() => {
+  if (!resource.value || !['PENDING_DISPATCH', 'RESCHEDULED'].includes(resource.value.status)) return ''
+  if (!form.billOfLadingNo?.trim()) return '确认派车前请先填写提单号'
+  if (!(resource.value.attachments || []).some((item) => item.attachmentType === 'BILL_OF_LADING')) return '确认派车前请上传“提单文件”附件'
+  return ''
+})
+async function changeStatus(status: TruckAppointmentStatus) {
+  if (!resource.value || status === resource.value.status) return
+  if (status === 'DISPATCHED' && dispatchBlockReason.value) { error.value = { message: dispatchBlockReason.value }; if (!form.billOfLadingNo?.trim()) return; attachmentOpen.value = true; return }
+  try { await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`, '状态变更确认', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }); statusSaving.value = true; if (status === 'RESCHEDULED') { await rescheduleTruckAppointment(id.value, form.plannedLoadingAt || '', form.expectedVersion || 0, '后台改约') } else { const action = actionByTarget[status]; if (!action) throw new Error('当前状态没有可用动作'); await performTruckAppointmentAction(id.value, action, form.expectedVersion || 0) } ElMessage.success('状态已更新'); await load() } catch (err) { if (err !== 'cancel' && !(err instanceof Error && err.message === 'cancel')) error.value = getApiErrorDetails(err, '状态更新失败，请稍后重试') } finally { statusSaving.value = false }
+}
 onMounted(load)
 </script>
 <template>
@@ -43,7 +53,7 @@ onMounted(load)
       </template>
       <LoadErrorState v-if="error && !resource" title="详情加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <template v-else-if="resource">
-        <section class="surface-panel status-panel"><div class="status-bar"><span>当前状态：<strong>{{ truckAppointmentStatusLabel(resource.status) }}</strong></span><div v-if="canChangeStatus" class="status-actions"><el-button v-for="status in availableTargets" :key="status" :type="status === 'CANCELLED' ? 'danger' : status === 'EXCEPTION' ? 'warning' : 'primary'" plain :loading="statusSaving" @click="changeStatus(status)">{{ truckAppointmentStatusLabels[status] }}</el-button></div></div><ApiErrorMeta v-if="error" :details="error" /></section>
+        <section class="surface-panel status-panel"><div class="status-bar"><span>当前状态：<strong>{{ truckAppointmentStatusLabel(resource.status) }}</strong></span><div v-if="canChangeStatus" class="status-actions"><el-button v-for="status in availableTargets" :key="status" :type="status === 'CANCELLED' ? 'danger' : status === 'EXCEPTION' ? 'warning' : 'primary'" plain :loading="statusSaving" @click="changeStatus(status)">{{ truckAppointmentStatusLabels[status] }}</el-button></div></div><el-alert v-if="dispatchBlockReason" :title="dispatchBlockReason" type="warning" :closable="false" show-icon /><ApiErrorMeta v-if="error" :details="error" /></section>
         <section class="surface-panel form-panel"><TruckAppointmentForm v-model="form" :resource="resource" :readonly="!canEdit" :submitting="saving" @submit="submit" @attachments="attachmentOpen = true" /></section>
         <section class="surface-panel history-section"><h3>状态历史</h3><el-empty v-if="!history.length" description="暂无状态历史" :image-size="48" /><ol v-else><li v-for="(item, index) in history" :key="item.id || `${item.createdAt}-${index}`"><strong>{{ truckAppointmentActionLabel(item.action) }}</strong><span>{{ truckAppointmentStatusLabel(item.fromStatus) }} → {{ truckAppointmentStatusLabel(item.toStatus) }}</span><small>{{ item.operatorName || item.operatorId || '系统' }} · {{ item.createdAt || item.occurredAt || '—' }}<template v-if="item.reason"> · {{ item.reason }}</template></small></li></ol></section>
         <TruckAttachmentDialog v-model="attachmentOpen" :appointment-id="id" :attachments="resource.attachments || []" :can-manage="canManageAttachments" @changed="loadRelated" />

src/modules/trucking/types.ts

@@ -100,6 +100,7 @@ export interface TruckAppointmentResource {
   bookingAgentName?: string | null
   carrierId?: string | null
   carrierName?: string | null
+  billOfLadingNo?: string | null
   fleetContact?: string | null
   fleetPhone?: string | null
   driverName?: string | null
@@ -146,6 +147,7 @@ export interface SaveTruckAppointmentRequest {
   customerName?: string | null
   carrierId: string | null
   carrierName?: string | null
+  billOfLadingNo?: string | null
   fleetContact?: string | null
   fleetPhone?: string | null
   driverName?: string | null