优化

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

@@ -3,7 +3,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, type FormInstance } from 'element-plus'
 import TransportDemandForm from './TransportDemandForm.vue'
-import { requireOrderBudget } from '../api/orderBudgets'
+import OrderFundingStatus from './OrderFundingStatus.vue'
 import { createTransportDemandForm, transportDemandError, buildTransportDemand, type TransportDemandForm as DemandFormModel } from '../transportDemandForm'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
@@ -67,6 +67,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: 'fleetArrangement', label: '承运安排', width: 190 },
   ]
 }
@@ -105,6 +106,8 @@ const queryFields = computed<QueryField[]>(() => [
     type: 'select',
     placeholder: '全部',
     options: [
+      { label: '订单受理中', value: 'FUNDING_PENDING' },
+      { label: '订单处理失败', value: 'FUNDING_FAILED' },
       { label: '待审核', value: 'PENDING_REVIEW' },
       { label: '已通过', value: 'APPROVED' },
       { label: '已拒绝', value: 'REJECTED' },
@@ -144,7 +147,7 @@ const tableColumns = computed<DataTableColumn[]>(() => [
   ...configuration.value.columns.map((column) => ({
     ...column,
     prop: column.key,
-    slotName: ['orderNo', 'status', 'fleetArrangement'].includes(column.key) ? column.key : undefined,
+    slotName: ['orderNo', 'status', 'failureReason', 'fleetArrangement'].includes(column.key) ? column.key : undefined,
     formatter: (row: object) => displayCell(row, column.key),
   })),
 ])
@@ -164,10 +167,10 @@ function localMinute(value: unknown) { return value ? String(value).replace('T',
 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 (poolOrderStatusLabels[String(value)]) return poolOrderStatusLabels[String(value)]
-  return ({ PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_ACCEPTANCE: '待接单', PROCESSING: '处理中', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消' } as Record<string, string>)[String(value)] || text(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', 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', 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
@@ -264,15 +267,17 @@ async function submit() {
   try {
     if (props.kind === 'trucking') {
       const payload = { ...buildTransportDemand('truck', form), idempotencyKey: stableSubmitKey }
-      await requireOrderBudget('trucking', stableSubmitKey, payload.budgetAmount!, payload.currency)
       await createTransport('trucking', payload)
     }
     else await createTransport('looseboard', { ...buildTransportDemand('looseboard', form), idempotencyKey: stableSubmitKey })
-    ElMessage.success('订单提交成功')
+    ElMessage.success(props.kind === 'trucking' ? '本土卡订单已受理，资金校验完成后进入平台审核' : '订单提交成功')
     resetForm()
     if (props.createPage) await router.push({ name: listRouteName.value })
     else { mode.value = 'list'; await load() }
-  } catch (cause) { if (/已释放|已过期/.test(errorMessage(cause))) submitKey.value = ''; ElMessage.error(errorMessage(cause)) }
+  } catch (cause) {
+    if (/已释放|已过期/.test(errorMessage(cause))) submitKey.value = ''
+    ElMessage.error(errorMessage(cause))
+  }
   finally { submitting.value = false }
 }
 
@@ -298,6 +303,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 #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>
@@ -308,6 +314,8 @@ 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>
         <el-tag :type="statusTone(detail?.summary.status)" effect="light">{{ detailStatus }}</el-tag>
       </header>
+      <el-button :disabled="loading" @click="loadDetail">刷新</el-button>
+      <OrderFundingStatus v-if="kind === 'trucking' && detail" kind="trucking" :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

@@ -0,0 +1,66 @@
+<script setup lang="ts">
+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 emit = defineEmits<{ changed: [] }>()
+const message = ref(''), busy = ref(false)
+let generation = 0, timer: ReturnType<typeof setTimeout> | undefined
+let active = true
+
+// 自动核对订单受理中状态；离开详情或切换订单时丢弃旧响应。
+watch(() => [props.kind, props.orderNo, props.status], () => {
+  generation++; clearTimeout(timer); message.value = ''; busy.value = false
+  if (active && (['FUNDING_PENDING', 'FUNDING_FAILED'].includes(props.status) || (props.kind === 'trucking' && props.status === 'REJECTED'))) void check(generation, 0)
+}, { immediate: true })
+
+async function check(sequence: number, count: number) {
+  try {
+    // 卡车审核拒绝原因来自审核历史，不使用客户填写的订单备注。
+    if (props.kind === 'trucking' && props.status === 'REJECTED') {
+      const detail = await getBusinessOrder<TransportDetail>('trucking', props.orderNo)
+      if (sequence !== generation) return
+      const rejection = [...(detail.histories || [])].reverse().find(item => item.operationType === 'REVIEW' && item.toStatus === 'REJECTED')
+      message.value = rejection?.remark?.trim() || '未填写拒绝原因'
+      return
+    }
+    const result = await readOrderFunding(props.kind, props.orderNo)
+    if (sequence !== generation) return
+    message.value = result.status === 'FREEZE_PENDING' ? '订单受理中，处理完成后将自动进入待审核。' : result.message || (result.status === 'FAILED' ? '订单处理失败，请联系平台核对原因' : '')
+    if (result.status === 'FROZEN' || (result.status === 'FAILED' && props.status === 'FUNDING_PENDING') || (result.status === 'FREEZE_PENDING' && props.status === 'FUNDING_FAILED')) emit('changed')
+    else if (result.status === 'FREEZE_PENDING' && count < 30) timer = setTimeout(() => void check(sequence, count + 1), 2000)
+  } catch (cause) {
+    if (sequence === generation) message.value = cause instanceof Error ? cause.message : '处理原因读取失败，请刷新重试'
+  }
+}
+
+async function retry() {
+  if (!active || busy.value || !props.canRetry || props.status !== 'FUNDING_FAILED') return
+  const sequence = generation; busy.value = true
+  try {
+    await retryOrderFunding(props.kind, props.orderNo)
+    if (sequence === generation) emit('changed')
+  } catch (cause) {
+    if (sequence === generation) message.value = cause instanceof Error ? cause.message : '重试未完成，请稍后再试'
+  } finally { if (sequence === generation) busy.value = false }
+}
+function stop() { active = false; generation++; clearTimeout(timer) }
+onDeactivated(stop)
+onBeforeUnmount(stop)
+onActivated(() => {
+  if (active) return
+  active = true; busy.value = false
+  if (['FUNDING_PENDING', 'FUNDING_FAILED'].includes(props.status) || (props.kind === 'trucking' && props.status === 'REJECTED')) void check(++generation, 0)
+})
+</script>
+
+<template>
+  <div v-if="['FUNDING_PENDING', 'FUNDING_FAILED'].includes(status) || (kind === 'trucking' && status === 'REJECTED')" role="status" aria-live="polite">
+    <span v-if="compact">{{ message || '正在读取处理失败原因…' }}</span>
+    <template v-else>
+      <el-alert :type="status === 'FUNDING_PENDING' ? 'info' : 'error'" :closable="false" :title="status === 'REJECTED' ? '订单已拒绝' : status === 'FUNDING_FAILED' ? '订单处理失败' : '订单受理中'" :description="message" />
+      <el-button v-if="status === 'FUNDING_FAILED' && canRetry" :loading="busy" @click="retry">重新处理订单</el-button>
+    </template>
+  </div>
+</template>

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

@@ -70,7 +70,7 @@ defineExpose({
       </div>
     </section>
     <footer class="transport-demand-actions">
-      <el-button :disabled="submitting" @click="emit('cancel')">{{ isCreate ? '返回列表' : '取消' }}</el-button>
+      <el-button v-if="!isCreate" :disabled="submitting" @click="emit('cancel')">取消</el-button>
       <el-button v-if="canSubmit" type="primary" :loading="submitting" :disabled="disabled" @click="emit('submit')">{{ editing ? '保存修改' : '提交订单' }}</el-button>
     </footer>
   </el-form>