优化

src/modules/cross-border/AGENTS.md

@@ -21,7 +21,7 @@
 - 三条线都是客户自助下单，提交后由平台审核；客户侧不提供审核、改价或内部作业动作。
 - 客户与仓库范围只取服务端当前租户上下文，不从前端参数推断；跨客户查询一律拒绝。
 - 提交需要幂等键、提交中状态与可恢复失败反馈；失败保留已填内容。
-- 海外采购的购买、装箱、面单、交寄与国内核费是一条独立链路，改节点前先读 `docs/海外仓业务/采购订单样品履约流程变更需求.md`（工作区路径）。
+- 海外采购按 `baiyue-firstleg/lastleg-service/docs/procurement-workflow.md`（工作区路径）的七状态流程执行；详情展示分批收货、出库与费用，待客户确认时由当前客户确认，不恢复旧装箱与两段核费节点。
 - 页面承载方式按已确认原型：列表 + 独立建单/详情路由，不改为弹框或抽屉。
 
 ## 验证

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

@@ -1,4 +1,4 @@
-import { apiRequest } from '@/api/http'
+import { apiBlobRequest, apiRequest } from '@/api/http'
 import type { PageResult } from './businessOrders'
 
 export type Amount = number | string
@@ -97,6 +97,35 @@ export interface ProcurementQuery {
   purchaseCategory?: string
   status?: string
 }
+export interface ProcurementWorkflowFile { fileId: string; fileName: string; contentType: string }
+export interface ProcurementReceipt {
+  id: string
+  quantity: number
+  fileIds: string[]
+  receivedAt: string
+}
+export interface ProcurementOutbound {
+  id: string
+  outboundNo: string
+  quantity: number
+  trackingNo: string
+  status: string
+  fileIds: string[]
+  createdAt: string
+  completedAt: string | null
+}
+export interface ProcurementWorkflow {
+  orderNo: string
+  version: number
+  status: string
+  receivedQuantity: number
+  stockQuantity: number
+  reservedQuantity: number
+  availableQuantity: number
+  files: ProcurementWorkflowFile[]
+  receipts: ProcurementReceipt[]
+  outbounds: ProcurementOutbound[]
+}
 const endpoint = '/merchant/v1/last-leg/overseas-procurements'
 export async function listProcurements(params: ProcurementQuery) {
   const result = await apiRequest<PageResult<ProcurementSummary>>({ method: 'GET', url: endpoint, params })
@@ -108,3 +137,13 @@ export function getProcurement(orderNo: string) {
 export function createProcurement(data: ProcurementCreate) {
   return apiRequest<ProcurementDetail>({ method: 'POST', url: endpoint, data })
 }
+export function getProcurementWorkflow(orderNo: string) {
+  return apiRequest<ProcurementWorkflow>({ method: 'GET', url: `${endpoint}/${encodeURIComponent(orderNo)}/workflow` })
+}
+export function confirmProcurement(orderNo: string, data: { version: number; idempotencyKey: string }) {
+  return apiRequest<ProcurementWorkflow>({ method: 'POST', url: `${endpoint}/${encodeURIComponent(orderNo)}/confirm`, data })
+}
+
+export function getProcurementFile(orderNo: string, fileId: string) {
+  return apiBlobRequest({ method: 'GET', url: `${endpoint}/${encodeURIComponent(orderNo)}/files/${encodeURIComponent(fileId)}/content` })
+}

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

@@ -150,7 +150,7 @@ test('truck requires both contacts vehicle and minute times without inheriting l
   truck.form.pickupAt = '2026-10-20T09:30:00'
   let failure
   truck.rules.value.deliveryAt[1].validator({}, '2026-10-20T09:29:00', error => { failure = error })
-  assert.equal(failure.message, '送货时间不能早于取货时间')
+  assert.equal(failure.message, 'C点送达时间不能早于B点取货时间')
 })
 
 test('truck retry submits the complete new contract with identical local times and idempotency key', async () => {
@@ -176,8 +176,8 @@ test('truck details render saved minute times and unknown pool demand without ti
   current.detail.value = { summary: { vehicleType: null, pickupAt: '2026-10-20T09:30:00', deliveryAt: null }, originAddress: null, destinationAddress: null, remark: null }
   const fields = new Map(current.detailFields.value)
   assert.equal(fields.get('车辆类型'), '—')
-  assert.equal(fields.get('取货时间'), '2026-10-20 09:30')
-  assert.equal(fields.get('送货时间'), '—')
+  assert.equal(fields.get('B点取货时间'), '2026-10-20 09:30')
+  assert.equal(fields.get('C点送达时间'), '—')
   assert.equal(fields.has('柜型'), false)
   assert.equal(fields.has('托盘数'), false)
 })

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

@@ -38,7 +38,7 @@ type BusinessForm = DemandFormModel
 
 const configuration = computed(() => ({
   trucking: {
-    title: '美国本土卡',
+    title: '美国本土卡车',
     description: '查询并管理美国本土卡订单',
     columns: transportColumns(false),
   },
@@ -50,16 +50,20 @@ const configuration = computed(() => ({
 })[props.kind])
 
 function transportColumns(looseboard: boolean): ColumnDefinition[] {
+  const originLabel = looseboard ? '起运地' : 'B点取货地'
+  const destinationLabel = looseboard ? '目的地' : 'C点送达地'
+  const pickupLabel = looseboard ? '取货时间' : 'B点取货时间'
+  const deliveryLabel = looseboard ? '送货时间' : 'C点送达时间'
   return [
     { key: 'orderNo', label: '订单编号', width: 180 },
     ...(!looseboard ? [{ key: 'vehicleType', label: '车辆类型', width: 110 }] : []),
-    { key: 'origin', label: '起运地', width: 150 },
-    { key: 'destination', label: '目的地', width: 150 },
+    { key: 'origin', label: originLabel, width: 150 },
+    { key: 'destination', label: destinationLabel, width: 150 },
     ...(looseboard ? [{ key: 'productName', label: '商品名称', width: 150 }, { key: 'estimatedPalletCount', label: '预计托数', width: 100 }] : []),
     { key: 'totalWeightKg', label: '总重量(kg)', width: 120 },
     { key: 'budgetAmount', label: '预算总价', width: 110 },
     ...([
-      { key: 'pickupAt', label: '取货时间', width: 165 }, { key: 'deliveryAt', label: '送货时间', width: 165 },
+      { key: 'pickupAt', label: pickupLabel, width: 165 }, { key: 'deliveryAt', label: deliveryLabel, width: 165 },
     ]),
     { key: 'status', label: '状态', width: 130 },
     { key: 'fleetArrangement', label: '承运安排', width: 190 },
@@ -93,7 +97,7 @@ const queryModel = computed<QueryModel>({
 
 const queryFields = computed<QueryField[]>(() => [
   { key: 'orderNo', label: '订单号', type: 'input', placeholder: '请输入订单号' },
-  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: '请输入起运地或目的地' },
+  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: props.kind === 'trucking' ? '请输入 B 点或 C 点' : '请输入起运地或目的地' },
   {
     key: 'status',
     label: '状态',
@@ -123,13 +127,13 @@ const detailFields = computed(() => {
     ...(props.kind === 'looseboard' ? [
       ['商品名称', summary.productName], ['预计托数', summary.estimatedPalletCount],
     ] : [['车辆类型', vehicleTypeLabel(summary.vehicleType)]]),
-    ['起运地', read(summary, 'origin')], ['起运地址', current.originAddress],
-    ['目的地', read(summary, 'destination')], ['目的地址', current.destinationAddress],
+    [props.kind === 'trucking' ? 'B点取货地' : '起运地', read(summary, 'origin')], [props.kind === 'trucking' ? 'B点取货地址' : '起运地址', current.originAddress],
+    [props.kind === 'trucking' ? 'C点送达地' : '目的地', read(summary, 'destination')], [props.kind === 'trucking' ? 'C点送达地址' : '目的地址', current.destinationAddress],
     ['件数', read(summary, 'packageCount')], ['总重量(kg)', read(summary, 'totalWeightKg')],
     ['总体积(m³)', read(summary, 'totalVolumeCbm')], ['预算总价', money(read(summary, 'budgetAmount'), read(summary, 'currency'))],
-    ['起运地联系人', summary.originContactName], ['起运地联系电话', summary.originContactPhone],
-    ['目的地联系人', summary.destinationContactName], ['目的地联系电话', summary.destinationContactPhone],
-    ['取货时间', localMinute(summary.pickupAt)], ['送货时间', localMinute(summary.deliveryAt)], ['备注', current.remark],
+    [props.kind === 'trucking' ? 'B点联系人' : '起运地联系人', summary.originContactName], [props.kind === 'trucking' ? 'B点联系电话' : '起运地联系电话', summary.originContactPhone],
+    [props.kind === 'trucking' ? 'C点联系人' : '目的地联系人', summary.destinationContactName], [props.kind === 'trucking' ? 'C点联系电话' : '目的地联系电话', summary.destinationContactPhone],
+    [props.kind === 'trucking' ? 'B点取货时间' : '取货时间', localMinute(summary.pickupAt)], [props.kind === 'trucking' ? 'C点送达时间' : '送货时间', localMinute(summary.deliveryAt)], ['备注', current.remark],
   ]
 })
 
@@ -212,7 +216,7 @@ function getRowActions(candidate: object): TableAction[] {
 }
 
 function detailFieldClass(label: unknown) {
-  return ['备注', '起运地址', '目的地址'].includes(String(label)) ? 'is-wide' : ''
+  return ['备注', props.kind === 'trucking' ? 'B点取货地址' : '起运地址', props.kind === 'trucking' ? 'C点送达地址' : '目的地址'].includes(String(label)) ? 'is-wide' : ''
 }
 
 const listRouteName = computed(() => ({

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

@@ -1,107 +1,103 @@
 <script setup lang="ts">
-import { computed } from 'vue'
-import type { ProcurementDetail, ProcurementFee } from '../api/procurement'
-import { directionLabel, regionText, dateTime, feePurposes, feeStatus, feeTone, feeTotals, measurement, money, productHref, text } from '../procurementPresentation'
-
-const props = defineProps<{ detail: ProcurementDetail }>()
-const t = (text: string) => regionText(text, props.detail.order.procurementDirection)
+import { computed, onBeforeUnmount, ref } from 'vue'
+import { getProcurementFile, type ProcurementDetail, type ProcurementFee, type ProcurementWorkflow } from '../api/procurement'
+import { directionLabel, dateTime, feeStatus, feeTone, feeTotals, money, productHref, statusLabel, text } from '../procurementPresentation'
+const props = defineProps<{ detail: ProcurementDetail; workflow: ProcurementWorkflow }>()
+const previewUrl = ref(''), previewName = ref(''), previewImage = ref(false), fileLoading = ref(''), fileError = ref('')
+let active = true
+function clearPreview() { if (previewUrl.value) URL.revokeObjectURL(previewUrl.value); previewUrl.value = '' }
+function fileName(fileId: string, index: string | number) { return props.workflow.files.find(file => file.fileId === fileId)?.fileName || '附件 ' + (Number(index) + 1) }
+async function openFile(fileId: string) {
+  if (fileLoading.value) return
+  fileLoading.value = fileId; fileError.value = ''
+  try {
+    const blob = await getProcurementFile(props.workflow.orderNo, fileId)
+    if (!active) return
+    clearPreview(); previewUrl.value = URL.createObjectURL(blob)
+    previewName.value = props.workflow.files.find(file => file.fileId === fileId)?.fileName || '附件'
+    previewImage.value = /^image\/(png|jpeg|gif|webp|bmp)$/i.test(blob.type)
+  } catch (cause) { if (active) fileError.value = cause instanceof Error ? cause.message : '附件加载失败' }
+  finally { fileLoading.value = '' }
+}
+onBeforeUnmount(() => { active = false; clearPreview() })
 const totals = computed(() => feeTotals(props.detail.fees))
-const progress = computed(() => props.detail.progress.filter(step => step.key !== 'closed_at' || step.completedAt))
-const ended = computed(() => ['REJECTED', 'CANCELLED', 'EXCEPTION_CLOSED', 'SHIPPED_TO_CUSTOMER'].includes(props.detail.order.status))
-const hasPending = computed(() => props.detail.fees.some(f => f.walletStatus?.endsWith('_PENDING') || f.walletStatus?.endsWith('_FAILED')))
 </script>
 
 <template>
-  <section class="procurement-section" aria-label="采购履约进度">
-    <h3>履约进度</h3>
-    <ol class="procurement-progress">
-      <li v-for="step in progress" :key="step.key" :class="{ 'is-complete': step.completedAt }">
-        <strong>{{ step.title }}</strong><span>{{ step.completedAt ? dateTime(step.completedAt) : ended ? '未执行' : '待处理' }}</span>
-      </li>
-    </ol>
-    <p v-if="detail.purchaseNeedsAttention" class="procurement-note">购买资料正在核对，客服将协助处理。已发生的收货与费用结果仍保留在本单。</p>
-  </section>
+  <el-alert v-if="fileError" :title="fileError" type="error" :closable="false" />
   <section class="procurement-section" aria-label="商品与收件信息">
     <h3>商品与收件信息</h3>
-    <dl class="procurement-grid"><div><dt>采购方向</dt><dd>{{ directionLabel(detail.order.procurementDirection) }}</dd></div>
-      <div><dt>采购品类</dt><dd>{{ detail.order.purchaseCategory }}</dd></div>
+    <dl class="procurement-grid">
+      <div><dt>采购方向</dt><dd>{{ directionLabel(detail.order.procurementDirection) }}</dd></div>
       <div><dt>商品名称</dt><dd>{{ detail.order.productName }}</dd></div>
       <div><dt>商品规格</dt><dd>{{ text(detail.order.productSpecification) }}</dd></div>
+      <div><dt>采购品类</dt><dd>{{ text(detail.order.purchaseCategory) }}</dd></div>
       <div><dt>采购数量</dt><dd>{{ detail.order.purchaseQuantity }} 件</dd></div>
-      <div><dt>下单预算单价</dt><dd>{{ money(detail.order.budgetUnitPrice, detail.order.currency) }}</dd></div>
-      <div><dt>货款预算总上限</dt><dd>{{ money(detail.budget.totalAmount, detail.budget.currency) }}</dd></div>
-      <div><dt>预算核验时间</dt><dd>{{ dateTime(detail.budget.authorizedAt) }}</dd></div>
-      <div><dt>{{ t('预计到海外仓') }}</dt><dd>{{ dateTime(detail.order.estimatedArrivalAt) }}</dd></div>
+      <div><dt>预算单价</dt><dd>{{ money(detail.order.budgetUnitPrice, detail.order.currency) }}</dd></div>
+      <div><dt>预算合计</dt><dd>{{ money(detail.budget.totalAmount, detail.budget.currency) }}</dd></div>
+      <div><dt>采购仓</dt><dd>{{ detail.order.actualWarehouseName || detail.order.plannedWarehouseName || '待审核指定' }}<span v-if="detail.order.actualWarehouseCode">（{{ detail.order.actualWarehouseCode }}）</span></dd></div>
       <div><dt>收件人</dt><dd>{{ detail.order.contactName }}</dd></div>
       <div><dt>联系电话</dt><dd>{{ detail.order.contactPhone }}</dd></div>
-      <div class="wide"><dt>下单收货地址</dt><dd>{{ detail.order.receivingAddress }}</dd></div>
-      <div class="wide"><dt>{{ t('实际海外仓') }}</dt><dd>{{ text(detail.order.actualWarehouseName) }}<span v-if="detail.order.actualWarehouseCode">（{{ detail.order.actualWarehouseCode }}）</span></dd></div>
-      <div class="wide"><dt>商品链接</dt><dd><a v-if="productHref(detail.order.productUrl)" :href="productHref(detail.order.productUrl)" target="_blank" rel="noopener noreferrer">{{ detail.order.productUrl }}</a><span v-else>{{ text(detail.order.productUrl) }}</span></dd></div>
+      <div class="wide"><dt>收货地址</dt><dd>{{ detail.order.receivingAddress }}</dd></div>
+      <div v-if="detail.order.productUrl" class="full"><dt>商品链接</dt><dd><a v-if="productHref(detail.order.productUrl)" :href="productHref(detail.order.productUrl)" target="_blank" rel="noopener noreferrer">查看商品</a><span v-else>{{ text(detail.order.productUrl) }}</span></dd></div>
     </dl>
   </section>
-  <section class="procurement-section" :aria-label="t('已确认海外装箱清单')">
-    <h3>{{ t('已确认海外装箱清单') }}</h3>
-    <el-table :data="detail.boxes" border stripe empty-text="尚无已确认的装箱清单" row-key="cartonNo">
-      <el-table-column prop="cartonNo" label="箱号" min-width="170" />
-      <el-table-column label="箱内商品" min-width="200"><template #default>{{ detail.order.productName }}</template></el-table-column>
-      <el-table-column label="规格" min-width="180"><template #default>{{ text(detail.order.productSpecification) }}</template></el-table-column>
-      <el-table-column prop="quantity" label="数量（件）" width="120" />
-      <el-table-column label="外箱长 × 宽 × 高（cm）" min-width="240"><template #default="{ row }">{{ measurement(row.lengthCm, 2) }} × {{ measurement(row.widthCm, 2) }} × {{ measurement(row.heightCm, 2) }}</template></el-table-column>
-      <el-table-column label="封箱毛重（kg）" width="170"><template #default="{ row }">{{ measurement(row.grossWeightKg, 3) }}</template></el-table-column>
-    </el-table>
-  </section>
-  <section class="procurement-section" aria-label="两段实际运输">
-    <h3>两段实际运输</h3>
-    <el-table :data="detail.shipments" border stripe empty-text="尚无实际交寄记录">
-      <el-table-column label="运输段" width="150"><template #default="{ row }">{{ t(row.leg === 'OVERSEAS' ? '国际段 · 海外交寄' : '国内段 · 寄客户') }}</template></el-table-column>
-      <el-table-column prop="shipmentNo" label="交寄编号" min-width="270" />
-      <el-table-column prop="cartonNo" label="原箱号" min-width="150" />
-      <el-table-column prop="quantity" label="实际件数" width="110" />
-      <el-table-column prop="carrier" label="承运商" min-width="140" />
-      <el-table-column prop="trackingNo" label="运单号" min-width="230" />
-      <el-table-column label="实际交寄时间" width="185"><template #default="{ row }">{{ dateTime(row.shippedAt) }}</template></el-table-column>
-    </el-table>
-
-  </section>
-  <section class="procurement-section" aria-label="采购费用与资金结果">
-    <h3>费用与资金结果</h3>
+  <section class="procurement-section" aria-label="分批收货">
+    <h3>收货记录</h3>
     <dl class="procurement-grid money-grid">
-      <div><dt>累计成功扣款</dt><dd>{{ money(totals?.paid) }}</dd></div>
-      <div><dt>累计成功退款</dt><dd>{{ money(totals?.refunded) }}</dd></div>
-      <div><dt>净实扣</dt><dd>{{ money(totals?.net) }}</dd></div>
-      <div><dt>预估国际运费占款</dt><dd>{{ money(totals?.estimatedHold) }}</dd></div>
+      <div><dt>累计收货</dt><dd>{{ workflow.receivedQuantity }} 件</dd></div>
+      <div><dt>采购库存</dt><dd>{{ workflow.stockQuantity }} 件</dd></div>
+      <div><dt>出库处理中</dt><dd>{{ workflow.reservedQuantity }} 件</dd></div>
+      <div><dt>可出库</dt><dd>{{ workflow.availableQuantity }} 件</dd></div>
     </dl>
-    <p class="procurement-note">预算上限仅包含样品货款。预估国际运费只冻结、不直接扣款，最终以实际费用结算；表内保留原费用、追加及退款记录。</p>
-    <el-table :data="detail.fees" border stripe empty-text="尚无已核定费用" row-key="feeNo">
-      <el-table-column prop="feeNo" label="费用编号" min-width="270" />
-      <el-table-column label="费用用途" min-width="145"><template #default="{ row }">{{ t(feePurposes[row.purpose] || '待核定') }}</template></el-table-column>
-      <el-table-column prop="name" label="费用名称" min-width="145" />
-      <el-table-column label="原币金额" min-width="130"><template #default="{ row }">{{ money(row.originalAmount, row.originalCurrency) }}</template></el-table-column>
-      <el-table-column label="汇率 / 月份" min-width="150"><template #default="{ row }">{{ measurement(row.exchangeRate, 6) }}<br /><small>{{ text(row.exchangeRateMonth) }}</small></template></el-table-column>
-      <el-table-column label="人民币金额" min-width="130"><template #default="{ row }">{{ money(row.amount) }}</template></el-table-column>
-      <el-table-column label="处理结果" min-width="190"><template #default="{ row }"><el-tag :type="feeTone(row as ProcurementFee)" size="small">{{ feeStatus(row as ProcurementFee) }}</el-tag><small v-if="row.purpose !== 'INTERNATIONAL_ESTIMATE' && row.walletStatus === 'SETTLED' && !row.sourceLinked" class="fee-sync">费用结果同步中</small></template></el-table-column>
-      <el-table-column prop="parentFeeNo" label="关联原费用 / 预估" min-width="270"><template #default="{ row }">{{ text(row.parentFeeNo) }}</template></el-table-column>
+    <el-table :data="workflow.receipts" border stripe empty-text="暂无收货记录" row-key="id">
+      <el-table-column label="批次" width="80" align="center"><template #default="{ $index }">{{ $index + 1 }}</template></el-table-column>
+      <el-table-column prop="quantity" label="收货数量（件）" width="145" align="right" />
+      <el-table-column label="收货时间" width="185"><template #default="{ row }">{{ dateTime(row.receivedAt) }}</template></el-table-column>
+      <el-table-column label="收货照片" min-width="160"><template #default="{ row }"><span v-if="!row.fileIds.length">—</span><el-button v-for="(fileId, index) in row.fileIds" :key="fileId" link type="primary" :loading="fileLoading === fileId" :disabled="!!fileLoading" @click="openFile(fileId)">{{ fileName(fileId, index) }}</el-button></template></el-table-column>
     </el-table>
-    <p v-if="hasPending" class="procurement-note">部分资金处理尚未完成，可点击页面“刷新”查看最新结果；如需协助请联系客户服务。</p>
   </section>
-  <section v-if="detail.exceptionSummaries.length" class="procurement-section" aria-label="客服处理说明">
-    <h3>客服处理说明</h3><ul class="procurement-summaries"><li v-for="(summary, index) in detail.exceptionSummaries" :key="index">{{ summary }}</li></ul>
+  <section class="procurement-section" aria-label="分批出库">
+    <h3>出库记录</h3>
+    <el-table :data="workflow.outbounds" border stripe empty-text="暂无出库记录" row-key="id">
+      <el-table-column prop="outboundNo" label="出库单号" min-width="180" />
+      <el-table-column prop="quantity" label="出库数量（件）" width="145" align="right" />
+      <el-table-column prop="trackingNo" label="物流跟踪号" min-width="160" />
+      <el-table-column label="状态" width="100" align="center"><template #default="{ row }">{{ statusLabel(row.status) }}</template></el-table-column>
+      <el-table-column label="创建时间" width="185"><template #default="{ row }">{{ dateTime(row.createdAt) }}</template></el-table-column>
+      <el-table-column label="签收时间" width="185"><template #default="{ row }">{{ dateTime(row.completedAt) }}</template></el-table-column>
+      <el-table-column label="签收凭证" min-width="220"><template #default="{ row }"><span v-if="!row.fileIds.length">—</span><el-button v-for="(fileId, index) in row.fileIds" :key="fileId" link type="primary" :loading="fileLoading === fileId" :disabled="!!fileLoading" @click="openFile(fileId)">{{ fileName(fileId, index) }}</el-button></template></el-table-column>
+    </el-table>
   </section>
+  <section class="procurement-section" aria-label="费用明细">
+    <h3>费用明细 <span class="fee-total">已扣款 {{ money(totals?.net) }}</span></h3>
+    <el-table :data="detail.fees" border stripe empty-text="暂无费用" row-key="feeNo">
+      <el-table-column prop="name" label="费用名称" min-width="180" />
+      <el-table-column label="原币金额" min-width="145" align="right"><template #default="{ row }">{{ money(row.originalAmount, row.originalCurrency) }}</template></el-table-column>
+      <el-table-column label="人民币金额" min-width="145" align="right"><template #default="{ row }">{{ money(row.amount) }}</template></el-table-column>
+      <el-table-column label="扣款结果" min-width="160" align="center"><template #default="{ row }"><el-tag :type="feeTone(row as ProcurementFee)" size="small">{{ feeStatus(row as ProcurementFee) }}</el-tag></template></el-table-column>
+    </el-table>
+  </section>
+  <el-dialog :model-value="!!previewUrl" :title="previewName" width="800px" append-to-body @close="clearPreview">
+    <img v-if="previewImage" :src="previewUrl" :alt="previewName" style="display: block; max-width: 100%; max-height: 70vh; margin: auto" />
+    <a v-else :href="previewUrl" :download="previewName">下载 {{ previewName }}</a>
+  </el-dialog>
 </template>
 
 <style scoped>
 .procurement-section { margin-top: 18px; min-width: 0; }
+.fee-total { margin-left: 14px; font-weight: 400; font-size: 12px; color: var(--muted); }
 h3 { margin: 0 0 10px; padding-bottom: 7px; border-bottom: 1px solid var(--border); color: var(--navy); font-size: 14px; }
-.procurement-progress { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 0; padding: 0; margin: 0; list-style: none; border-top: 1px solid var(--border); border-left: 1px solid var(--border); }
-.procurement-progress li { display: grid; gap: 7px; padding: 12px; border-bottom: 1px solid var(--border); border-right: 1px solid var(--border); color: var(--muted); }
-.procurement-progress strong { font-size: 13px; font-weight: 600; }.procurement-progress span { font-size: 12px; }.procurement-progress .is-complete strong { color: var(--navy); }
 .procurement-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin: 0; border-left: 1px solid var(--border); border-top: 1px solid var(--border); }
 .procurement-grid > div { display: grid; grid-template-columns: 110px minmax(0, 1fr); align-items: center; gap: 8px; padding: 9px 12px; border-right: 1px solid var(--border); border-bottom: 1px solid var(--border); min-width: 0; }
 .procurement-grid dt { font-size: 12px; color: var(--muted); }.procurement-grid dd { margin: 0; font-size: 13px; line-height: 1.6; color: var(--navy); overflow-wrap: anywhere; }
 .procurement-grid .wide { grid-column: span 2; }.money-grid > div { grid-template-columns: minmax(0, 1fr); }.money-grid dd { font-size: 16px; font-weight: 600; }
-a { color: var(--client-action); } .procurement-note { margin: 10px 0; color: var(--muted); font-size: 12px; line-height: 1.7; }
-.fee-sync { display: block; padding-top: 5px; color: var(--muted); }.procurement-summaries { margin: 0; padding-left: 22px; line-height: 1.8; color: var(--navy); font-size: 13px; white-space: pre-wrap; }
+.procurement-grid .full { grid-column: 1 / -1; }
+.procurement-section :deep(.el-table .cell) { overflow-wrap: anywhere; font-variant-numeric: tabular-nums; }
+.procurement-section :deep(.el-table .el-button.is-link) { display: flex; justify-content: flex-start; max-width: 100%; height: auto; margin: 0; padding: 3px 0; white-space: normal; text-align: left; }
+.procurement-section :deep(.el-table .el-button.is-link > span) { min-width: 0; overflow-wrap: anywhere; }
+a { color: var(--client-action); }
 @media (max-width: 767px) {
-  .procurement-progress, .procurement-grid { grid-template-columns: 1fr; }.procurement-grid .wide { grid-column: auto; }
+  .procurement-grid { grid-template-columns: 1fr; }.procurement-grid .wide { grid-column: auto; }
 }
 </style>

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

@@ -29,14 +29,14 @@ defineExpose({
         <el-form-item v-if="kind === 'truck'" class="transport-demand-wide" label="车辆类型" prop="vehicleType">
           <el-select v-model="model.vehicleType" placeholder=""><el-option label="15拖" value="PALLET_15" /><el-option label="30拖" value="PALLET_30" /></el-select>
         </el-form-item>
-        <el-form-item label="起运地" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
-        <el-form-item label="目的地" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
-        <el-form-item label="起运地联系人" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="目的地联系人" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="起运地联系电话" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="目的地联系电话" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="起运详细地址"><el-input v-model.trim="model.originAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
-        <el-form-item label="目的详细地址"><el-input v-model.trim="model.destinationAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'B点取货地' : '起运地'" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'C点送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'B点联系人' : '起运地联系人'" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'C点联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'B点联系电话' : '起运地联系电话'" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'C点联系电话' : '目的地联系电话'" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'B点取货地址' : '起运详细地址'"><el-input v-model.trim="model.originAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'C点送达地址' : '目的详细地址'"><el-input v-model.trim="model.destinationAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
       </div>
     </section>
     <section class="transport-demand-section">
@@ -58,8 +58,8 @@ defineExpose({
           <el-select v-model="model.currency" aria-label="预算币种" placeholder=""><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select>
         </div></el-form-item>
         <div />
-        <el-form-item label="取货时间" prop="pickupAt"><el-date-picker v-model="model.pickupAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
-        <el-form-item label="送货时间" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'B点取货时间' : '取货时间'" prop="pickupAt"><el-date-picker v-model="model.pickupAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? 'C点送达时间' : '送货时间'" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" /></el-form-item>
         <el-form-item class="transport-demand-wide" label="备注"><el-input v-model="model.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="" /></el-form-item>
       </div>
     </section>

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

@@ -65,14 +65,14 @@ function viewHarness({ createPage = false, detailPage = false, api = {}, storage
   const route = vue.reactive({ params: { orderNo: detailPage ? 'PO-1' : '' } })
   const auth = vue.reactive({ token: 'identity-A', user: { tenantName: 'Company' }, profile: { tenantName: 'Company' }, hasPermission: () => true })
   const pushes = [], dispose = []
-  const defaults = { listProcurements: async () => ({ records: [], total: 0 }), getProcurement: async orderNo => ({ order: { orderNo } }), createProcurement: async () => ({ order: { orderNo: 'PO-CREATED' } }) }
+  const defaults = { getProcurementWorkflow: async orderNo => ({ orderNo, version: 1, status: 'WAIT_CUSTOMER_CONFIRM', receipts: [], outbounds: [] }), confirmProcurement: async () => ({ orderNo: 'PO-1', version: 2, status: 'CONFIRMED' }), listProcurements: async () => ({ records: [], total: 0 }), getProcurement: async orderNo => ({ order: { orderNo } }), createProcurement: async () => ({ order: { orderNo: 'PO-CREATED' } }) }
   const { descriptor } = parse(readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8'))
   const source = compileScript(descriptor, { id: 'procurement-test' }).content
   const context = { exports: {}, Error, crypto, sessionStorage: { getItem: key => storage.get(key) || null, setItem: (key, value) => storage.set(key, value), removeItem: key => storage.delete(key) },
     require(name) {
       if (name === 'vue') return { ...vue, onBeforeUnmount: callback => dispose.push(callback), watch: (...args) => { const stop = vue.watch(...args); dispose.push(stop); return stop } }
       if (name === 'vue-router') return { useRoute: () => route, useRouter: () => ({ push: async target => pushes.push(target) }) }
-      if (name === 'element-plus') return { ElMessage: { success: () => {} } }
+      if (name === 'element-plus') return { ElMessage: { success: () => {} }, ElMessageBox: { confirm: async () => {} } }
       if (name === '@/api/types') return { ApiError }
       if (name === '@/api/session') return { accessTokenIdentity: token => token }
       if (name === '@/modules/auth/public') return { useAuthStore: () => auth }
@@ -160,12 +160,60 @@ test('domestic purchase creates an export order and displays the actual origin a
   const payload = presentation.buildProcurementCreate({ ...draft(), procurementDirection: 'DOMESTIC_TO_OVERSEAS', receivingAddress: 'US, CA, Los Angeles, test destination' }, 'Authenticated Company', 'export-key')
   assert.equal(payload.procurementDirection, 'DOMESTIC_TO_OVERSEAS')
   assert.equal(payload.receivingAddress, 'US, CA, Los Angeles, test destination')
-  assert.equal(presentation.statusLabel('WAIT_OVERSEAS_RECEIPT', payload.procurementDirection), '待国内到仓')
-  assert.equal(presentation.statusLabel('DOMESTIC_RECEIVING', payload.procurementDirection), '海外收货中')
-  assert.equal(presentation.statusLabel('WAIT_CHARGES', payload.procurementDirection), '待海外核费')
-  assert.equal(presentation.statusLabel('WAIT_OVERSEAS_RECEIPT'), '待海外到仓')
+  assert.equal(presentation.statusLabel('RECEIVING', payload.procurementDirection), '收货中')
+  assert.equal(presentation.statusLabel('DELIVERING', payload.procurementDirection), '派送中')
+  assert.equal(presentation.statusLabel('WAIT_CUSTOMER_CONFIRM', payload.procurementDirection), '待客户确认')
+  assert.equal(presentation.statusLabel('COMPLETED'), '签收完成')
   assert.throws(() => presentation.buildProcurementCreate({ ...draft(), procurementDirection: 'INVALID' }, 'Company', 'key'), /采购方向/)
   const source = readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8')
   assert.match(source, /v-model="form.procurementDirection"/)
   assert.match(source, /regionText\('最终国内收件资料', form.procurementDirection\)/)
 })
+
+
+test('customer confirms with current workflow version and double-click only sends once', async () => {
+  let resolve, calls = []
+  const harness = viewHarness({ detailPage: true, api: { confirmProcurement: (orderNo, payload) => {
+    calls.push({ orderNo, ...payload }); return new Promise(done => { resolve = done })
+  } } })
+  try {
+    await flush()
+    const first = harness.state.confirmReceived(); await flush(); await harness.state.confirmReceived()
+    assert.equal(calls.length, 1); assert.equal(calls[0].version, 1); assert.equal(calls[0].orderNo, 'PO-1')
+    assert.ok(calls[0].idempotencyKey)
+    resolve({ orderNo: 'PO-1', version: 2, status: 'CONFIRMED' }); await first
+    assert.equal(harness.state.workflow.value.status, 'CONFIRMED'); assert.equal(harness.state.canConfirm.value, false)
+  } finally { harness.dispose() }
+})
+
+test('failed customer confirmation preserves receipt context for recovery', async () => {
+  const harness = viewHarness({ detailPage: true, api: { confirmProcurement: async () => { throw new ApiError('版本已更新，请刷新', 'A0409') } } })
+  try {
+    await flush(); await harness.state.confirmReceived()
+    assert.equal(harness.state.workflow.value.status, 'WAIT_CUSTOMER_CONFIRM')
+    assert.equal(harness.state.confirming.value, false); assert.equal(harness.state.confirmError.value, '版本已更新，请刷新')
+  } finally { harness.dispose() }
+})
+
+
+test('unknown create and confirmation results reuse idempotency keys for unchanged retries', async () => {
+  const creates = [], confirms = []
+  const create = viewHarness({ createPage: true, api: { createProcurement: async payload => { creates.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
+  const confirm = viewHarness({ detailPage: true, api: { confirmProcurement: async (_, payload) => { confirms.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
+  try {
+    Object.assign(create.state.form, draft()); await create.state.submit(); await create.state.submit()
+    assert.equal(creates[0].idempotencyKey, creates[1].idempotencyKey)
+    await flush(); await confirm.state.confirmReceived(); await confirm.state.confirmReceived()
+    assert.equal(confirms[0].idempotencyKey, confirms[1].idempotencyKey)
+  } finally { create.dispose(); confirm.dispose() }
+})
+
+
+test('bill-settled manual fees show review results without counting a balance debit', () => {
+  const bill = determination => ({ ...fee('OTHER', 'NOT_REQUIRED', '100'), determination })
+  assert.equal(presentation.feeStatus(bill('PENDING')), '账单结算 · 待审核')
+  assert.equal(presentation.feeStatus(bill('APPROVED')), '账单结算 · 已确认')
+  assert.equal(presentation.feeStatus(bill('REJECTED')), '账单结算 · 已拒绝')
+  assert.equal(presentation.feeTone(bill('REJECTED')), 'danger')
+  assert.equal(presentation.feeTotals([bill('PENDING'), bill('APPROVED'), bill('REJECTED')]).paid, '0.00')
+})

src/modules/cross-border/procurementPresentation.ts

@@ -1,9 +1,8 @@
 import type { Amount, ProcurementCreate, ProcurementFee } from './api/procurement'
 
 export const procurementStatuses: Record<string, string> = {
-  PENDING_REVIEW: '待审核', WAIT_PURCHASE: '待购买', WAIT_OVERSEAS_RECEIPT: '待海外到仓', OVERSEAS_RECEIVING: '海外收货中',
-  WAIT_PACKING: '待装箱', WAIT_LABELS: '待面单及预估处理', WAIT_OVERSEAS_SHIPMENT: '待海外交寄', INTERNATIONAL_TRANSIT: '国际运输中',
-  DOMESTIC_RECEIVING: '国内收货中', WAIT_CHARGES: '待国内核费', WAIT_CUSTOMER_SHIPMENT: '待寄客户', SHIPPED_TO_CUSTOMER: '已寄客户',
+  PENDING_REVIEW: '待审核', RECEIVING: '收货中', WAIT_CUSTOMER_CONFIRM: '待客户确认', CONFIRMED: '已确认',
+  IN_TRANSIT: '运输中', DELIVERING: '派送中', COMPLETED: '签收完成',
   REJECTED: '已拒绝', CANCELLED: '已取消', EXCEPTION_CLOSED: '异常关闭',
 }
 export const feePurposes: Record<string, string> = {
@@ -12,10 +11,10 @@ export const feePurposes: Record<string, string> = {
 }
 export function statusLabel(status: string | null | undefined, direction?: string | null) { return regionText(status ? procurementStatuses[status] || '待核对进度' : '—', direction) }
 export function statusTone(status: string | null | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' {
-  if (status === 'SHIPPED_TO_CUSTOMER') return 'success'
+  if (status === 'COMPLETED' || status === 'CONFIRMED') return 'success'
   if (status === 'REJECTED' || status === 'EXCEPTION_CLOSED') return 'danger'
   if (status === 'CANCELLED') return 'info'
-  if (status === 'INTERNATIONAL_TRANSIT') return 'primary'
+  if (status === 'IN_TRANSIT' || status === 'DELIVERING') return 'primary'
   return 'warning'
 }
 function cents(value: Amount | null | undefined): bigint | null {
@@ -46,6 +45,12 @@ export function productHref(value: string | null | undefined) {
   try { const url = new URL(value); return ['http:', 'https:'].includes(url.protocol) ? url.href : undefined } catch { return undefined }
 }
 export function feeStatus(fee: ProcurementFee) {
+  if (fee.walletStatus === 'NOT_REQUIRED') {
+    if (fee.determination === 'PENDING') return '账单结算 · 待审核'
+    if (fee.determination === 'APPROVED') return '账单结算 · 已确认'
+    if (fee.determination === 'REJECTED') return '账单结算 · 已拒绝'
+    return '账单结算'
+  }
   if (fee.purpose === 'INTERNATIONAL_ESTIMATE') {
     const label: Record<string, string> = { FROZEN: '已冻结，未扣款', ZERO: '零预估已确认', SETTLED: '原预估已结清', RELEASED: '预估已释放' }
     if (fee.walletStatus && label[fee.walletStatus]) return label[fee.walletStatus]
@@ -58,6 +63,8 @@ export function feeStatus(fee: ProcurementFee) {
   return fee.walletStatus ? labels[fee.walletStatus] || '待核定' : '待核定'
 }
 export function feeTone(fee: ProcurementFee): 'success' | 'warning' | 'danger' | 'info' {
+  if (fee.determination === 'REJECTED') return 'danger'
+  if (fee.walletStatus === 'NOT_REQUIRED' && fee.determination === 'APPROVED') return 'info'
   if (fee.walletStatus?.endsWith('_FAILED')) return 'danger'
   if (['SETTLED', 'REFUNDED', 'ZERO', 'NOT_APPLICABLE', 'RELEASED'].includes(fee.walletStatus || '')) return 'success'
   if (fee.walletStatus === 'TERMINATED') return 'info'

src/modules/cross-border/transportDemandForm.ts

@@ -32,10 +32,14 @@ export function createTransportDemandForm(): TransportDemandForm {
   }
 }
 
-const requiredText = {
-  origin: '起运地', destination: '目的地', originContactName: '起运地联系人',
-  originContactPhone: '起运地联系电话', destinationContactName: '目的地联系人', destinationContactPhone: '目的地联系电话',
-} as const
+const requiredText = (kind: TransportDemandKind) => ({
+  origin: kind === 'truck' ? 'B点取货地' : '起运地',
+  destination: kind === 'truck' ? 'C点送达地' : '目的地',
+  originContactName: kind === 'truck' ? 'B点联系人' : '起运地联系人',
+  originContactPhone: kind === 'truck' ? 'B点联系电话' : '起运地联系电话',
+  destinationContactName: kind === 'truck' ? 'C点联系人' : '目的地联系人',
+  destinationContactPhone: kind === 'truck' ? 'C点联系电话' : '目的地联系电话',
+} as const)
 
 export function localMinuteInput(value: unknown) {
   return typeof value === 'string' && value ? `${value.slice(0, 16)}:00` : ''
@@ -43,8 +47,9 @@ export function localMinuteInput(value: unknown) {
 
 export function transportDemandRules(kind: TransportDemandKind, form: TransportDemandForm): FormRules<TransportDemandForm> {
   const rules: FormRules<TransportDemandForm> = {}
-  for (const [field, label] of Object.entries(requiredText)) {
-    rules[field as keyof typeof requiredText] = [{ required: true, whitespace: true, message: `请输入${label}`, trigger: 'blur' }]
+  const labels = requiredText(kind)
+  for (const [field, label] of Object.entries(labels)) {
+    rules[field as keyof typeof labels] = [{ required: true, whitespace: true, message: `请输入${label}`, trigger: 'blur' }]
   }
   if (kind === 'truck') rules.vehicleType = [{ required: true, message: '请选择车辆类型', trigger: 'change' }]
   for (const [field, label] of [['packageCount', '件数'], ['estimatedPalletCount', '预计托数'], ['totalWeightKg', '总重量'], ['totalVolumeCbm', '总体积']] as const) {
@@ -52,23 +57,26 @@ export function transportDemandRules(kind: TransportDemandKind, form: TransportD
     rules[field] = [{ required: true, type: 'number', min: 0, message: `${label}须为不小于 0 的数字`, trigger: 'change' }]
   }
   rules.budgetAmount = [{ type: 'number', min: 0, message: '预算总价不能小于 0', trigger: 'change' }]
-  rules.pickupAt = [{ required: true, message: '请选择取货时间', trigger: 'change' }]
-  rules.deliveryAt = [{ required: true, message: '请选择送货时间', trigger: 'change' }, {
-    validator: (_rule, value, callback) => callback(value && form.pickupAt && localMinuteInput(value) < localMinuteInput(form.pickupAt) ? new Error('送货时间不能早于取货时间') : undefined), trigger: 'change',
+  const pickupLabel = kind === 'truck' ? 'B点取货时间' : '取货时间', deliveryLabel = kind === 'truck' ? 'C点送达时间' : '送货时间'
+  rules.pickupAt = [{ required: true, message: `请选择${pickupLabel}`, trigger: 'change' }]
+  rules.deliveryAt = [{ required: true, message: `请选择${deliveryLabel}`, trigger: 'change' }, {
+    validator: (_rule, value, callback) => callback(value && form.pickupAt && localMinuteInput(value) < localMinuteInput(form.pickupAt) ? new Error(`${deliveryLabel}不能早于${pickupLabel}`) : undefined), trigger: 'change',
   }]
   return rules
 }
 
 export function transportDemandError(kind: TransportDemandKind, form: TransportDemandForm): string | undefined {
   if (kind === 'truck' && !['PALLET_15', 'PALLET_30'].includes(form.vehicleType)) return '请选择车辆类型'
-  for (const [field, label] of Object.entries(requiredText)) {
-    if (!String(form[field as keyof typeof requiredText] || '').trim()) return `请输入${label}`
+  const labels = requiredText(kind)
+  for (const [field, label] of Object.entries(labels)) {
+    if (!String(form[field as keyof typeof labels] || '').trim()) return `请输入${label}`
   }
-  for (const [field, label] of [['pickupAt', '取货时间'], ['deliveryAt', '送货时间']] as const) {
+  const pickupLabel = kind === 'truck' ? 'B点取货时间' : '取货时间', deliveryLabel = kind === 'truck' ? 'C点送达时间' : '送货时间'
+  for (const [field, label] of [['pickupAt', pickupLabel], ['deliveryAt', deliveryLabel]] as const) {
     if (!form[field]) return `请选择${label}`
     if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?$/.test(form[field])) return `请选择有效的${label}`
   }
-  if (localMinuteInput(form.deliveryAt) < localMinuteInput(form.pickupAt)) return '送货时间不能早于取货时间'
+  if (localMinuteInput(form.deliveryAt) < localMinuteInput(form.pickupAt)) return `${deliveryLabel}不能早于${pickupLabel}`
   for (const [field, label] of [['packageCount', '件数'], ['totalWeightKg', '总重量'], ['totalVolumeCbm', '总体积'], ...(kind === 'looseboard' ? [['estimatedPalletCount', '预计托数'] as const] : [])] as const) {
     if (!Number.isFinite(form[field]) || form[field] < 0) return `${label}须为不小于 0 的数字`
   }

src/modules/cross-border/views/ProcurementView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, reactive, ref, shallowRef, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ApiError } from '@/api/types'
 import { accessTokenIdentity } from '@/api/session'
 import { useAuthStore } from '@/modules/auth/public'
@@ -9,7 +9,7 @@ import DataTable, { type DataTableColumn } from '@/components/common/DataTable.v
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
 import type { TableAction } from '@/components/common/tableActions'
 import ProcurementDetailPanel from '../components/ProcurementDetailPanel.vue'
-import { createProcurement, getProcurement, listProcurements, type ProcurementDetail, type ProcurementSummary } from '../api/procurement'
+import { confirmProcurement, createProcurement, getProcurement, getProcurementWorkflow, listProcurements, type ProcurementDetail, type ProcurementSummary, type ProcurementWorkflow } from '../api/procurement'
 import { procurementDirections, directionLabel, regionText, buildProcurementCreate, dateTime, draftBudgetTotal, emptyProcurementDraft, money, procurementStatuses, statusLabel, statusTone } from '../procurementPresentation'
 import { procurementRequestKey } from '../procurementSubmission'
 
@@ -25,9 +25,14 @@ const form = reactive(emptyProcurementDraft())
 const submitError = ref(''), submittedOrder = ref('')
 const submitting = ref(false), loading = ref(false), error = ref('')
 const detail = shallowRef<ProcurementDetail | null>(null)
+const workflow = shallowRef<ProcurementWorkflow | null>(null)
+const confirming = ref(false), confirmError = ref('')
+const canConfirm = computed(() => canCreate.value && workflow.value?.status === 'WAIT_CUSTOMER_CONFIRM')
 const rows = ref<ProcurementSummary[]>([]), total = ref(0)
 const query = reactive({ page: 1, size: 20, orderNo: '', purchaseCategory: '', productName: '', status: '' })
 let requestSequence = 0, active = true, inFlight = ''
+let createAttempt: { fingerprint: string; key: string } | null = null
+let confirmAttempt: { fingerprint: string; key: string } | null = null
 const queryModel = computed<QueryModel>({
   get: () => ({ orderNo: query.orderNo, purchaseCategory: query.purchaseCategory, productName: query.productName, status: query.status }),
   set: value => { for (const key of ['orderNo', 'purchaseCategory', 'productName', 'status'] as const) query[key] = String(value[key] || '') },
@@ -35,7 +40,7 @@ const queryModel = computed<QueryModel>({
 const queryFields: QueryField[] = [
   { key: 'orderNo', label: '采购单号', type: 'input' }, { key: 'purchaseCategory', label: '采购品类', type: 'input' },
   { key: 'productName', label: '商品名称', type: 'input' },
-  { key: 'status', label: '履约进度', type: 'select', options: Object.entries(procurementStatuses).map(([value, label]) => ({ value, label: ({ WAIT_OVERSEAS_RECEIPT: '待起运仓收货', OVERSEAS_RECEIVING: '起运地收货中', WAIT_OVERSEAS_SHIPMENT: '待国际交寄', DOMESTIC_RECEIVING: '目的地收货中', WAIT_CHARGES: '待目的地核费' } as Record<string, string>)[value] || label })) },
+  { key: 'status', label: '履约进度', type: 'select', options: Object.entries(procurementStatuses).map(([value, label]) => ({ value, label })) },
 ]
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
@@ -66,28 +71,53 @@ async function loadDetail() {
   if (!orderNo.value) { error.value = '采购单号缺失'; return }
   const key = JSON.stringify([identity.value, orderNo.value])
   if (inFlight === key) return
-  const sequence = ++requestSequence; inFlight = key; loading.value = true; error.value = ''; detail.value = null
-  try { const result = await getProcurement(orderNo.value); if (sequence === requestSequence) detail.value = result }
+  const sequence = ++requestSequence; inFlight = key; loading.value = true; error.value = ''; detail.value = null; workflow.value = null
+  try {
+    const [result, currentWorkflow] = await Promise.all([getProcurement(orderNo.value), getProcurementWorkflow(orderNo.value)])
+    if (sequence === requestSequence) { detail.value = result; workflow.value = currentWorkflow }
+  }
   catch (cause) { if (sequence === requestSequence) error.value = message(cause) }
   finally { if (sequence === requestSequence) { loading.value = false; inFlight = '' } }
 }
+async function confirmReceived() {
+  if (!canConfirm.value || confirming.value || !workflow.value) return
+  const owner = identity.value, targetOrder = orderNo.value, version = workflow.value.version
+  confirming.value = true; confirmError.value = ''
+  try {
+    await ElMessageBox.confirm('确认本单收货数量及照片，确认后平台将安排出库。', '确认采购结果', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' })
+    if (!active || owner !== identity.value || targetOrder !== orderNo.value) return
+    const fingerprint = JSON.stringify([owner, targetOrder, version])
+    if (confirmAttempt?.fingerprint !== fingerprint) confirmAttempt = { fingerprint, key: procurementRequestKey() }
+    const result = await confirmProcurement(targetOrder, { version, idempotencyKey: confirmAttempt.key })
+    if (!active || owner !== identity.value || targetOrder !== orderNo.value) return
+    workflow.value = result; confirmAttempt = null
+    if (detail.value) detail.value = { ...detail.value, order: { ...detail.value.order, status: result.status, version: result.version } }
+    ElMessage.success('采购结果已确认')
+  } catch (cause) {
+    if (cause !== 'cancel' && cause !== 'close' && active && owner === identity.value && targetOrder === orderNo.value) confirmError.value = message(cause)
+  } finally { confirming.value = false }
+}
 function search() { if (query.page === 1) void loadList(); else query.page = 1 }
 function resetQuery() { const reload = query.page === 1; Object.assign(query, { page: 1, orderNo: '', purchaseCategory: '', productName: '', status: '' }); if (reload) void loadList() }
-function resetForm() { submitError.value = ''; submittedOrder.value = ''; Object.assign(form, emptyProcurementDraft()) }
+function resetForm() { submitError.value = ''; submittedOrder.value = ''; Object.assign(form, emptyProcurementDraft()); createAttempt = null }
 async function submit() {
   if (submitting.value || !canCreate.value || !identity.value || submittedOrder.value) return
   const owner = identity.value; submitting.value = true; submitError.value = ''
   try {
-    const result = await createProcurement(buildProcurementCreate(form, companyName.value, procurementRequestKey()))
+    const payload = buildProcurementCreate(form, companyName.value, '')
+    const fingerprint = JSON.stringify([owner, payload])
+    if (createAttempt?.fingerprint !== fingerprint) createAttempt = { fingerprint, key: procurementRequestKey() }
+    const result = await createProcurement({ ...payload, idempotencyKey: createAttempt.key })
     if (!active || owner !== identity.value) return
-    submittedOrder.value = result.order.orderNo; ElMessage.success('采购订单已提交')
+    createAttempt = null; submittedOrder.value = result.order.orderNo; ElMessage.success('采购订单已提交')
     if (canList.value) await router.push({ name: 'cross-border-procurement-detail', params: { orderNo: result.order.orderNo } })
   } catch (cause) { if (active && owner === identity.value) submitError.value = message(cause) }
   finally { submitting.value = false }
 }
 watch(() => [mode.value, orderNo.value, query.page, query.size, identity.value], (values, previous) => {
-  if (values[4] !== previous?.[4]) { rows.value = []; total.value = 0 }
-  ++requestSequence; inFlight = ''; loading.value = false; error.value = ''; detail.value = null
+  if (values[4] !== previous?.[4]) { rows.value = []; total.value = 0; createAttempt = null }
+  if (values[4] !== previous?.[4] || values[1] !== previous?.[1]) confirmAttempt = null
+  ++requestSequence; inFlight = ''; loading.value = false; error.value = ''; detail.value = null; workflow.value = null; confirmError.value = ''
   if (mode.value === 'create') resetForm()
   else if (mode.value === 'detail') void loadDetail()
   else void loadList()
@@ -112,12 +142,12 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
       </div>
     </template>
     <section v-else-if="mode === 'detail'" v-loading="loading" class="procurement-detail" aria-label="采购订单详情">
-      <header class="procurement-heading"><div><el-button link type="primary" @click="returnToList">← 返回列表</el-button><h2>{{ detail?.order.orderNo || '采购订单详情' }}</h2></div><div><el-tag v-if="detail" :type="statusTone(detail.order.status)">{{ statusLabel(detail.order.status, detail.order.procurementDirection) }}</el-tag><el-button :disabled="loading" @click="loadDetail">刷新</el-button></div></header>
+      <header class="procurement-heading"><div><el-button link type="primary" @click="returnToList">← 返回列表</el-button><h2>{{ detail?.order.orderNo || '采购订单详情' }}</h2></div><div><el-tag v-if="detail" :type="statusTone(workflow?.status || detail.order.status)">{{ statusLabel(workflow?.status || detail.order.status, detail.order.procurementDirection) }}</el-tag><el-button v-if="canConfirm" type="primary" :loading="confirming" @click="confirmReceived">确认采购结果</el-button><el-button :disabled="loading || confirming" @click="loadDetail">刷新</el-button></div></header>
       <div v-if="error" class="procurement-error" role="alert"><span>{{ error }}</span><el-button :disabled="loading" @click="loadDetail">重新加载</el-button></div>
-      <ProcurementDetailPanel v-else-if="detail" :detail="detail" /><el-skeleton v-else :rows="8" animated />
+      <template v-else-if="detail && workflow"><el-alert v-if="confirmError" :title="confirmError" type="error" :closable="false" /><ProcurementDetailPanel :detail="detail" :workflow="workflow" /></template><el-skeleton v-else :rows="8" animated />
     </section>
     <section v-else class="procurement-create" aria-label="采购下单">
-      <header class="procurement-heading"><div><h2>采购下单</h2><p>一单一个商品及规格；预算仅授权样品货款，运费及关税另行核定。</p></div><el-button v-if="canList" @click="returnToList">返回列表</el-button></header>
+      <header class="procurement-heading"><div><h2>采购下单</h2></div><el-button v-if="canList" @click="returnToList">返回列表</el-button></header>
       <el-result v-if="!canCreate" icon="warning" title="没有采购下单权限" sub-title="请联系企业管理员配置权限" />
       <el-result v-else-if="submittedOrder" icon="success" title="采购订单已提交" :sub-title="submittedOrder"><template #extra><el-button @click="resetForm">新建另一单</el-button></template></el-result>
       <template v-else>
@@ -129,15 +159,15 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
             <el-form-item label="商品名称" required><el-input v-model.trim="form.productName" maxlength="255" placeholder="" /></el-form-item>
             <el-form-item label="商品规格"><el-input v-model.trim="form.productSpecification" maxlength="500" placeholder="规格、型号" /></el-form-item>
             <el-form-item label="采购数量（件）" required><el-input v-model.trim="form.purchaseQuantity" inputmode="numeric" maxlength="18" placeholder="正整数" /></el-form-item>
-            <el-form-item label="预算单价" required><el-input v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="请明确填写；免费样品填 0" /></el-form-item>
+            <el-form-item label="预算单价" required><el-input v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="0.00" /></el-form-item>
             <el-form-item label="预算币种" required><el-select v-model="form.currency"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
             <el-form-item class="full" label="商品链接"><el-input v-model.trim="form.productUrl" maxlength="2000" placeholder="https://…" /></el-form-item>
-          </div><p class="procurement-hint">货款预算总上限：<strong>{{ money(draftBudgetTotal(form), form.currency) }}</strong>。零预算仅授权免费样品；实际货款按供应商实付核定。</p>
+          </div><p class="procurement-hint">预算合计：<strong>{{ money(draftBudgetTotal(form), form.currency) }}</strong></p>
           <h3>{{ regionText('最终国内收件资料', form.procurementDirection) }}</h3><div class="procurement-form-grid">
             <el-form-item label="收件人" required><el-input v-model.trim="form.contactName" maxlength="128" placeholder="实际收件人姓名" /></el-form-item>
             <el-form-item label="联系电话" required><el-input v-model.trim="form.contactPhone" maxlength="64" type="tel" placeholder="快递可联系的电话" /></el-form-item>
             <el-form-item class="full" :label="regionText('完整国内地址', form.procurementDirection)" required><el-input v-model.trim="form.receivingAddress" maxlength="1000" :placeholder="form.procurementDirection === 'DOMESTIC_TO_OVERSEAS' ? '国家、州/省、市、邮编及详细地址' : '省、市、区县、街道及详细门牌'" /></el-form-item>
-            <el-form-item class="full" label="采购要求"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="" /></el-form-item>
+            <el-form-item class="full" label="备注"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="" /></el-form-item>
           </div>
         </el-form>
         <footer class="procurement-form-actions"><el-button type="primary" :loading="submitting" :disabled="!companyName || !identity" @click="submit">提交采购订单</el-button></footer>

src/modules/overseas-warehouse/utils/transferCartonPrinting.ts

@@ -9,7 +9,8 @@ const escapeHtml = (value: string) => value.replace(/[&<>"']/g, char => ({ '&':
 
 /** Generate labels in memory only. The later order request carries these same identities. */
 export function prepareTransferCartonLabels(rows: PrintableCargoRow[], newMark: () => string = () => {
-  const bytes = crypto.getRandomValues(new Uint8Array(16))
+  // 采用短箱码，业务前缀保留 BX，SKU/品名等业务信息继续单独打印，避免把业务字段拼进唯一箱码。
+  const bytes = crypto.getRandomValues(new Uint8Array(6))
   return `BX-${Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('').toUpperCase()}`
 }) {
   const total = rows.reduce((sum, row) => sum + Number(row.expectedPackageCount || 0), 0)