优化

src/modules/container-loading/api/platformContainerLoading.test.ts

@@ -45,7 +45,7 @@ describe('platform container loading API', () => {
   it('uses full-edit and transport whitelist request shapes', async () => {
     vi.mocked(http.put).mockResolvedValue({ code: '200', data: container })
     vi.mocked(http.patch).mockResolvedValue({ code: '200', data: container })
-    const data = { cabinetNo: 'CB-1', warehouseId: '8', warehouseName: '义乌仓', containerType: '40HC', containerNo: null, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: null, destinationPortCode: null, destinationPortName: null, destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }
+    const data = { warehouseId: '8', warehouseName: '义乌仓', containerType: '40HC', containerNo: null, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: null, destinationPortCode: null, destinationPortName: null, destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }
     await updateContainer('7', 2, data)
     await updateContainerTransport('7', 3, { containerNo: 'MSCU1', voyageNo: 'V8' })
     expect(http.put).toHaveBeenCalledWith('/platform/v1/containers/7', { version: 2, data })

src/modules/container-loading/pages/ContainersView.test.ts

@@ -255,6 +255,9 @@ describe('ContainersView', () => {
     expect(source).toContain('CONTAINER_SPECIFICATIONS')
     expect(source).toContain('selectSimulationContainerType')
     expect(source).toContain('服务端会生成稳定的柜次号')
+    expect(source).toContain(':model-value="form.cabinetNo" disabled placeholder="系统生成"')
+    expect(source).not.toContain('v-model="form.cabinetNo"')
+    expect(source).not.toContain('cabinetNo: form.cabinetNo.trim()')
     expect(source).not.toContain('openCreate')
     expect(source).not.toContain("['20GP','40GP','40HQ','45HQ']")
     expect(source).not.toContain('v-model="form.capacityCbm"')

src/modules/container-loading/pages/ContainersView.vue

@@ -24,7 +24,7 @@ import { cancelContainerException, completeContainerClearance, createContainerSi
 import type { ContainerBookingResource, ContainerDocumentStatus, ContainerDocumentType, ContainerOverview, ContainerOverviewDocument, ContainerPdaPhoto, ContainerPlanStatus, ContainerSaveRequest, ContainerSimulationCreateRequest } from '../types'
 
 type Filters = QueryModel & { customerId: string; keyword: string; containerType: string; status: ContainerPlanStatus | ''; sailingRange: string[] }
-type ContainerForm = ContainerSaveRequest & { id: string; version: number }
+type ContainerForm = ContainerSaveRequest & Pick<ContainerBookingResource, 'cabinetNo'> & { id: string; version: number }
 
 const router = useRouter()
 const access = useAccessPreviewStore()
@@ -108,7 +108,6 @@ function emptyForm(): ContainerForm {
 }
 const form = reactive<ContainerForm>(emptyForm())
 const rules: FormRules<ContainerForm> = {
-  cabinetNo: [{ required: true, message: '请输入柜次号', trigger: 'blur' }],
   warehouseId: [{ required: true, message: '请选择装柜仓库', trigger: 'change' }],
   containerType: [{ required: true, message: '请选择柜型', trigger: 'change' }],
   terminalTruckingCompany: [{ validator: (_rule, value, callback) => callback(!value || selectedTruckingSupplierId.value ? undefined : new Error('请选择有效的合作中拖车供应商')), trigger: 'change' }],
@@ -211,7 +210,7 @@ function replaceForm(source: ContainerBookingResource | null) {
 function payload(): ContainerSaveRequest {
   const selectedWarehouse = warehouses.value.find((warehouse) => String(warehouse.id) === form.warehouseId)
   return {
-    containerNo: optional(form.containerNo), cabinetNo: form.cabinetNo.trim(),
+    containerNo: optional(form.containerNo),
     warehouseId: form.warehouseId,
     warehouseName: selectedWarehouse?.warehouseName || optional(form.warehouseName),
     billOfLadingNo: optional(form.billOfLadingNo), vesselName: optional(form.vesselName), voyageNo: optional(form.voyageNo),
@@ -629,7 +628,7 @@ onMounted(() => { void Promise.all([loadCustomers(), loadWarehouses(), loadBusin
       <el-alert v-if="businessOptionsError && !transportOnly" type="warning" :closable="false" show-icon :title="businessOptionsError"><el-button link type="warning" :loading="businessOptionsLoading" @click="loadBusinessOptions">重新加载业务选项</el-button></el-alert>
       <el-form v-if="!warehouseError || transportOnly" ref="formRef" :model="form" :rules="rules" label-position="top" class="form-grid">
         <el-form-item label="集装箱号"><el-input v-model="form.containerNo" maxlength="64" placeholder="请输入集装箱号，开始装柜前必填" /></el-form-item>
-        <el-form-item label="柜次号" prop="cabinetNo"><el-input v-model="form.cabinetNo" maxlength="64" placeholder="请输入柜次号" :disabled="transportOnly" /></el-form-item>
+        <el-form-item label="柜次号"><el-input :model-value="form.cabinetNo" disabled placeholder="系统生成" /></el-form-item>
         <el-form-item label="装柜仓库" prop="warehouseId"><el-select v-model="form.warehouseId" filterable placeholder="请选择装柜仓库" :loading="warehouseLoading" loading-text="仓库加载中" no-data-text="暂无可用国内仓库" :disabled="transportOnly"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`" :value="String(warehouse.id)" /></el-select></el-form-item>
         <el-form-item label="提单号"><el-input v-model="form.billOfLadingNo" maxlength="128" placeholder="请输入提单号（可选）" :disabled="transportOnly" /></el-form-item>
         <el-form-item label="船名"><el-input v-model="form.vesselName" maxlength="128" placeholder="请输入船名" :disabled="transportOnly" /></el-form-item>

src/modules/container-loading/types.ts

@@ -184,7 +184,6 @@ export interface ContainerQuery {
 
 export interface ContainerSaveRequest {
   containerNo: string | null
-  cabinetNo: string
   warehouseId: string
   warehouseName: string | null
   billOfLadingNo: string | null