优化

src/modules/cross-border/components/BusinessOrdersView.vue

@@ -70,7 +70,7 @@ function transportColumns(looseboard: boolean): ColumnDefinition[] {
       { key: 'pickupAt', label: pickupLabel, width: 165 }, { key: 'deliveryAt', label: deliveryLabel, width: 165 },
     ]),
     { key: 'status', label: '状态', width: 130 },
-    ...(!looseboard ? [{ key: 'failureReason', label: '失败 / 拒绝原因', width: 240 }] : []),
+    { key: 'failureReason', label: looseboard ? '处理失败原因' : '失败 / 拒绝原因', width: 240 },
     ...(looseboard
       ? [{ key: 'fleetArrangement', label: '承运安排', width: 190 }]
       : [{ key: 'createdAt', label: '创建时间', width: 180 }]),
@@ -90,6 +90,18 @@ const formRef = ref<FormInstance>()
 const query = reactive({ page: 1, size: 20, orderNo: '', routeKeyword: '', status: '' })
 const total = ref(0)
 
+const looseboardStatusLabels: Record<string, string> = {
+  FUNDING_PENDING: '订单受理中',
+  FUNDING_FAILED: '订单处理失败',
+  PENDING_ACCEPTANCE: '待审核',
+  PENDING_DISPATCH: '待排车',
+  DISPATCHED: '待取货',
+  PICKING_UP: '取货中',
+  IN_TRANSIT: '派送中',
+  COMPLETED: '已完成',
+  CANCELLED: '已取消',
+}
+
 const queryModel = computed<QueryModel>({
   get: () => ({
     orderNo: query.orderNo,
@@ -120,19 +132,7 @@ const queryFields = computed<QueryField[]>(() => [
       { label: '已完成', value: 'COMPLETED' },
       { label: '已拒绝', value: 'REJECTED' },
       { label: '已取消', value: 'CANCELLED' },
-    ] : [
-      { label: '订单受理中', value: 'FUNDING_PENDING' },
-      { label: '订单处理失败', value: 'FUNDING_FAILED' },
-      { label: '待审核', value: 'PENDING_REVIEW' },
-      { label: '已通过', value: 'APPROVED' },
-      { label: '已拒绝', value: 'REJECTED' },
-      { label: '待接单', value: 'PENDING_ACCEPTANCE' },
-      ...Object.entries(poolOrderStatusLabels).filter(([value]) => !['IN_TRANSIT', 'COMPLETED', 'CANCELLED'].includes(value)).map(([value, label]) => ({ value, label })),
-      { label: '处理中', value: 'PROCESSING' },
-      { label: '派送中', value: 'IN_TRANSIT' },
-      { label: '已完成', value: 'COMPLETED' },
-      { label: '已取消', value: 'CANCELLED' },
-    ],
+    ] : Object.entries(looseboardStatusLabels).map(([value, label]) => ({ value, label })),
   },
 ])
 
@@ -200,11 +200,12 @@ function vehicleTypeLabel(value: unknown) { return ({ PALLET_15: '15拖', PALLET
 function localMinute(value: unknown) { return value ? String(value).replace('T', ' ').slice(0, 16) : '—' }
 function transportTypeLabel(value: unknown) { return ({ PORT_PICKUP: '港口提柜', WAREHOUSE_TO_WAREHOUSE: '仓到仓', WAREHOUSE_TO_DOOR: '仓到门' } as Record<string, string>)[String(value)] || text(value) }
 function statusLabel(value: unknown) {
+  if (props.kind === 'looseboard') return looseboardStatusLabels[String(value)] || text(value)
   if (poolOrderStatusLabels[String(value)]) return poolOrderStatusLabels[String(value)]
   return ({ FUNDING_PENDING: '订单受理中', FUNDING_FAILED: '订单处理失败', PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_ACCEPTANCE: '待接单', PROCESSING: '处理中', IN_TRANSIT: '派送中', COMPLETED: '已完成', CANCELLED: '已取消' } as Record<string, string>)[String(value)] || text(value)
 }
 function statusTone(value: unknown) {
-  return ({ APPROVED: 'success', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info', FUNDING_PENDING: 'warning', FUNDING_FAILED: 'danger', PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', PROCESSING: 'primary', IN_TRANSIT: 'primary' } as Record<string, 'success' | 'warning' | 'danger' | 'info' | 'primary'>)[String(value)] || 'info'
+  return ({ APPROVED: 'success', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info', FUNDING_PENDING: 'warning', FUNDING_FAILED: 'danger', PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', PENDING_DISPATCH: 'warning', DISPATCHED: 'primary', PICKING_UP: 'primary', PROCESSING: 'primary', IN_TRANSIT: 'primary' } as Record<string, 'success' | 'warning' | 'danger' | 'info' | 'primary'>)[String(value)] || 'info'
 }
 function displayCell(candidate: unknown, key: string) {
   const row = candidate as BusinessRow
@@ -340,7 +341,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
           <template v-if="error" #error><div class="business-load-error" role="alert"><span>{{ error }}</span><el-button size="small" @click="load">重新加载</el-button></div></template>
           <template #orderNo="{ row }"><button class="business-order-link" type="button" @click="openDetail(row)">{{ (row as BusinessRow).orderNo }}</button></template>
           <template #status="{ row }"><el-tag :type="statusTone((row as BusinessRow).status)" effect="light" size="small">{{ statusLabel((row as BusinessRow).status) }}</el-tag></template>
-          <template #failureReason="{ row }"><OrderFundingStatus v-if="['FUNDING_FAILED', 'REJECTED'].includes((row as BusinessRow).status)" kind="trucking" :order-no="(row as BusinessRow).orderNo" :status="(row as BusinessRow).status" :can-retry="false" compact /><span v-else>—</span></template>
+          <template #failureReason="{ row }"><OrderFundingStatus v-if="(row as BusinessRow).status === 'FUNDING_FAILED' || (kind === 'trucking' && (row as BusinessRow).status === 'REJECTED')" :kind="kind" :order-no="(row as BusinessRow).orderNo" :status="(row as BusinessRow).status" :can-retry="false" compact /><span v-else>—</span></template>
           <template #fleetArrangement="{ row }"><template v-if="(row as TransportSummary).fleetArrangement"><div>{{ poolOrderStatusLabels[(row as TransportSummary).fleetArrangement!.fulfillmentStage] || '待核对履约进度' }}</div><small>{{ dateTime((row as TransportSummary).fleetArrangement!.plannedDepartureAt) }}</small></template><span v-else>—</span></template>
         </DataTable>
       </div>
@@ -351,7 +352,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
         <div class="business-detail-heading-main"><el-button link type="primary" @click="returnToList">← 返回列表</el-button><div><h2>{{ detail?.summary.orderNo || '订单详情' }}</h2></div></div>
         <div class="business-detail-heading-actions"><el-button v-if="canCancelTruck" type="danger" :loading="submitting" :disabled="loading" @click="cancelTruck">取消订单</el-button><el-tag :type="statusTone(detail?.summary.status)" effect="light">{{ detailStatus }}</el-tag><el-button :disabled="loading" @click="loadDetail">刷新</el-button></div>
       </header>
-      <OrderFundingStatus v-if="kind === 'trucking' && detail" kind="trucking" :order-no="detail.summary.orderNo" :status="detail.summary.status" :can-retry="canCreate" @changed="loadDetail" />
+      <OrderFundingStatus v-if="detail" :kind="kind" :order-no="detail.summary.orderNo" :status="detail.summary.status" :can-retry="canCreate" @changed="loadDetail" />
       <div v-if="error" class="business-detail-error" role="alert"><strong>{{ error }}</strong><el-button size="small" @click="loadDetail">重新加载</el-button></div>
       <section v-else class="business-detail-section">
         <h3>订单信息</h3>

src/modules/cross-border/components/OrderFundingStatus.vue

@@ -3,7 +3,7 @@ import { onActivated, onBeforeUnmount, onDeactivated, ref, watch } from 'vue'
 import { readOrderFunding, retryOrderFunding } from '../api/orderBudgets'
 import { getBusinessOrder, type TransportDetail } from '../api/businessOrders'
 
-const props = defineProps<{ kind: 'procurement' | 'trucking'; orderNo: string; status: string; canRetry: boolean; compact?: boolean }>()
+const props = defineProps<{ kind: 'procurement' | 'trucking' | 'looseboard'; orderNo: string; status: string; canRetry: boolean; compact?: boolean }>()
 const emit = defineEmits<{ changed: [] }>()
 const message = ref(''), busy = ref(false)
 let generation = 0, timer: ReturnType<typeof setTimeout> | undefined