Merge branch 'dev' of http://git.buggoglobal.com/html/admin-web into release/test

src/modules/container-loading/components/ContainerCustomsPanel.vue

@@ -23,7 +23,7 @@ const props = defineProps<{
   loadingPlanId: string
   canList: boolean
   canManage: boolean
-  departureState: 'DEPARTED' | 'WAITING_OTHER_GATES'
+  departureState: 'DEPARTED' | 'WAITING_OTHER_GATES' | 'UNKNOWN'
 }>()
 const emit = defineEmits<{ refreshed: [] }>()
 
@@ -185,7 +185,7 @@ onMounted(load)
         </tbody></table>
       </div>
       </template>
-      <div v-if="customs.status === 'COMPLETED'" class="departure-state"><strong>国内离仓状态：</strong><el-tag :type="departureState === 'DEPARTED' ? 'success' : 'warning'">{{ departureState === 'DEPARTED' ? '已自动离仓' : '报关已完成，待其他离仓条件' }}</el-tag></div>
+      <div v-if="customs.status === 'COMPLETED'" class="departure-state"><strong>国内离仓状态：</strong><el-tag :type="departureState === 'DEPARTED' ? 'success' : 'warning'">{{ departureState === 'DEPARTED' ? '已自动离仓' : departureState === 'UNKNOWN' ? '离仓状态尚未读取' : '报关已完成，待其他离仓条件' }}</el-tag></div>
     </template>
     <el-empty v-else-if="canList" description="当前装柜计划尚未完成，完成装柜后可处理报关" :image-size="56" />
   </section>

src/modules/container-loading/components/OceanBookingLinkDialog.vue

@@ -50,7 +50,7 @@ async function loadCandidates() {
       key: `${candidate.oceanBookingId}:${candidate.requirementId}`,
       oceanBookingId: candidate.oceanBookingId,
       requirementId: candidate.requirementId,
-      label: `${candidate.bookingNo} · ${candidate.containerType} × ${candidate.remainingQuantity} · ${candidate.customerName} · ${candidate.warehouseName} · ${candidate.channelName}`,
+      label: `${candidate.bookingNo} · ${candidate.containerType} × ${candidate.remainingQuantity} · ${candidate.customerName?.trim() || '未关联客户'} · ${candidate.warehouseName} · ${candidate.channelName}`,
     }))
   } catch (cause) {
     if (sequence === requestSequence) error.value = getApiErrorDetails(cause, '已放舱订舱候选加载失败')