release: merge latest TEST client into main

Dockerfile

@@ -6,6 +6,9 @@ FROM ${NODE_IMAGE} AS build
 
 WORKDIR /app
 
+# 为类型检查和打包留出原生内存余量，容器总内存由构建入口限制为 3GiB。
+ENV NODE_OPTIONS=--max-old-space-size=2048
+
 # Corepack 与 pnpm 依赖均通过 npmmirror 下载，避免构建时访问 npm 官方源过慢。
 ENV COREPACK_NPM_REGISTRY=https://registry.npmmirror.com
 ENV NPM_CONFIG_REGISTRY=https://registry.npmmirror.com

Jenkinsfile

@@ -3,6 +3,7 @@ pipeline {
   options {
     timestamps()
     disableConcurrentBuilds()
+    timeout(time: 20, unit: 'MINUTES')
   }
   stages {
     stage('检查测试发布参数') {
@@ -27,8 +28,12 @@ pipeline {
       when { expression { !env.JOB_BASE_NAME?.endsWith('-prod') } }
       steps {
         sh '''set -eu
-          docker compose -f docker-compose.test.yml build --pull=false
-          docker compose -f docker-compose.test.yml up -d --wait --wait-timeout 120
+          sh scripts/build-image.sh --pull=false \
+            --build-arg NODE_IMAGE="${NODE_BASE_IMAGE:-node:22-alpine}" \
+            --build-arg NGINX_IMAGE="${NGINX_BASE_IMAGE:-nginx:1.27-alpine}" \
+            --build-arg VITE_ADMIN_WEB_ORIGIN="$VITE_ADMIN_WEB_ORIGIN" \
+            -t "client-web-test:$IMAGE_TAG" .
+          docker compose -f docker-compose.test.yml up -d --no-build --pull never --wait --wait-timeout 120
           docker compose -f docker-compose.test.yml exec -T client-web wget -qO- http://127.0.0.1/healthz
         '''
       }

README.md

@@ -54,3 +54,5 @@ pnpm test
 仅保留 `docker-compose.test.yml` 与 test Jenkins Job。发布前注入 `API_UPSTREAM`（统一 Gateway origin，不含 `/api`）、`TEST_NETWORK`（后端共享测试网络）、`VITE_ADMIN_WEB_ORIGIN`（管理后台 origin，构建时用于安全代登录）与 `IMAGE_TAG`（Jenkins 从当前提交生成）。`HOST_PORT` 默认 9002 且仅绑定 loopback；宿主机反向代理负责外部入口。可选 `NODE_BASE_IMAGE`/`NGINX_BASE_IMAGE`，私有镜像认证由构建节点管理。不得把本地构建结果描述为测试环境已发布。
 
 同机目标默认值：`API_UPSTREAM=http://gateway:9000`、`TEST_NETWORK=firstleg-test-network`；必须与后端同批 test Compose 配置一致。
+
+Jenkins 的测试及灰度镜像构建均通过 `scripts/build-image.sh`，Compose 只部署已构建镜像。构建预算及节点要求见[部署指南](../../docs/测试环境Jenkins部署指南.md)。离线回归为 `node --test scripts/build-resource-contract.test.mjs`，本机仍经统一 `local-check.ps1` 入口运行。

scripts/build-image.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+set -eu
+
+# 构建前至少保留 1GiB 给业务服务，避免在宿主机内存不足时继续启动构建。
+available_kib=$(awk '$1 == "MemAvailable:" { print $2 }' /proc/meminfo)
+case "$available_kib" in
+  ''|*[!0-9]*) echo 'Cannot read host available memory; build refused.' >&2; exit 69 ;;
+esac
+if [ "$available_kib" -lt 4194304 ]; then
+  echo 'Docker build requires at least 4GiB available host memory; retry after resources recover.' >&2
+  exit 75
+fi
+
+# 当前节点使用 Docker 26 的经典构建器。显式固定后端，确保资源参数实际生效。
+# 限制覆盖每个 RUN 容器，失败时也清理中间容器，超时由宿主机独立终止。
+exec env DOCKER_BUILDKIT=0 timeout --signal=TERM --kill-after=30s 15m \
+  docker build --memory=3g --memory-swap=3g \
+  --cpu-period=100000 --cpu-quota=200000 --force-rm "$@"

scripts/build-resource-contract.test.mjs

@@ -0,0 +1,67 @@
+import assert from 'node:assert/strict'
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { basename, dirname, join, resolve } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { fileURLToPath } from 'node:url'
+import test from 'node:test'
+
+const root = fileURLToPath(new URL('../', import.meta.url))
+const wrapper = join(root, 'scripts/build-image.sh')
+const bash = process.platform === 'win32' ? 'C:/Program Files/Git/bin/bash.exe' : 'bash'
+const shellAvailable = process.platform !== 'win32' || existsSync(bash)
+
+// 使用替身验证参数、内存预检和退出码，不启动 Docker 或访问部署环境。
+function runBuild(availableMemory, childStatus = '0') {
+  const directory = mkdtempSync(join(tmpdir(), 'frontend-build-resource-'))
+  try {
+    writeFileSync(join(directory, 'awk'), '#!/bin/sh\nprintf "%s\\n" "$TEST_AVAILABLE_MEMORY"\n', { mode: 0o755 })
+    writeFileSync(join(directory, 'timeout'), '#!/bin/sh\nprintf "%s\\n" watchdog "$@"\nshift 3\nexec "$@"\n', { mode: 0o755 })
+    writeFileSync(join(directory, 'docker'), '#!/bin/sh\nprintf "%s\\n" "builder=$DOCKER_BUILDKIT" "$@"\nexit "$TEST_CHILD_STATUS"\n', { mode: 0o755 })
+    return spawnSync(bash, ['-c',
+      'testbin=$(cd "$1" && pwd); shift; PATH="$testbin:$PATH"; export PATH; exec sh "$@"',
+      'fixture', directory.replaceAll('\\', '/'), wrapper.replaceAll('\\', '/'),
+      '--build-arg', 'VALUE=with space', '-t', 'web:test', '.'], {
+      encoding: 'utf8', timeout: 10000,
+      env: { ...process.env, DOCKER_BUILDKIT: '1', TEST_AVAILABLE_MEMORY: availableMemory, TEST_CHILD_STATUS: childStatus }
+    })
+  } finally {
+    assert.equal(dirname(resolve(directory)), resolve(tmpdir()))
+    rmSync(directory, { recursive: true })
+  }
+}
+
+test('TEST and gray builds share the resource gate and deployment cannot rebuild implicitly', () => {
+  const pipeline = readFileSync(join(root, 'Jenkinsfile'), 'utf8')
+  const production = readFileSync(join(root, 'scripts/deploy-production.sh'), 'utf8')
+  const dockerfile = readFileSync(join(root, 'Dockerfile'), 'utf8')
+  for (const source of [pipeline, production]) {
+    assert.match(source, /sh scripts\/build-image\.sh/)
+    assert.doesNotMatch(source, /docker (?:compose[^\n]* build|build\s)/)
+  }
+  assert.match(pipeline, /timeout\(time: 20, unit: 'MINUTES'\)/)
+  assert.match(pipeline, /up -d --no-build --pull never --wait/)
+  assert.ok(pipeline.includes(`-t "${basename(root)}-test:$IMAGE_TAG"`))
+  assert.match(dockerfile, /^ENV NODE_OPTIONS=--max-old-space-size=2048$/m)
+})
+
+test('build forwards quoted arguments, enforces container budgets and propagates failure', { skip: !shellAvailable }, () => {
+  const result = runBuild('4194304', '23')
+  assert.equal(result.status, 23, result.stderr)
+  assert.match(result.stdout, /watchdog\r?\n--signal=TERM\r?\n--kill-after=30s\r?\n15m\r?\ndocker\r?\nbuild/)
+  assert.match(result.stdout, /builder=0\r?\nbuild/)
+  for (const argument of ['--memory=3g', '--memory-swap=3g', '--cpu-period=100000', '--cpu-quota=200000', '--force-rm']) {
+    assert.ok(result.stdout.split(/\r?\n/).includes(argument), argument)
+  }
+  assert.match(result.stdout, /--build-arg\r?\nVALUE=with space\r?\n-t\r?\nweb:test\r?\n\./)
+  assert.equal(runBuild('8388608').status, 0)
+  assert.equal(runBuild('8388608', '124').status, 124)
+})
+
+test('low or unreadable host memory refuses to start Docker', { skip: !shellAvailable }, () => {
+  for (const [memory, status] of [['4194303', 75], ['', 69], ['unknown', 69]]) {
+    const result = runBuild(memory)
+    assert.equal(result.status, status, result.stderr)
+    assert.equal(result.stdout, '')
+  }
+})

scripts/deploy-production.sh

@@ -35,7 +35,7 @@ DOCKER_CONFIG=$(mktemp -d)
 cleanup() { rm -f "$DOCKER_CONFIG/config.json"; rmdir "$DOCKER_CONFIG" 2>/dev/null || true; }
 trap cleanup EXIT HUP INT TERM
 printf '%s' "$BUILD_REGISTRY_PASSWORD" | docker login -u "$BUILD_REGISTRY_USER" --password-stdin "$registry"
-docker build --build-arg NODE_IMAGE="${NODE_BASE_IMAGE:-node:22-alpine}" \
+sh scripts/build-image.sh --build-arg NODE_IMAGE="${NODE_BASE_IMAGE:-node:22-alpine}" \
   --build-arg NGINX_IMAGE="${NGINX_BASE_IMAGE:-nginx:1.27-alpine}" \
   --build-arg VITE_ADMIN_WEB_ORIGIN="$PUBLIC_WEB_ORIGIN" -t "$image" .
 docker push "$image"

src/modules/cross-border/api/businessOrders.ts

@@ -70,6 +70,7 @@ export interface TransportDetail {
   destinationAddress: string | null
   remark: string | null
   histories?: Array<{ operationType: string; toStatus: string; remark: string | null }>
+  dispatchNos?: string[]
 }
 
 export interface TransportCreate {

src/modules/cross-border/api/orderBudgets.ts

@@ -2,9 +2,9 @@ import { apiRequest } from '@/api/http'
 export interface BudgetResult { status: string; usable: boolean; amountCny: number | string; message: string; orderNo: string | null }
 const base = '/merchant/v1/last-leg/order-budgets'
 // 创建订单时后端在同一事务记录冻结请求，客户端只在详情核对状态和重试明确失败。
-export function readOrderFunding(kind: 'procurement' | 'trucking', orderNo: string) {
+export function readOrderFunding(kind: 'procurement' | 'trucking' | 'looseboard', orderNo: string) {
   return apiRequest<BudgetResult>({ method: 'GET', url: base + '/' + kind + '/orders/' + encodeURIComponent(orderNo) })
 }
-export function retryOrderFunding(kind: 'procurement' | 'trucking', orderNo: string) {
+export function retryOrderFunding(kind: 'procurement' | 'trucking' | 'looseboard', orderNo: string) {
   return apiRequest<BudgetResult>({ method: 'POST', url: base + '/' + kind + '/orders/' + encodeURIComponent(orderNo) + '/retry' })
 }

src/modules/cross-border/businessOrders.test.mjs

@@ -18,7 +18,7 @@ test('all current truck statuses display Chinese labels in lists and details', (
   const { poolOrderStatusLabels } = runInNewContext(`${labelsCode}\n({ poolOrderStatusLabels })`)
   const helpers = view.slice(view.indexOf('function read('), view.indexOf('function idempotencyKey('))
   const compiled = ts.transpileModule(helpers, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
-  const { statusLabel, displayCell } = runInNewContext(`${compiled}\n({ statusLabel, displayCell })`, { poolOrderStatusLabels })
+  const { statusLabel, displayCell } = runInNewContext(`${compiled}\n({ statusLabel, displayCell })`, { poolOrderStatusLabels, props: { kind: 'trucking' } })
   for (const status of ['PENDING_REVIEW', 'FUNDING_PENDING', 'FUNDING_FAILED', 'WAITING_INBOUND', 'RECEIVING', 'WAITING_CONSOLIDATION', 'PALLET_OVERAGE_REVIEW', 'PARTIALLY_ALLOCATED', 'ALLOCATED', 'PENDING_DISPATCH', 'DISPATCHED', 'IN_TRANSIT', 'COMPLETED', 'REJECTED', 'CANCELLED']) {
     assert.match(statusLabel(status), /[\u4e00-\u9fff]/, status)
     assert.equal(displayCell({ status }, 'status'), statusLabel(status))
@@ -29,7 +29,7 @@ test('all current truck statuses display Chinese labels in lists and details', (
 })
 
 test('truck search excludes warehouse and dispatch preparation stages', () => {
-  const truckingOptions = view.split("options: props.kind === 'trucking' ? [")[1].split('] : [')[0]
+  const truckingOptions = view.split("options: props.kind === 'trucking' ? [")[1].split('] : Object.entries')[0]
   for (const status of ['WAITING_INBOUND', 'RECEIVING', 'WAITING_CONSOLIDATION', 'PALLET_OVERAGE_REVIEW', 'PARTIALLY_ALLOCATED', 'ALLOCATED', 'PENDING_DISPATCH']) {
     assert.ok(!truckingOptions.includes(status), status)
   }
@@ -149,7 +149,7 @@ function transportHarness(kind = 'trucking', failFirst = false, budgetCheck = as
   const script = view.match(/<script setup lang="ts">([\s\S]*?)<\/script>/)[1]
   const compiled = ts.transpileModule(script, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.ESNext } }).outputText
     .replace(/^import .*?;$/gm, '').replace(/^export \{\};$/gm, '')
-  const harness = runInNewContext(`${compiled}\n({ form, formRef, submit, detail, detailFields, configuration })`, {
+  const harness = runInNewContext(`${compiled}\n({ form, formRef, submit, detail, detailStatus, detailFields, configuration, queryFields, statusLabel, displayCell })`, {
     defineProps: () => ({ kind, createPage: true, detailPage: false }),
     withDefaults: props => props,
     computed: getter => ({ get value() { return typeof getter === 'function' ? getter() : getter.get() } }),
@@ -164,6 +164,23 @@ function transportHarness(kind = 'trucking', failFirst = false, budgetCheck = as
   return { ...harness, calls, rules: { get value() { return demandHelpers.transportDemandRules(kind === 'trucking' ? 'truck' : 'looseboard', harness.form) } } }
 }
 
+test('looseboard dropdown and displayed labels use only the actual review and transport workflow', () => {
+  const current = transportHarness('looseboard')
+  const options = current.queryFields.value.find(field => field.key === 'status').options
+  assert.deepEqual(Array.from(options, item => [item.value, item.label]), [
+    ['FUNDING_PENDING', '订单受理中'], ['FUNDING_FAILED', '订单处理失败'],
+    ['PENDING_ACCEPTANCE', '待审核'], ['PENDING_DISPATCH', '待排车'],
+    ['DISPATCHED', '待取货'], ['PICKING_UP', '取货中'], ['IN_TRANSIT', '派送中'],
+    ['COMPLETED', '已完成'], ['CANCELLED', '已取消'],
+  ])
+  for (const item of options) {
+    assert.equal(current.statusLabel(item.value), item.label)
+    assert.equal(current.displayCell({ status: item.value }, 'status'), item.label)
+    current.detail.value = { summary: { status: item.value } }
+    assert.equal(current.detailStatus.value, item.label)
+  }
+})
+
 test('truck requires both contacts vehicle and minute times without inheriting looseboard fields', () => {
   const truck = transportHarness()
   for (const key of ['vehicleType', 'originContactName', 'originContactPhone', 'destinationContactName', 'destinationContactPhone', 'pickupAt', 'deliveryAt']) assert.equal(truck.rules.value[key][0].required, true)
@@ -217,7 +234,7 @@ test('truck details render saved minute times and unknown pool demand without ti
 
 test('looseboard saves split contacts and both local minute times without obsolete fields', async () => {
   const current = transportHarness('looseboard', true)
-  Object.assign(current.form, { originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', productName: '家居用品', estimatedPalletCount: 3, packageCount: 8, origin: 'LA', destination: 'ONT', pickupAt: '2026-10-20T09:00:00', deliveryAt: '2026-10-20T15:30:00' })
+  Object.assign(current.form, { originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', productName: '家居用品', estimatedPalletCount: 3, packageCount: 8, budgetAmount: 500, origin: 'LA', destination: 'ONT', pickupAt: '2026-10-20T09:00:00', deliveryAt: '2026-10-20T15:30:00' })
   await current.submit(); await current.submit()
   const payload = current.calls[1].payload
   assert.equal(payload.estimatedPalletCount, 3)
@@ -237,6 +254,17 @@ test('looseboard saves split contacts and both local minute times without obsole
   for (const field of ['palletRequired', 'transportType', 'transportMode', 'containerType', 'contactName', 'contactInfo', 'requestedDate']) assert.equal(Object.hasOwn(payload, field), false)
 })
 
+test('looseboard details show every dispatch without a fleet booking and retain the unassigned state', () => {
+  const looseboard = transportHarness('looseboard')
+  looseboard.detail.value = { summary: { fleetArrangement: null }, dispatchNos: ['PC-1', 'PC-2'] }
+  assert.equal(new Map(looseboard.detailFields.value).get('排车单号'), 'PC-1、PC-2')
+  looseboard.detail.value.dispatchNos = []
+  assert.equal(new Map(looseboard.detailFields.value).get('排车单号'), '暂未排车')
+  const truck = transportHarness('trucking')
+  truck.detail.value = { summary: {} }
+  assert.equal(new Map(truck.detailFields.value).has('排车单号'), false)
+})
+
 test('looseboard requires both times and rejects backwards schedule', () => {
   const current = transportHarness('looseboard')
   assert.equal(current.rules.value.pickupAt[0].required, true)

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 })),
   },
 ])
 
@@ -145,6 +145,7 @@ const detailFields = computed(() => {
   const current = detail.value as TransportDetail
   return [
     ...(props.kind === 'looseboard' ? [
+      ['排车单号', current.dispatchNos?.length ? current.dispatchNos.join('、') : '暂未排车'],
       ['商品名称', summary.productName], ['预计托数', summary.estimatedPalletCount],
     ] : [['车辆类型', vehicleTypeLabel(summary.vehicleType)]]),
     [props.kind === 'trucking' ? '取货地' : '起运地', read(summary, 'origin')], [props.kind === 'trucking' ? '取货地址' : '起运地址', current.originAddress],
@@ -199,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
@@ -253,8 +255,9 @@ function getRowActions(candidate: object): TableAction[] {
   return [{ key: 'detail', label: '详情', run: () => openDetail(candidate) }]
 }
 
+/** 长地址和多张排车单保留完整单号，按详情已有网格换行展示。 */
 function detailFieldClass(label: unknown) {
-  if (label === '备注') return 'is-full'
+  if (label === '备注' || label === '排车单号') return 'is-full'
   return [props.kind === 'trucking' ? '取货地址' : '起运地址', props.kind === 'trucking' ? '送达地址' : '目的地址'].includes(String(label)) ? 'is-wide' : ''
 }
 
@@ -338,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>
@@ -349,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

src/modules/cross-border/orderFundingStatus.test.mjs

@@ -39,6 +39,19 @@ test('truck rejection uses latest review reason and never customer remarks', asy
   assert.equal(missing.message.value, '未填写拒绝原因')
 })
 
+test('looseboard funding failures show the server reason and retry the original order', async () => {
+  const calls = []
+  const h = harness({ status: 'FUNDING_FAILED', read: async (kind, no) => {
+    calls.push([kind, no]); return { status: 'FAILED', message: '可用余额和授信额度不足' }
+  }, retry: async (kind, no) => { calls.push([kind, no]); return { status: 'FREEZE_PENDING' } } })
+  h.props.kind = 'looseboard'; h.props.orderNo = 'LB1'
+  await h.check(0, 0)
+  assert.equal(h.message.value, '可用余额和授信额度不足')
+  await h.retry()
+  assert.deepEqual(calls, [['looseboard', 'LB1'], ['looseboard', 'LB1']])
+  assert.equal(h.events.join(','), 'changed')
+})
+
 test('funding status polls for a bounded time and refreshes detail only on a result', async () => {
   let count = 0
   const h = harness({ read: async () => { count++; return { status: 'FREEZE_PENDING' } } })

src/modules/cross-border/procurement.test.mjs

@@ -323,7 +323,7 @@ test('a lost create response recovers the original order after review releases i
 })
 
 test('funding APIs preserve server results and retry the same order only when requested', async () => {
-  for (const kind of ['procurement', 'trucking']) for (const status of ['FREEZE_PENDING', 'FROZEN', 'RELEASE_PENDING', 'RELEASED', 'RELEASE_FAILED', 'FAILED']) {
+  for (const kind of ['procurement', 'trucking', 'looseboard']) for (const status of ['FREEZE_PENDING', 'FROZEN', 'RELEASE_PENDING', 'RELEASED', 'RELEASE_FAILED', 'FAILED']) {
     const calls = []
     const result = { status, usable: false, orderNo: 'CG/EXISTING', message: '资金校验失败' }
     const budgets = moduleFrom(readFileSync(new URL('./api/orderBudgets.ts', import.meta.url), 'utf8'), name => {

src/modules/cross-border/transportDemandForm.test.mjs

@@ -35,6 +35,8 @@ test('initial form leaves contacts and times blank, zeroes cargo and distinguish
   assert.equal(form.currency, 'USD')
   assert.throws(() => buildTransportDemand('truck', { ...valid(), budgetAmount: undefined }), /预算/)
   assert.throws(() => buildTransportDemand('truck', { ...valid(), budgetAmount: 0 }), /预算/)
+  assert.throws(() => buildTransportDemand('looseboard', { ...valid(), budgetAmount: undefined }), /预算/)
+  assert.equal(buildTransportDemand('looseboard', { ...valid(), budgetAmount: 0 }).budgetAmount, 0)
 })
 
 for (const kind of ['truck', 'looseboard']) {

src/modules/cross-border/transportDemandForm.ts

@@ -75,7 +75,7 @@ export function transportDemandRules(kind: TransportDemandKind, form: TransportD
     if (field === 'packageCount' && kind === 'truck') continue
     rules[field] = [{ required: true, type: 'number', min: 0, message: `${label}须为不小于 0 的数字`, trigger: 'change' }]
   }
-  rules.budgetAmount = [{ required: kind === 'truck', type: 'number', min: kind === 'truck' ? 0.01 : 0, message: '请输入大于 0 的预算总价', trigger: 'change' }]
+  rules.budgetAmount = [{ required: true, type: 'number', min: kind === 'truck' ? 0.01 : 0, message: kind === 'truck' ? '请输入大于 0 的预算总价' : '请输入预算总价，不能小于 0', trigger: 'change' }]
   const pickupLabel = kind === 'truck' ? '取货时间' : '取货时间', deliveryLabel = kind === 'truck' ? '送达时间' : '送货时间'
   rules.pickupAt = [{ required: true, message: `请选择${pickupLabel}`, trigger: 'change' }]
   rules.deliveryAt = [{ required: true, message: `请选择${deliveryLabel}`, trigger: 'change' }, {
@@ -110,6 +110,7 @@ export function transportDemandError(kind: TransportDemandKind, form: TransportD
   if (!Number.isInteger(form.packageCount) || kind === 'looseboard' && !Number.isInteger(form.estimatedPalletCount)) return '件数和预计托数须为整数'
   if (kind === 'truck' && (!Number.isSafeInteger(form.estimatedPalletCount) || form.estimatedPalletCount <= 0)) return '请输入大于 0 的托数'
   if (kind === 'truck' && (form.budgetAmount == null || !Number.isFinite(form.budgetAmount) || form.budgetAmount <= 0)) return '请输入大于 0 的预算总价'
+  if (kind === 'looseboard' && form.budgetAmount == null) return '请输入预算总价'
   if (form.budgetAmount != null && (!Number.isFinite(form.budgetAmount) || form.budgetAmount < 0)) return '预算总价不能小于 0'
   if (!['USD', 'CNY'].includes(form.currency)) return '请选择预算币种'
   return undefined

src/modules/first-leg/components/FirstLegOrderEditorShell.vue

@@ -18,7 +18,6 @@ const emit = defineEmits<{
   <section v-if="page" class="first-leg-editor-page">
     <div class="editor-page-nav">
       <el-button link type="primary" @click="emit('back')"><ArrowLeft :size="17" />返回订单列表</el-button>
-      <span>可先保存草稿，确认无误后再提交平台审核</span>
     </div>
     <div class="editor-page-body"><slot /></div>
     <footer class="editor-page-footer"><slot name="footer" /></footer>
@@ -44,7 +43,6 @@ const emit = defineEmits<{
 <style scoped>
 .first-leg-editor-page { min-width: 0; padding-bottom: 72px; border: 1px solid #edf0f5; background: #fff; box-shadow: 0 5px 18px rgba(15, 31, 58, .04); }
 .editor-page-nav { display: flex; align-items: center; justify-content: space-between; gap: 16px; padding: 5px 16px; border-bottom: 1px solid #edf0f5; }
-.editor-page-nav span { color: var(--muted); font-size: 12px; }
 .editor-page-body { padding: 16px 20px 24px; }
 .editor-page-footer { position: fixed; z-index: 18; right: 0; bottom: 0; left: 224px; display: flex; min-height: 68px; align-items: center; justify-content: center; padding: 10px 24px; border-top: 1px solid #dfe6ee; background: rgba(255, 255, 255, 0.97); box-shadow: 0 -6px 18px rgba(15, 31, 58, .08); backdrop-filter: blur(10px); }
 .editor-page-footer :deep(.editor-actions) { width: min(100%, 900px); justify-content: center; }
@@ -70,7 +68,6 @@ const emit = defineEmits<{
 @media (max-width: 720px) {
   .first-leg-editor-page { padding-bottom: 0; }
   .editor-page-nav { align-items: flex-start; flex-direction: column; gap: 2px; padding: 10px 16px; }
-  .editor-page-nav span { padding-left: 1px; line-height: 1.5; }
   .editor-page-body { padding: 18px 16px 24px; }
   .editor-page-footer { position: sticky; bottom: 0; left: auto; padding: 10px 16px; }
   :global(.first-leg-editor-dialog.el-dialog) { width: calc(100vw - 24px) !important; height: 96vh; margin-top: 2vh; }

src/modules/first-leg/views/CustomsDocumentsView.vue

@@ -63,6 +63,10 @@ function rowActions(row: object): TableAction[] {
   return [{ key: 'documents', label: '查看资料', disabled: loading.value, run: () => openDetail(row) }]
 }
 
+function rowClassName({ row }: { row: CustomsDocumentRow }) {
+  return row.detail.merchantStatus === 'DECLARING' ? 'customs-row-declaring' : ''
+}
+
 function statusLabel(detail: MerchantCustomsContainer) {
   return detail.merchantStatus ? MERCHANT_CUSTOMS_STATUS_LABELS[detail.merchantStatus] ?? '—' : '—'
 }
@@ -98,7 +102,7 @@ onMounted(() => { void load() })
   <div class="customs-page">
     <QueryToolbar v-model="queryModel" layout="grid" ariaLabel="报关资料查询条件" :fields="queryFields" @search="search" />
     <section class="customs-card">
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="pagedRecords" :columns="columns" :loading="loading" :total="filteredRecords.length" :page-sizes="[10, 20, 50, 100]" :row-actions="rowActions" row-key="order.id" :empty-text="emptyText">
+      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="pagedRecords" :columns="columns" :loading="loading" :total="filteredRecords.length" :page-sizes="[10, 20, 50, 100]" :row-actions="rowActions" :row-class-name="rowClassName" row-key="order.id" :empty-text="emptyText">
         <template #toolbar><strong class="customs-list-heading">资料列表<CustomsHelp title="资料统计口径"><p>统计为本客户同柜退税货物汇总，资料覆盖按入仓码计。</p></CustomsHelp></strong></template>
         <template #toolbar-actions><el-button :loading="loading" @click="load"><RefreshCcw :size="16" />刷新</el-button></template>
         <template v-if="errorMessage" #error><div class="state-error" role="alert"><span>{{ errorMessage }}</span><el-button :loading="loading" @click="load">重新加载</el-button></div></template>
@@ -117,5 +121,7 @@ onMounted(() => { void load() })
 .customs-page { display: grid; gap: var(--client-section-gap); }
 .customs-list-heading { display: flex; align-items: center; gap: 4px; }
 .customs-card { overflow: hidden; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: #fff; }
+.customs-card :deep(.el-table__row.customs-row-declaring > .el-table__cell) { background-color: #eff8ff; }
+.customs-card :deep(.el-table__row.customs-row-declaring:hover > .el-table__cell) { background-color: #dbeafe; }
 .state-error { display: flex; min-height: 84px; align-items: center; justify-content: center; gap: 12px; padding: 14px; color: #b42318; }
 </style>