恢复账单明细入口并完善采购状态展示

AGENTS.md

@@ -73,11 +73,12 @@
 
 ## UI 与交互
 
+- 后续客户端新增、新建、下单操作统一执行 [Client 界面样式规范](../../docs/Client界面样式规范.md) 的“新增页面”章节，作为当前通用外观依据；列表按同文列表条款。只读取本轮适用章节，不因规范更新批量改造其他操作或公共外框。
 - 视觉还原、布局/交互承载方式变更或真实页面验收时读取 `../../docs/Admin-Client前端原型还原验收规则.md`，只为受影响操作形成原型核对矩阵；纯文案、逻辑或测试修改不自动读取。自动检查与人工视觉验收分开报告，无视觉变化时标记“无需视觉验收”。
-- 已向客户讲解或确认过的产品原型是页面视觉与布局实现的直接事实来源。字段顺序、字段分组、字段摆放、列宽、控件宽高、对齐方式、换行方式、区块层级、上下左右边距、内边距、间隙、留白、圆角、边框、阴影、背景色、文字颜色和字号均必须按原型还原，不得只参考大致风格后自行重新排版。
+- 已向客户讲解或确认过的产品原型是页面字段、分组、摆放及承载方式的直接依据；新增页的通用外观以当前 Client 样式规范明确替代的条款为准。未被替代的列宽、控件宽高、对齐方式、换行方式、区块层级、边距、圆角、边框、阴影、背景色、文字颜色和字号仍按原型还原，不得只参考大致风格后自行重新排版。
 - 原型中的按钮位置、顺序、尺寸、圆角、边框、背景色、文字色、图标、悬停态、激活态、禁用态和危险语义必须直接按原型实现；不得擅自改为文字链接、不同颜色、不同按钮类型、折叠菜单或自创交互效果，也不得增加原型没有的上浮、缩放、渐变线、装饰图标或其他视觉元素。
 - 原型已经给出明确图标、字符图标、图片资源或按钮内图标时，直接使用原型中的同一方案和资源，不得以 Lucide、Element Plus 默认图标、手绘图标或个人偏好替换。仅当原型没有定义对应图标时，才按本节的默认图标语义补齐。
-- 上述原型还原规则优先于本文件中“延续现有视觉体系”、默认组件样式和默认图标库等一般性规则。只有用户当前明确要求、阶段范围、真实字段长度、响应式、可访问性或接口事实与原型冲突时才允许做最小调整，并须在修改前说明具体差异、原因和影响范围；不得以技术实现方便为由偏离原型。
+- 当前 Client 样式规范明确替代的外观及上述原型还原规则，优先于本文件中“延续现有视觉体系”、默认组件样式和默认图标库等一般性规则。后续用户明确确认的例外优先；阶段范围、真实字段长度、响应式、可访问性或接口事实与原型冲突时只做最小调整，并须在修改前说明具体差异、原因和影响范围，不得以技术实现方便为由偏离。
 - 详情、新增、编辑、审核等操作采用独立页面、居中弹框、侧滑面板或其他承载方式，必须逐页面按对应原型确认，不得全局写死为某一种容器。原型为独立页面时使用正式路由和页面布局；原型为居中弹框时使用模态弹框；只有原型明确为侧滑面板时才使用抽屉。不得因为已有公共组件或改动方便，把原型中的独立页面改成弹框、把弹框改成抽屉，或反向替换。
 - 延续现有客户工作台的可信、简洁和服务型视觉语言，与内部管理后台保持品牌关联但不照搬高密度管理界面。
 - 优先使用 Element Plus 和 Lucide 图标；不使用表情符号代替功能图标，不引入第二套组件库。

docs/business-index.md

@@ -38,3 +38,5 @@
 | 履约、海外仓与财务 | 入库计费、柜次进度、船期、海外仓贴标/转运/废弃/退货换标、消息和客户账单 | `src/modules/first-leg/`、`overseas-warehouse/`、`finance/`、`notifications/`；按服务端权限核对客户可见字段、客户隔离和只读/写入边界 |
 
 客户侧边界：仍以服务端权限和客户可见字段为准；PDA、平台后台操作和内部证据不因全量验收自动暴露到 Client。财务按 `../../docs/财务管理/` 与 `src/modules/finance/routes.ts` 定位。
+
+- 货物废弃：有箱唛按具体箱选择，备注选填；无箱唛但有托盘时只填申请总箱数与必填备注，预留相关托盘供PDA扫描现场箱唛自动计数。详情展示废弃备注、托盘、实际废弃箱唛与实际数量；现场扫描清单与申请选箱快照分别展示。

src/auto-imports.d.ts

@@ -6,5 +6,5 @@
 // biome-ignore lint: disable
 export {}
 declare global {
-
+  const ElMessageBox: typeof import('element-plus/es').ElMessageBox
 }

src/components/ClientSidebarMenu.vue

@@ -5,6 +5,7 @@ import {
   clientNavigation,
   filterNavigationByPermissions,
   getNavigationParentKeys,
+  getNavigationLeaves,
 } from '@/navigation/clientNavigation'
 import { useAuthStore } from '@/modules/auth/public'
 import { useCustomsPendingStore } from '@/modules/first-leg/public'
@@ -40,8 +41,11 @@ onBeforeUnmount(() => {
 })
 
 const visibleNavigation = computed(() => filterNavigationByPermissions(clientNavigation, auth.permissionCodes))
+const activeNavigationPath = computed(() => getNavigationLeaves(visibleNavigation.value)
+  .filter(node => node.path === props.activePath || (node.path !== '/' && props.activePath.startsWith(`${node.path}/`)))
+  .sort((left, right) => right.path.length - left.path.length)[0]?.path ?? props.activePath)
 
-const activeParentKeys = computed(() => new Set(getNavigationParentKeys(visibleNavigation.value, props.activePath)))
+const activeParentKeys = computed(() => new Set(getNavigationParentKeys(visibleNavigation.value, activeNavigationPath.value)))
 const openedKeys = ref<ReadonlySet<string>>(new Set(activeParentKeys.value))
 // Expand the order group by default so the three customer order shortcuts are visible.
 openedKeys.value = new Set([...openedKeys.value, 'order-center'])
@@ -73,7 +77,7 @@ function handleSelect(path: string) {
       :key="node.key"
       :node="node"
       :badges="badges"
-      :active-path="activePath"
+      :active-path="activeNavigationPath"
       :opened-keys="openedKeys"
       :active-parent-keys="activeParentKeys"
       :level="0"

src/components/ClientSidebarMenuNode.vue

@@ -27,6 +27,7 @@ const groupId = computed(() => `client-nav-group-${props.node.key}`)
   <li
     class="client-nav-node"
     v-if="node.children"
+    :data-nav-key="node.key"
     :class="{
       'has-divider-before': node.dividerBefore,
       'is-active-parent': activeParentKeys.has(node.key),
@@ -69,7 +70,7 @@ const groupId = computed(() => `client-nav-group-${props.node.key}`)
     </ul>
   </li>
 
-  <li v-else class="client-nav-node" :class="{ 'has-divider-before': node.dividerBefore }">
+  <li v-else class="client-nav-node" :data-nav-key="node.key" :class="{ 'has-divider-before': node.dividerBefore }">
     <RouterLink
       :to="node.path"
       class="client-sidebar-link"

src/modules/cross-border/PROTOTYPE_MATRIX.md

@@ -35,3 +35,16 @@
 
 
 2026-10-29 用户截图调整：采购待确认支持确认或必填原因驳回；四张实收/库存数量卡片置顶，商品及收件信息置底。本土卡车数量改托数，托数及预算须为正数。采购及卡车先等待Finance余额/授信冻结成功，再以同一幂等键建单；不足保留表单并提示原因。自动检查与人工视觉验收分别记录；待人工1920×1080、100%截图确认。
+
+## 海外采购下单与结果处理（2026-10-30）
+
+依据：当前对话的下单页与详情页截图，以及用户明确要求“商品链接下单必填”“下单成功返回列表”“驳回/确认移至列表，弹窗显示照片和采购数量，驳回必填理由”“确认后两个按钮隐藏”。
+
+| 页面 | 操作及承载 | 调整 | 验收 |
+|---|---|---|---|
+| 海外采购下单 | 既有独立页面 | 商品链接标记必填并校验非空及有效 HTTP/HTTPS 地址；成功返回采购列表，失败保留表单 | 定向自动测试；待人工截图确认 |
+| 海外采购列表 | 待客户确认行的操作列 | 提供详情、驳回、确认采购结果；确认/驳回成功刷新列表，离开待客户确认状态后隐藏两项动作 | 状态与权限自动测试；待人工截图确认 |
+| 采购结果确认/驳回 | 居中弹窗 | 显示单号、商品、采购数量、累计收货、逐批数量与可放大的收货照片；驳回原因必填，最多1000字；失败保留内容供重试 | 定向自动测试；待人工1920×1080、100%截图确认 |
+| 海外采购详情 | 既有独立页面 | 移除结果确认与驳回按钮，保留详情和刷新 | 源码合同核对；待人工截图确认 |
+
+2026-10-30 照片布局按用户截图反馈收紧：收货批次按横向三列排列，照片缩略图为112×84，同批照片横向排列，超出可横向滚动；保留批次数量、时间和点击放大预览。待人工截图确认。

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

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

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

@@ -1,13 +1,10 @@
 import { apiRequest } from '@/api/http'
-interface BudgetResult { status: string; usable: boolean; amountCny: number | string; message: string; orderNo: string | null }
+export interface BudgetResult { status: string; usable: boolean; amountCny: number | string; message: string; orderNo: string | null }
 const base = '/merchant/v1/last-leg/order-budgets'
-// 资金回执成功才继续下单；超时保留当前幂等键，允许用户再次核对。
+// 创建订单时后端在同一事务记录冻结请求，客户端只在详情核对状态和重试明确失败。
-export async function requireOrderBudget(kind: 'procurement' | 'trucking', key: string, amount: number, currency: string) {
+export function readOrderFunding(kind: 'procurement' | 'trucking', orderNo: string) {
-  const url = `${base}/${kind}/${encodeURIComponent(key)}`
+  return apiRequest<BudgetResult>({ method: 'GET', url: base + '/' + kind + '/orders/' + encodeURIComponent(orderNo) })
-  let result = await apiRequest<BudgetResult>({ method: 'POST', url, data: { amount, currency } })
+}
-  for (let attempt = 0; result.status === 'FREEZE_PENDING' && attempt < 12; attempt++) {
+export function retryOrderFunding(kind: 'procurement' | 'trucking', orderNo: string) {
-    await new Promise(resolve => setTimeout(resolve, 1000))
+  return apiRequest<BudgetResult>({ method: 'POST', url: base + '/' + kind + '/orders/' + encodeURIComponent(orderNo) + '/retry' })
-    result = await apiRequest<BudgetResult>({ method: 'GET', url })
-  }
-  if (!result.usable) throw new Error(result.message || '余额及授信校验未完成，请稍后重试')
 }

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

@@ -12,6 +12,7 @@ export interface ProcurementSummary {
   budgetUnitPrice: Amount | null
   currency: string | null
   status: string
+  reviewRemark?: string | null
   version: number
   createdAt: string
   updatedAt: string
@@ -25,6 +26,7 @@ export interface ProcurementOrder extends ProcurementSummary {
   plannedWarehouseName: string | null
   actualWarehouseCode: string | null
   actualWarehouseName: string | null
+  remark: string | null
 }
 export interface ProcurementFee {
   feeNo: string

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

@@ -75,7 +75,9 @@ test('covers list detail create loading error empty pagination and actions-first
   assert.match(view, /<DataTable[^>]*:row-actions="getRowActions"/)
   assert.match(view, /key: 'actions', label: '操作', width: 90, fixed: 'left'/)
   assert.match(view, /class="business-table-card"/)
-  assert.doesNotMatch(procurementView, /inventoryQuantity|outboundQuantity|reviewRemark/)
+  assert.doesNotMatch(procurementView, /inventoryQuantity|outboundQuantity/)
+  assert.match(procurementView, /label: '失败 \/ 拒绝原因'/)
+  assert.match(procurementView, /reviewRemark/)
   assert.match(procurementView, /procurementStatuses/)
   assert.match(procurementView, /ProcurementDetailPanel/)
 })
@@ -124,7 +126,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 })`, {
+  const harness = runInNewContext(`${compiled}\n({ form, formRef, submit, detail, detailFields, configuration })`, {
     defineProps: () => ({ kind, createPage: true, detailPage: false }),
     withDefaults: props => props,
     computed: getter => ({ get value() { return typeof getter === 'function' ? getter() : getter.get() } }),
@@ -174,13 +176,18 @@ test('truck retry submits the complete new contract with identical local times a
 
 test('truck details render saved minute times and unknown pool demand without timezone conversion', () => {
   const current = transportHarness()
-  current.detail.value = { summary: { vehicleType: null, pickupAt: '2026-10-20T09:30:00', deliveryAt: null }, originAddress: null, destinationAddress: null, remark: null }
+  current.detail.value = { summary: { vehicleType: null, palletCount: 3, packageCount: 0, 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.has('柜型'), false)
   assert.equal(fields.has('托盘数'), false)
+  assert.equal(fields.get('托数'), 3)
+  assert.equal(fields.has('件数'), false)
+  const columns = current.configuration.value.columns
+  assert.equal(columns.find(column => column.label === '托数').key, 'palletCount')
+  assert.equal(columns.some(column => column.key === 'packageCount'), false)
 })
 
 
@@ -197,6 +204,12 @@ test('looseboard saves split contacts and both local minute times without obsole
   assert.equal(payload.destinationContactPhone, '2')
   assert.equal(payload.deliveryAt, '2026-10-20T15:30:00')
   assert.equal(payload.idempotencyKey, current.calls[0].payload.idempotencyKey)
+  current.detail.value = { summary: { ...payload }, originAddress: null, destinationAddress: null, remark: null }
+  const fields = new Map(current.detailFields.value)
+  assert.equal(fields.get('件数'), 8)
+  assert.equal(fields.get('预计托数'), 3)
+  assert.equal(fields.has('托数'), false)
+  assert.equal(current.configuration.value.columns.some(column => column.key === 'palletCount'), false)
   for (const field of ['palletRequired', 'transportType', 'transportMode', 'containerType', 'contactName', 'contactInfo', 'requestedDate']) assert.equal(Object.hasOwn(payload, field), false)
 })
 
@@ -211,15 +224,9 @@ test('looseboard requires both times and rejects backwards schedule', () => {
 })
 
 
-test('truck creation waits for budget freeze and never submits after insufficient funds', async () => {
+test('truck creation does not block on a separate budget reservation', async () => {
-  let release
+  const current = transportHarness('trucking', false, async () => { throw new Error('旧冻结接口不应调用') })
-  const gate = new Promise(resolve => { release = resolve })
-  const current = transportHarness('trucking', false, () => gate)
   Object.assign(current.form, { vehicleType: 'PALLET_30', estimatedPalletCount: 3, budgetAmount: 100, origin: 'LA', destination: 'ONT', originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', pickupAt: '2026-10-20T09:00:00', deliveryAt: '2026-10-20T15:00:00' })
-  const pending = current.submit(); await Promise.resolve(); await Promise.resolve()
+  await current.submit()
-  assert.equal(current.calls.length, 0)
+  assert.equal(current.calls.length, 1)
-  release(); await pending; assert.equal(current.calls.length, 1)
-  const failed = transportHarness('trucking', false, async () => { throw new Error('余额及授信不足') })
-  Object.assign(failed.form, { ...current.form, vehicleType: 'PALLET_30', estimatedPalletCount: 3, budgetAmount: 100, origin: 'LA', destination: 'ONT', originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', pickupAt: '2026-10-20T09:00:00', deliveryAt: '2026-10-20T15:00:00' })
-  await failed.submit(); assert.equal(failed.calls.length, 0); assert.equal(failed.form.budgetAmount, 100)
 })

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'
@@ -61,13 +61,17 @@ function transportColumns(looseboard: boolean): ColumnDefinition[] {
     { key: 'origin', label: originLabel, width: 150 },
     { key: 'destination', label: destinationLabel, width: 150 },
     ...(looseboard ? [{ key: 'productName', label: '商品名称', width: 150 }, { key: 'estimatedPalletCount', label: '预计托数', width: 100 }] : []),
+    ...(!looseboard ? [{ key: 'palletCount', label: '托数', width: 80 }] : []),
     { key: 'totalWeightKg', label: '总重量(kg)', width: 120 },
     { key: 'budgetAmount', label: '预算总价', width: 110 },
     ...([
       { key: 'pickupAt', label: pickupLabel, width: 165 }, { key: 'deliveryAt', label: deliveryLabel, width: 165 },
     ]),
     { key: 'status', label: '状态', width: 130 },
-    { key: 'fleetArrangement', label: '承运安排', width: 190 },
+    ...(!looseboard ? [{ key: 'failureReason', label: '失败 / 拒绝原因', width: 240 }] : []),
+    ...(looseboard
+      ? [{ key: 'fleetArrangement', label: '承运安排', width: 190 }]
+      : [{ key: 'createdAt', label: '创建时间', width: 180 }]),
   ]
 }
 
@@ -98,13 +102,15 @@ const queryModel = computed<QueryModel>({
 
 const queryFields = computed<QueryField[]>(() => [
   { key: 'orderNo', label: '订单号', type: 'input', placeholder: '请输入订单号' },
-  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: props.kind === 'trucking' ? '请输入 B 点或 C 点' : '请输入起运地或目的地' },
+  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: props.kind === 'trucking' ? '请输入取货地或目的地' : '请输入起运地或目的地' },
   {
     key: 'status',
     label: '状态',
     type: 'select',
     placeholder: '全部',
     options: [
+      { label: '订单受理中', value: 'FUNDING_PENDING' },
+      { label: '订单处理失败', value: 'FUNDING_FAILED' },
       { label: '待审核', value: 'PENDING_REVIEW' },
       { label: '已通过', value: 'APPROVED' },
       { label: '已拒绝', value: 'REJECTED' },
@@ -131,7 +137,7 @@ const detailFields = computed(() => {
     ] : [['车辆类型', vehicleTypeLabel(summary.vehicleType)]]),
     [props.kind === 'trucking' ? '取货地' : '起运地', read(summary, 'origin')], [props.kind === 'trucking' ? '取货地址' : '起运地址', current.originAddress],
     [props.kind === 'trucking' ? '送达地' : '目的地', read(summary, 'destination')], [props.kind === 'trucking' ? '送达地址' : '目的地址', current.destinationAddress],
-    ['件数', read(summary, 'packageCount')], ['总重量(kg)', read(summary, 'totalWeightKg')],
+    [props.kind === 'trucking' ? '托数' : '件数', read(summary, props.kind === 'trucking' ? 'palletCount' : 'packageCount')], ['总重量(kg)', read(summary, 'totalWeightKg')],
     ['总体积(m³)', read(summary, 'totalVolumeCbm')], ['预算总价', money(read(summary, 'budgetAmount'), read(summary, 'currency'))],
     [props.kind === 'trucking' ? '取货联系人' : '起运地联系人', summary.originContactName], [props.kind === 'trucking' ? '取货联系电话' : '起运地联系电话', summary.originContactPhone],
     [props.kind === 'trucking' ? '送达联系人' : '目的地联系人', summary.destinationContactName], [props.kind === 'trucking' ? '送达联系电话' : '目的地联系电话', summary.destinationContactPhone],
@@ -144,7 +150,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 +170,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 +270,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 }
 }
 
@@ -281,13 +289,13 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
 </script>
 
 <template>
-  <section v-loading="loading" class="business-orders client-ui" :aria-busy="loading">
+  <section v-loading="loading" class="business-orders client-ui" :class="{ 'business-orders--create': mode === 'create' }" :aria-busy="loading">
-    <header v-if="mode === 'create'" class="page-head" :class="{ 'looseboard-page-head': props.kind === 'looseboard' }">
+    <header v-if="mode === 'create'" class="page-head">
       <div>
         <h2>{{ configuration.title }}下单</h2>
 
       </div>
-      <el-button @click="returnToList">返回列表</el-button>
+      <el-button v-if="kind === 'looseboard'" @click="returnToList">返回列表</el-button>
     </header>
 
     <template v-if="mode === 'list'">
@@ -298,6 +306,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>
@@ -306,8 +315,9 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
     <section v-else-if="mode === 'detail'" class="business-detail-page" aria-label="订单详情">
       <header class="business-detail-heading">
         <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>
+        <div class="business-detail-heading-actions"><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" />
       <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>
@@ -344,7 +354,6 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
 <style scoped>
 .business-orders { display: grid; gap: var(--client-section-gap); }
 .page-head { display: flex; align-items: center; justify-content: space-between; gap: 24px; }
-.looseboard-page-head { max-width: 1180px; padding-right: 30px; box-sizing: border-box; }
 .page-head h2 { margin: 0; color: #111827; font-size: 26px; }
 .page-head p { margin: 7px 0 0; color: #64748b; font-size: 14px; }
 .business-table-card { overflow: hidden; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: #fff; }
@@ -356,6 +365,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
 .business-detail-heading { display: flex; min-height: 50px; align-items: center; justify-content: space-between; gap: 16px; padding: 5px 0; border-bottom: 1px solid var(--border); }
 .business-detail-heading-main { display: flex; min-width: 0; align-items: center; gap: 12px; }
 .business-detail-heading-main > div { min-width: 0; }
+.business-detail-heading-actions { display: flex; align-items: center; gap: 12px; flex: 0 0 auto; }
 .business-detail-heading h2 { margin: 0; overflow: hidden; color: var(--navy); font-size: 18px; text-overflow: ellipsis; white-space: nowrap; }
 .business-detail-heading p { margin: 3px 0 0; color: var(--muted); font-size: 11px; }
 .business-detail-section { margin-top: 10px; }
@@ -369,6 +379,26 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
 .arrangement-grid dt { white-space: normal; overflow-wrap: anywhere; }
 .detail-grid dd { min-width: 0; margin: 0; overflow-wrap: anywhere; color: var(--navy); font-size: 12px; font-weight: 600; line-height: 1.4; }
 .form-card :deep(.el-card__body) { padding: 0; }
+.business-orders--create { --client-action: #2f7bff; --client-action-hover: #1d5fe0; --client-border: #d5dce8; --client-control-height: 44px; --client-font-size: 14px; width: 100%; min-width: 0; gap: 12px; background: #f4f7fc; }
+.business-orders--create .page-head { flex-wrap: wrap; gap: 16px; }
+.business-orders--create .page-head h2 { color: #1f2937; font-weight: 700; }
+.business-orders--create .page-head :deep(.el-button) { height: auto; min-height: 44px; padding: 10px 18px; border-radius: 6px; color: #1d5fe0; font-size: 14px; box-shadow: none; }
+.business-orders--create .form-card { min-width: 0; overflow: visible; border: 0; border-radius: 0; background: transparent; box-shadow: none; }
+
+/* The detail page is intentionally calmer than the list: the order identity is
+   separated from the data grid, while values remain easy to scan at desktop size. */
+.business-detail-page { padding: 18px 20px 24px; border-color: #dbe4ef; border-radius: 10px; box-shadow: 0 2px 8px rgb(15 42 74 / 4%); }
+.business-detail-heading { min-height: 58px; padding: 0 0 14px; border-bottom-color: #e5ebf3; }
+.business-detail-heading-main { gap: 18px; }
+.business-detail-heading-main :deep(.el-button) { padding: 0; font-size: 14px; }
+.business-detail-heading h2 { font-size: 22px; letter-spacing: .01em; }
+.business-detail-section { margin-top: 20px; }
+.business-detail-section h3 { padding: 0 0 10px; border-bottom: 0; font-size: 15px; }
+.detail-grid { border-color: #e2e8f0; }
+.detail-grid div { min-height: 46px; gap: 12px; padding: 8px 14px; background: #fff; border-color: #e2e8f0; }
+.detail-grid dt { color: #718096; font-size: 12px; }
+.detail-grid dd { color: #1f3552; font-size: 14px; font-weight: 600; }
+.arrangement-grid { background: #f8fafc; }
 
 @media (max-width: 767px) {
   .business-orders { gap: 14px; }
@@ -380,6 +410,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
   .detail-grid div, .detail-grid div.is-wide { grid-column: auto; }
   .detail-grid dd { overflow-wrap: break-word; word-break: normal; }
   .business-detail-heading { align-items: flex-start; flex-direction: column; }
+  .business-detail-heading-actions { width: 100%; justify-content: space-between; }
 
   .form-card :deep(.el-form-item) { display: block; }
   .form-card :deep(.el-form-item__label) {

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/ProcurementDecisionDialog.vue

@@ -0,0 +1,97 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, ref, shallowRef } from 'vue'
+import { ElMessage } from 'element-plus'
+import { accessTokenIdentity } from '@/api/session'
+import { useAuthStore } from '@/modules/auth/public'
+import { confirmProcurement, rejectProcurement, getProcurementWorkflow, getProcurementFile, type ProcurementSummary, type ProcurementWorkflow } from '../api/procurement'
+import { procurementRequestKey } from '../procurementSubmission'
+import { dateTime } from '../procurementPresentation'
+
+const props = defineProps<{ order: ProcurementSummary; decision: 'confirm' | 'reject' }>()
+const emit = defineEmits<{ close: []; changed: [] }>()
+const auth = useAuthStore()
+const owner = auth.token ? accessTokenIdentity(auth.token) : null
+const current = () => active && !!owner && owner === (auth.token ? accessTokenIdentity(auth.token) : null)
+const workflow = shallowRef<ProcurementWorkflow | null>(null)
+const loading = ref(false), saving = ref(false), error = ref(''), photoError = ref(''), reason = ref('')
+const photos = ref<Record<string, string>>({})
+const isReject = computed(() => props.decision === 'reject')
+const canSubmit = computed(() => !loading.value && workflow.value?.status === 'WAIT_CUSTOMER_CONFIRM' && auth.hasPermission('merchant:cross-border:procurement:create'))
+let active = true, generation = 0, attempt: { fingerprint: string; key: string } | null = null
+function clearPhotos() { Object.values(photos.value).forEach(url => URL.revokeObjectURL(url)); photos.value = {} }
+async function load() {
+  if (loading.value || saving.value || !current()) return
+  const sequence = ++generation
+  loading.value = true; error.value = ''; photoError.value = ''; workflow.value = null; clearPhotos()
+  try {
+    const result = await getProcurementWorkflow(props.order.orderNo)
+    if (!current() || sequence !== generation) return
+    workflow.value = result
+    if (result.status !== 'WAIT_CUSTOMER_CONFIRM') { error.value = '订单状态已更新，当前不能确认或驳回，请返回列表刷新'; return }
+    const ids = [...new Set(result.receipts.flatMap(receipt => receipt.fileIds))]
+    await Promise.all(ids.map(async id => {
+      try {
+        const blob = await getProcurementFile(props.order.orderNo, id)
+        if (!current() || sequence !== generation) return
+        if (!/^image\/(png|jpeg|gif|webp|bmp)$/i.test(blob.type)) throw new Error('附件不是可预览的收货照片')
+        photos.value[id] = URL.createObjectURL(blob)
+      } catch { if (current() && sequence === generation) photoError.value = '部分收货照片加载失败，请重新加载后核对' }
+    }))
+  } catch (cause) { if (current() && sequence === generation) error.value = cause instanceof Error ? cause.message : '采购结果加载失败' }
+  finally { if (current() && sequence === generation) loading.value = false }
+}
+function fileName(id: string) { return workflow.value?.files?.find(file => file.fileId === id)?.fileName || '收货照片' }
+async function submitDecision() {
+  if (saving.value || !current() || !canSubmit.value || !!photoError.value || !workflow.value) return
+  if (isReject.value && (!reason.value.trim() || reason.value.trim().length > 1000)) { error.value = '请填写驳回原因，最多1000字'; return }
+  const version = workflow.value.version, orderNo = props.order.orderNo
+  const fingerprint = JSON.stringify([owner, orderNo, version, props.decision, isReject.value ? reason.value.trim() : ''])
+  if (attempt?.fingerprint !== fingerprint) attempt = { fingerprint, key: procurementRequestKey() }
+  saving.value = true; error.value = ''
+  try {
+    const data = { version, idempotencyKey: attempt.key }
+    if (isReject.value) await rejectProcurement(orderNo, { ...data, reason: reason.value.trim() })
+    else await confirmProcurement(orderNo, data)
+    if (!current()) return
+    ElMessage.success(isReject.value ? '已驳回，等待平台重新上传照片' : '采购结果已确认')
+    emit('changed')
+  } catch (cause) { if (current()) error.value = cause instanceof Error ? cause.message : '操作失败，请重试' }
+  finally { saving.value = false }
+}
+onBeforeUnmount(() => { active = false; generation++; clearPhotos() })
+void load()
+</script>
+
+<template>
+  <el-dialog :model-value="true" :title="isReject ? '驳回采购结果' : '确认采购结果'" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="!saving" :show-close="!saving" @close="!saving && emit('close')">
+    <div v-loading="loading" class="decision-content">
+      <dl class="decision-quantities"><div><dt>采购单号</dt><dd>{{ order.orderNo }}</dd></div><div><dt>商品名称</dt><dd>{{ order.productName }}</dd></div><div><dt>采购数量</dt><dd>{{ order.purchaseQuantity }} 件</dd></div><div><dt>累计收货数量</dt><dd>{{ workflow?.receivedQuantity ?? '—' }} 件</dd></div></dl>
+      <el-alert v-if="error" :title="error" type="error" :closable="false" />
+      <el-alert v-if="photoError" :title="photoError" type="error" :closable="false" />
+      <el-button v-if="error || photoError" :disabled="saving || loading" @click="load">重新加载</el-button>
+      <div class="decision-batches">
+      <section v-for="(receipt, index) in workflow?.receipts || []" :key="receipt.id" class="decision-batch">
+        <h3>第 {{ index + 1 }} 批：{{ receipt.quantity }} 件 <small>{{ dateTime(receipt.receivedAt) }}</small></h3>
+        <div class="decision-photos"><el-image v-for="id in receipt.fileIds" :key="id" :src="photos[id]" :alt="fileName(id)" :preview-src-list="Object.values(photos)" :initial-index="Object.keys(photos).indexOf(id)" fit="contain" preview-teleported><template #error><span>{{ fileName(id) }}：{{ loading ? '加载中' : '照片未加载' }}</span></template></el-image></div>
+      </section>
+      </div>
+      <p v-if="workflow && !workflow.receipts.length">暂无收货照片</p>
+      <el-form v-if="isReject" label-position="top" :disabled="saving"><el-form-item label="驳回原因" required><el-input v-model="reason" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="请填写采购结果不符合要求的原因" /></el-form-item></el-form>
+      <p v-else>请核对采购数量和收货照片，确认后平台将安排出库。</p>
+    </div>
+    <template #footer><el-button :disabled="saving" @click="emit('close')">取消</el-button><el-button :type="isReject ? 'danger' : 'primary'" :loading="saving" :disabled="!canSubmit || !!photoError" @click="submitDecision">{{ isReject ? '提交驳回' : '确认采购结果' }}</el-button></template>
+  </el-dialog>
+</template>
+
+<style scoped>
+.decision-content { min-height: 160px; }
+.decision-quantities { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; margin: 0 0 16px; }
+.decision-quantities > div { display: flex; gap: 12px; min-width: 0; }
+dt { color: var(--muted); } dd { margin: 0; overflow-wrap: anywhere; }
+.decision-batches { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 16px; margin: 16px 0; }
+.decision-batch { min-width: 0; }
+h3 { margin: 0 0 8px; color: var(--navy); font-size: 14px; } small { display: block; margin-top: 4px; color: var(--muted); font-weight: 400; }
+.decision-photos { display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center; gap: 8px; overflow-x: auto; padding: 2px 0 6px; }
+.decision-photos :deep(.el-image) { flex: 0 0 112px; width: 112px; height: 84px; border: 1px solid var(--border); border-radius: 4px; }
+.decision-photos span { padding: 12px; overflow-wrap: anywhere; }
+</style>

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

@@ -78,6 +78,7 @@ const totals = computed(() => feeTotals(props.detail.fees))
       <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 v-if="detail.order.remark" class="full"><dt>采购备注</dt><dd>{{ detail.order.remark }}</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>

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

@@ -14,6 +14,8 @@ const props = withDefaults(defineProps<{
 const emit = defineEmits<{ submit: []; cancel: [] }>()
 const formRef = ref<FormInstance>()
 const rules = computed(() => transportDemandRules(props.kind, props.model))
+const isCreate = computed(() => !props.editing)
+const createPopperClass = computed(() => isCreate.value ? 'transport-create-popper' : undefined)
 defineExpose({
   validate: () => formRef.value?.validate() ?? Promise.resolve(false),
   clearValidate: (fields?: string | string[]) => formRef.value?.clearValidate(fields),
@@ -21,50 +23,54 @@ defineExpose({
 </script>
 
 <template>
-  <el-form ref="formRef" class="transport-demand-form" :model="model" :rules="rules" label-position="top" :disabled="disabled || submitting">
+  <el-form ref="formRef" class="transport-demand-form" :class="{ 'transport-demand-form--create': isCreate }" :model="model" :rules="rules" label-position="top" :disabled="disabled || submitting">
     <slot name="customer" />
     <section class="transport-demand-section">
       <h3>运输信息</h3>
-      <div class="transport-demand-grid">
+      <div class="transport-demand-grid transport-demand-route-grid">
-        <el-form-item v-if="kind === 'truck'" class="transport-demand-wide" label="车辆类型" prop="vehicleType">
+        <el-form-item v-if="kind === 'truck'" class="transport-demand-wide transport-demand-vehicle" 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-select v-model="model.vehicleType" :popper-class="createPopperClass" :placeholder="isCreate ? '请选择车辆类型' : ''"><el-option label="15拖" value="PALLET_15" /><el-option label="30拖" value="PALLET_30" /></el-select>
         </el-form-item>
         <el-form-item :label="kind === 'truck' ? '取货地' : '起运地'" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
+        <el-form-item v-if="!isCreate" :label="kind === 'truck' ? '送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '取货联系人' : '起运地联系人'" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货联系人' : '起运地联系人'" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" :placeholder="isCreate ? (kind === 'truck' ? '请输入取货联系人姓名' : '请输入起运地联系人姓名') : ''" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '送达联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item v-if="!isCreate" :label="kind === 'truck' ? '送达联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '取货联系电话' : '起运地联系电话'" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货联系电话' : '起运地联系电话'" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" :placeholder="isCreate ? (kind === 'truck' ? '请输入取货联系电话' : '请输入起运地联系电话') : ''" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '送达联系电话' : '目的地联系电话'" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
+        <template v-if="isCreate">
-        <el-form-item :label="kind === 'truck' ? '取货地址' : '起运详细地址'"><el-input v-model.trim="model.originAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+          <el-form-item :label="kind === 'truck' ? '送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '送达地址' : '目的详细地址'"><el-input v-model.trim="model.destinationAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+          <el-form-item :label="kind === 'truck' ? '送达联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" :placeholder="kind === 'truck' ? '请输入送达联系人姓名' : '请输入目的地联系人姓名'" /></el-form-item>
+        </template>
+        <el-form-item :label="kind === 'truck' ? '送达联系电话' : '目的地联系电话'" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" :placeholder="isCreate ? (kind === 'truck' ? '请输入送达联系电话' : '请输入目的地联系电话') : ''" /></el-form-item>
+        <el-form-item class="transport-demand-address" :label="kind === 'truck' ? '取货地址' : '起运详细地址'"><el-input v-model.trim="model.originAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+        <el-form-item class="transport-demand-address" :label="kind === 'truck' ? '送达地址' : '目的详细地址'"><el-input v-model.trim="model.destinationAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
       </div>
     </section>
     <section class="transport-demand-section">
       <h3>货物信息</h3>
-      <div class="transport-demand-grid" :class="kind === 'looseboard' ? 'transport-demand-cargo-four' : 'transport-demand-cargo-three'">
+      <div class="transport-demand-grid" :class="kind === 'looseboard' && !isCreate ? 'transport-demand-cargo-four' : 'transport-demand-cargo-three'">
-        <el-form-item v-if="kind === 'looseboard'" label="商品名称"><el-input v-model.trim="model.productName" maxlength="255" placeholder="" /></el-form-item>
+        <el-form-item v-if="kind === 'looseboard'" label="商品名称"><el-input v-model.trim="model.productName" maxlength="255" :placeholder="isCreate ? '请输入商品名称（选填）' : ''" /></el-form-item>
-        <el-form-item v-if="kind === 'looseboard'" label="预计托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="0" :precision="0" controls-position="right" placeholder="" /></el-form-item>
+        <el-form-item v-if="kind === 'looseboard'" label="预计托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="0" :precision="0" controls-position="right" :placeholder="isCreate ? '请输入预计托数' : ''" /></el-form-item>
-        <el-form-item v-if="kind === 'truck'" label="托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="1" :precision="0" controls-position="right" placeholder="" /></el-form-item>
+        <el-form-item v-if="kind === 'truck'" label="托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="1" :precision="0" controls-position="right" :placeholder="isCreate ? '请输入托数' : ''" /></el-form-item>
-        <el-form-item label="总重量 (kg)" prop="totalWeightKg"><el-input-number v-model="model.totalWeightKg" :min="0" :precision="3" controls-position="right" placeholder="" /></el-form-item>
+        <el-form-item label="总重量 (kg)" prop="totalWeightKg"><el-input-number v-model="model.totalWeightKg" :min="0" :precision="3" controls-position="right" :placeholder="isCreate ? '请输入总重量' : ''" /></el-form-item>
-        <el-form-item label="总体积 (m³)" prop="totalVolumeCbm"><el-input-number v-model="model.totalVolumeCbm" :min="0" :precision="6" controls-position="right" placeholder="" /></el-form-item>
+        <el-form-item label="总体积 (m³)" prop="totalVolumeCbm"><el-input-number v-model="model.totalVolumeCbm" :min="0" :precision="6" controls-position="right" :placeholder="isCreate ? '请输入总体积' : ''" /></el-form-item>
-        <el-form-item v-if="kind === 'looseboard'" label="件数" prop="packageCount"><el-input-number v-model="model.packageCount" :min="0" :precision="0" controls-position="right" placeholder="" /></el-form-item>
+        <el-form-item v-if="kind === 'looseboard'" label="件数" prop="packageCount"><el-input-number v-model="model.packageCount" :min="0" :precision="0" controls-position="right" :placeholder="isCreate ? '请输入件数' : ''" /></el-form-item>
       </div>
     </section>
     <section class="transport-demand-section">
       <h3>费用与时效</h3>
       <div class="transport-demand-grid">
         <el-form-item label="预算总价" prop="budgetAmount"><div class="transport-demand-budget">
-          <el-input-number v-model="model.budgetAmount" :min="0" :precision="2" controls-position="right" placeholder="" />
+          <el-input-number v-model="model.budgetAmount" :min="0" :precision="2" controls-position="right" :placeholder="isCreate ? (kind === 'truck' ? '请输入预算总价' : '请输入预算总价（选填）') : ''" />
-          <el-select v-model="model.currency" aria-label="预算币种" placeholder=""><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select>
+          <el-select v-model="model.currency" :popper-class="createPopperClass" 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="kind === 'truck' ? '取货时间' : '取货时间'" 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' ? '取货时间' : '取货时间'" prop="pickupAt"><el-date-picker v-model="model.pickupAt" :popper-class="createPopperClass" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" :placeholder="isCreate ? '请选择取货日期和时间' : ''" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? '送达时间' : '送货时间'" 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' ? '送达时间' : '送货时间'" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" :popper-class="createPopperClass" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" :placeholder="isCreate ? (kind === 'truck' ? '请选择送达日期和时间' : '请选择送货日期和时间') : ''" /></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>
+        <el-form-item class="transport-demand-wide" label="备注"><el-input v-model="model.remark" type="textarea" :rows="3" maxlength="1000" :show-word-limit="!isCreate" :placeholder="isCreate ? '请输入运输要求或其他补充信息（选填）' : ''" /><span v-if="isCreate" class="transport-demand-character-count">{{ model.remark.length }} / 1000</span></el-form-item>
       </div>
     </section>
     <footer class="transport-demand-actions">
-      <el-button :disabled="submitting" @click="emit('cancel')">取消</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>
@@ -84,4 +90,49 @@ defineExpose({
 .transport-demand-budget { display: grid; width: 100%; grid-template-columns: minmax(0, 1fr) 100px; gap: 10px; }
 .transport-demand-actions { display: flex; justify-content: flex-end; gap: 10px; padding: 18px 24px; }
 .transport-demand-actions :deep(.el-button + .el-button) { margin-left: 0; }
+
+.transport-demand-form--create {
+  --el-component-size: 44px;
+  --el-color-primary: #2f7bff;
+  --el-text-color-regular: #1f2937;
+  --el-text-color-placeholder: #b0b7c3;
+  max-width: none;
+  min-width: 0;
+  background: transparent;
+  color: #1f2937;
+  font: 14px/1.5 "PingFang SC", "Microsoft YaHei", "Noto Sans SC", sans-serif;
+}
+.transport-demand-form--create .transport-demand-section { margin-bottom: 12px; padding: 0; border: 0; }
+.transport-demand-form--create .transport-demand-section h3 { display: flex; align-items: center; gap: 10px; margin: 0 0 10px; color: #1f2937; font-size: 18px; font-weight: 700; }
+.transport-demand-form--create .transport-demand-section h3::before { content: ''; width: 9px; height: 9px; flex: 0 0 9px; border-radius: 50%; background: #2f7bff; }
+.transport-demand-form--create .transport-demand-section:nth-of-type(2) h3::before { background: #0ea5a4; }
+.transport-demand-form--create .transport-demand-grid { min-width: 0; gap: 12px 20px; padding: 16px; border: 1px solid #e3e8f0; border-radius: 10px; background: #fff; }
+.transport-demand-form--create .transport-demand-route-grid { grid-template-columns: repeat(6, minmax(0, 1fr)); }
+.transport-demand-form--create .transport-demand-route-grid > .el-form-item { grid-column: span 2; }
+.transport-demand-form--create .transport-demand-route-grid > .transport-demand-vehicle { grid-column: 1 / -1; }
+.transport-demand-form--create .transport-demand-route-grid > .transport-demand-address { grid-column: span 3; }
+.transport-demand-form--create :deep(.el-form-item) { margin: 0; }
+.transport-demand-form--create .transport-demand-vehicle { width: calc((100% - 40px) / 3); }
+.transport-demand-form--create :deep(.el-form-item__label) { height: auto; margin-bottom: 6px; padding: 0; color: #374151; font-size: 14px; font-weight: 600; line-height: 20px; }
+.transport-demand-form--create :deep(.el-form-item.is-required .el-form-item__label::before) { color: #e5484d; }
+/* Show validation beside the label without adding height below the control. */
+.transport-demand-form--create :deep(.el-form-item__content) { min-width: 0; line-height: 20px; }
+.transport-demand-form--create :deep(.el-form-item__error) { position: absolute; top: auto; bottom: calc(100% + 6px); right: 0; left: auto; width: auto; max-width: calc(100% - 120px); padding: 0; font-size: 12px; line-height: 20px; text-align: right; }
+.transport-demand-form--create :deep(.el-input__wrapper), .transport-demand-form--create :deep(.el-select__wrapper), .transport-demand-form--create :deep(.el-textarea__inner) { border: 1px solid #d5dce8; border-radius: 6px; background: #fff; box-shadow: none; font-family: inherit; font-size: 14px; }
+.transport-demand-form--create :deep(.el-input__wrapper), .transport-demand-form--create :deep(.el-select__wrapper) { min-height: 44px; padding: 10px 14px; }
+.transport-demand-form--create :deep(.el-input__inner) { height: 22px; color: #1f2937; line-height: 22px; }
+.transport-demand-form--create :deep(.el-input-number .el-input__wrapper) { padding-right: 40px; }
+.transport-demand-form--create :deep(.el-input-number.is-controls-right .el-input-number__increase), .transport-demand-form--create :deep(.el-input-number.is-controls-right .el-input-number__decrease) { width: 32px; }
+.transport-demand-form--create :deep(.el-textarea__inner) { min-height: 110px; padding: 11px 14px; color: #1f2937; line-height: 20px; resize: vertical; }
+.transport-demand-form--create :deep(.el-input__inner::placeholder), .transport-demand-form--create :deep(.el-textarea__inner::placeholder) { color: var(--el-text-color-placeholder); opacity: 1; }
+.transport-demand-form--create :deep(.el-input__wrapper.is-focus), .transport-demand-form--create :deep(.el-select__wrapper.is-focused), .transport-demand-form--create :deep(.el-textarea__inner:focus) { outline: 2px solid #2f7bff; outline-offset: 0; }
+.transport-demand-form--create :deep(.el-form-item.is-error .el-input__wrapper), .transport-demand-form--create :deep(.el-form-item.is-error .el-select__wrapper), .transport-demand-form--create :deep(.el-form-item.is-error .el-textarea__inner) { border-color: #e5484d; box-shadow: none; }
+.transport-demand-form--create :deep(.el-input.is-disabled .el-input__wrapper), .transport-demand-form--create :deep(.el-select__wrapper.is-disabled), .transport-demand-form--create :deep(.el-textarea.is-disabled .el-textarea__inner) { background: #f6f9ff; }
+.transport-demand-form--create :deep(.el-input.is-disabled .el-input__inner), .transport-demand-form--create :deep(.el-textarea.is-disabled .el-textarea__inner) { color: #98a2b3; -webkit-text-fill-color: #98a2b3; }
+.transport-demand-character-count { width: 100%; margin-top: 4px; color: #6b7280; font-size: 13px; text-align: right; }
+.transport-demand-form--create .transport-demand-actions { flex-wrap: wrap; gap: 12px; padding: 0; }
+.transport-demand-form--create .transport-demand-actions :deep(.el-button) { height: auto; min-height: 44px; margin-left: 0; padding: 10px 18px; border-radius: 6px; color: #1d5fe0; font-size: 14px; box-shadow: none; }
+.transport-demand-form--create .transport-demand-actions :deep(.el-button--primary) { padding: 12px 28px; color: #fff; }
+.transport-demand-form--create .transport-demand-actions :deep(.el-button.is-disabled) { color: #98a2b3; }
+:global(.transport-create-popper.el-popper) { --el-color-primary: #2f7bff; border: 1px solid #d5dce8; box-shadow: none; }
 </style>

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

@@ -0,0 +1,95 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import { runInNewContext } from 'node:vm'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./components/OrderFundingStatus.vue', import.meta.url), 'utf8')
+const script = source.match(/<script setup lang="ts">([\s\S]*?)<\/script>/)[1].replace(/^import .*$/gm, '')
+function harness({ status = 'FUNDING_PENDING', read = async () => ({ status: 'FREEZE_PENDING' }), retry = async () => ({}), detail = async () => ({}) } = {}) {
+  const props = { kind: 'procurement', orderNo: 'CG1', status, canRetry: true }
+  const timers = new Map(), events = [], hooks = {}
+  let nextTimer = 0
+  const context = {
+    defineProps: () => props, defineEmits: () => event => events.push(event), ref: value => ({ value }),
+    watch: (_getter, callback) => { hooks.watch = callback },
+    onBeforeUnmount: callback => { hooks.unmount = callback },
+    onActivated: callback => { hooks.activate = callback },
+    onDeactivated: callback => { hooks.deactivate = callback },
+    setTimeout: callback => { const id = ++nextTimer; timers.set(id, callback); return id },
+    clearTimeout: id => timers.delete(id), readOrderFunding: read, retryOrderFunding: retry, getBusinessOrder: detail,
+  }
+  const compiled = ts.transpileModule(script, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const api = runInNewContext(`${compiled}\n({check, retry, message, busy})`, context)
+  return { ...api, props, timers, events, hooks }
+}
+
+test('truck rejection uses latest review reason and never customer remarks', async () => {
+  const h = harness({ status: 'REJECTED', detail: async () => ({ remark: '客户备注', histories: [
+    { operationType: 'REVIEW', toStatus: 'REJECTED', remark: '旧原因' },
+    { operationType: 'REVIEW', toStatus: 'REJECTED', remark: '路线暂不支持' },
+    { operationType: 'UPDATE', toStatus: 'REJECTED', remark: '内部修改' },
+  ] }) })
+  h.props.kind = 'trucking'
+  await h.check(0, 0)
+  assert.equal(h.message.value, '路线暂不支持')
+  assert.equal(h.timers.size, 0)
+  const missing = harness({ status: 'REJECTED', detail: async () => ({ remark: '客户备注' }) })
+  missing.props.kind = 'trucking'; await missing.check(0, 0)
+  assert.equal(missing.message.value, '未填写拒绝原因')
+})
+
+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' } } })
+  await h.check(0, 0)
+  assert.equal(h.timers.size, 1)
+  for (let i = 1; i <= 30; i++) {
+    const [id, callback] = h.timers.entries().next().value
+    h.timers.delete(id); callback(); await new Promise(resolve => setImmediate(resolve))
+  }
+  assert.equal(count, 31)
+  assert.equal(h.timers.size, 0)
+  assert.equal(h.events.length, 0)
+  for (const status of ['FROZEN', 'FAILED']) {
+    const terminal = harness({ read: async () => ({ status, message: '余额不足' }) })
+    await terminal.check(0, 0)
+    assert.equal(terminal.events.join(','), 'changed')
+    assert.equal(terminal.timers.size, 0)
+  }
+})
+
+test('retry keeps original order and suppresses double clicks and stale responses', async () => {
+  let resolve, calls = 0
+  const h = harness({ status: 'FUNDING_FAILED', retry: (kind, no) => {
+    calls++; assert.equal(kind, 'procurement'); assert.equal(no, 'CG1')
+    return new Promise(done => { resolve = done })
+  } })
+  const first = h.retry(); await h.retry()
+  assert.equal(calls, 1)
+  h.hooks.deactivate(); resolve({}); await first
+  assert.equal(h.events.length, 0)
+  const denied = harness({ status: 'FUNDING_FAILED', retry: async () => { throw new Error('should not call') } })
+  denied.props.canRetry = false; await denied.retry()
+  assert.equal(denied.message.value, '')
+})
+
+test('switching or leaving an order ignores the old funding result', async () => {
+  let resolve
+  const h = harness({ read: () => new Promise(done => { resolve = done }) })
+  const pending = h.check(0, 0)
+  h.hooks.unmount(); resolve({ status: 'FAILED', message: 'old order' }); await pending
+  assert.equal(h.message.value, '')
+  assert.equal(h.events.length, 0)
+  assert.equal(h.timers.size, 0)
+})
+
+test('failed orders display finance reason and refresh when another session retries', async () => {
+  const failed = harness({ status: 'FUNDING_FAILED', read: async () => ({ status: 'FAILED', message: '可用余额及授信不足' }) })
+  await failed.check(0, 0)
+  assert.equal(failed.message.value, '可用余额及授信不足')
+  assert.equal(failed.events.length, 0)
+  const retried = harness({ status: 'FUNDING_FAILED' })
+  await retried.check(0, 0)
+  assert.equal(retried.events.join(','), 'changed')
+})

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

@@ -1,10 +1,14 @@
 import assert from 'node:assert/strict'
 import test from 'node:test'
 import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
 import { runInNewContext } from 'node:vm'
 import ts from 'typescript'
 import * as vue from 'vue'
 import { parse, compileScript } from 'vue/compiler-sfc'
+import { renderToString } from 'vue/server-renderer'
+
+const { default: Schema } = createRequire(import.meta.resolve('element-plus'))('async-validator')
 
 let nextKey = 0
 const crypto = { randomUUID: () => `test-key-${++nextKey}` }
@@ -21,7 +25,7 @@ const submission = moduleFrom(readFileSync(new URL('./procurementSubmission.ts',
 })
 const normalized = value => JSON.parse(JSON.stringify(value))
 const draft = () => ({ ...presentation.emptyProcurementDraft(), purchaseCategory: 'Sample', productName: 'Test product', productSpecification: 'A',
-  purchaseQuantity: '3', budgetUnitPrice: '0.29', receivingAddress: '测试省测试市测试街 1 号', contactName: '测试收件人', contactPhone: '13800000000' })
+  productUrl: 'https://example.com/product', purchaseQuantity: '3', budgetUnitPrice: '0.29', receivingAddress: '测试省测试市测试街 1 号', contactName: '测试收件人', contactPhone: '13800000000' })
 const fee = (purpose, walletStatus, amount) => ({ purpose, walletStatus, amount, currency: 'CNY' })
 
 test('budget distinguishes unknown from zero, preserves cents, and requires a real telephone/address', () => {
@@ -60,6 +64,27 @@ test('new requests get unique keys without restoring stored submissions', () =>
 
 class ApiError extends Error { constructor(message, code, status) { super(message); this.code = code; this.status = status } }
 const flush = async () => { await vue.nextTick(); await new Promise(resolve => setImmediate(resolve)); await vue.nextTick() }
+
+test('shows only the active procurement rejection, hiding it after reupload, resubmission and confirmation', async () => {
+  const source = readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8')
+  const template = source.match(/<el-alert\b[^>]*title="采购结果驳回原因"[^>]*\/>/)?.[0]
+  assert.ok(template)
+  for (const [status, photosNeedUpdate, rejectionReason, visible] of [
+    ['RECEIVING', true, '照片不清晰', true],
+    ['RECEIVING', false, '照片不清晰', true],
+    ['RECEIVING', false, null, false],
+    ['WAIT_CUSTOMER_CONFIRM', true, '照片不清晰', false],
+    ['CONFIRMED', true, '照片不清晰', false],
+    ['RECEIVING', true, null, false],
+  ]) {
+    const app = vue.createSSRApp({ render: vue.compile(template), setup: () => ({ workflow: { status, photosNeedUpdate, rejectionReason } }) })
+    app.component('ElAlert', { props: ['title', 'description'], setup: props => () => vue.h('aside', `${props.title} ${props.description}`) })
+    const html = await renderToString(app)
+    assert.equal(html.includes('采购结果驳回原因'), visible, `${status}, photosNeedUpdate=${photosNeedUpdate}`)
+    assert.equal(html.includes('照片不清晰'), visible)
+  }
+})
+
 function viewHarness({ createPage = false, detailPage = false, api = {}, storage = new Map() } = {}) {
   const props = vue.reactive({ createPage, detailPage })
   const route = vue.reactive({ params: { orderNo: detailPage ? 'PO-1' : '' } })
@@ -86,9 +111,37 @@ function viewHarness({ createPage = false, detailPage = false, api = {}, storage
   }
   runInNewContext(ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText, context)
   const state = context.exports.default.setup(props, { expose: () => {} })
+  state.formRef.value = {
+    validate: async () => { await new Schema(state.formRules).validate(state.form); return true },
+    clearValidate: () => {},
+  }
   return { state, props, route, auth, pushes, storage, dispose: () => dispose.forEach(callback => callback()) }
 }
 
+test('procurement required fields validate individually and blank submissions never call the API', async () => {
+  const calls = []
+  const harness = viewHarness({ createPage: true, api: { createProcurement: async payload => { calls.push(payload); return { order: { orderNo: 'PO-VALID' } } } } })
+  try {
+    const fields = ['procurementDirection', 'productName', 'productUrl', 'purchaseQuantity', 'budgetUnitPrice', 'currency', 'contactName', 'contactPhone', 'receivingAddress']
+    const source = readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8')
+    for (const field of fields) {
+      assert.match(source, new RegExp(`<el-form-item[^>]*prop="${field}"`))
+      const schema = new Schema({ [field]: harness.state.formRules[field] })
+      await assert.rejects(schema.validate({ [field]: '' }), error => Boolean(error.fields[field]))
+    }
+    await assert.rejects(new Schema(harness.state.formRules).validate({ ...draft(), productName: '   ' }))
+    await harness.state.submit()
+    assert.equal(calls.length, 0)
+    assert.equal(harness.state.submitting.value, false)
+    assert.equal(harness.state.submitError.value, '')
+    Object.assign(harness.state.form, draft(), { budgetUnitPrice: '0' })
+    await harness.state.submit()
+    assert.equal(calls.length, 1)
+    assert.equal(calls[0].budgetUnitPrice, 0)
+    assert.deepEqual(normalized(harness.pushes), [{ name: 'cross-border-procurement' }])
+  } finally { harness.dispose() }
+})
+
 test('create summary follows the current form, preserves cents and clears with the draft', () => {
   const harness = viewHarness({ createPage: true })
   try {
@@ -166,7 +219,7 @@ test('submission double-click sends once and definitive validation rejection per
   let reject, calls = 0
   const harness = viewHarness({ createPage: true, api: { createProcurement: () => { calls++; return new Promise((_, failure) => { reject = failure }) } } })
   try {
-    Object.assign(harness.state.form, draft()); const first = harness.state.submit(); await harness.state.submit(); assert.equal(calls, 1)
+    Object.assign(harness.state.form, draft()); const first = harness.state.submit(); await harness.state.submit(); await flush(); assert.equal(calls, 1)
     reject(new ApiError('invalid', 'A0422')); await first
     assert.equal(harness.state.submitting.value, false); assert.equal(harness.storage.size, 0)
   } finally { harness.dispose() }
@@ -220,44 +273,71 @@ test('domestic purchase creates an export order and displays the actual origin a
 })
 
 
-test('customer confirms with current workflow version and double-click only sends once', async () => {
+test('unchanged create retries reuse the idempotency key', async () => {
-  let resolve, calls = []
+  const calls = []
-  const harness = viewHarness({ detailPage: true, api: { confirmProcurement: (orderNo, payload) => {
+  const harness = viewHarness({ createPage: true, api: { createProcurement: async payload => { calls.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
-    calls.push({ orderNo, ...payload }); return new Promise(done => { resolve = done })
-  } } })
   try {
-    await flush()
+    Object.assign(harness.state.form, draft()); await harness.state.submit(); await harness.state.submit()
-    const first = harness.state.confirmReceived(); await flush(); await harness.state.confirmReceived()
+    assert.equal(calls[0].idempotencyKey, calls[1].idempotencyKey)
-    assert.equal(calls.length, 1); assert.equal(calls[0].version, 1); assert.equal(calls[0].orderNo, 'PO-1')
+    assert.equal(harness.pushes.length, 0)
-    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 () => {
+test('a lost create response recovers the original order after review releases its budget', async () => {
-  const harness = viewHarness({ detailPage: true, api: { confirmProcurement: async () => { throw new ApiError('版本已更新，请刷新', 'A0409') } } })
+  for (const status of ['RELEASE_PENDING', 'RELEASED', 'RELEASE_FAILED']) {
-  try {
+    const budgetCalls = [], createCalls = []
-    await flush(); await harness.state.confirmReceived()
+    let boundOrder = null
-    assert.equal(harness.state.workflow.value.status, 'WAIT_CUSTOMER_CONFIRM')
+    const budgets = moduleFrom(readFileSync(new URL('./api/orderBudgets.ts', import.meta.url), 'utf8'), name => {
-    assert.equal(harness.state.confirming.value, false); assert.equal(harness.state.confirmError.value, '版本已更新，请刷新')
+      assert.equal(name, '@/api/http')
-  } finally { harness.dispose() }
+      return { apiRequest: async request => {
+        budgetCalls.push(normalized(request))
+        return { status, usable: false, orderNo: boundOrder, message: '本次资金预占已释放' }
+      } }
+    })
+    const harness = viewHarness({ createPage: true, api: {
+      requireOrderBudget: async (...args) => { budgetCalls.push(args); throw new Error('创建订单不应调用旧资金预占接口') },
+      createProcurement: async payload => {
+        createCalls.push(normalized(payload))
+        if (!boundOrder) { boundOrder = 'CG-EXISTING'; throw new ApiError('timeout', 'TIMEOUT') }
+        assert.equal(payload.idempotencyKey, createCalls[0].idempotencyKey)
+        return { order: { orderNo: boundOrder, status: 'REJECTED' } }
+      },
+    } })
+    try {
+      Object.assign(harness.state.form, draft())
+      await harness.state.submit()
+      assert.equal(harness.state.submitError.value, 'timeout')
+      const funding = await budgets.readOrderFunding('procurement', boundOrder)
+      assert.equal(funding.status, status)
+      assert.equal(funding.usable, false)
+      await harness.state.submit()
+      assert.equal(createCalls.length, 2, status)
+      assert.deepEqual(budgetCalls, [{ method: 'GET', url: '/merchant/v1/last-leg/order-budgets/procurement/orders/CG-EXISTING' }])
+      assert.equal(harness.state.submitError.value, '')
+      assert.equal(harness.state.submittedOrder.value, 'CG-EXISTING')
+      assert.equal(harness.pushes[0].name, 'cross-border-procurement')
+      await harness.state.submit()
+      assert.equal(createCalls.length, 2)
+    } finally { harness.dispose() }
+  }
 })
 
-
+test('funding APIs preserve server results and retry the same order only when requested', async () => {
-test('unknown create and confirmation results reuse idempotency keys for unchanged retries', async () => {
+  for (const kind of ['procurement', 'trucking']) for (const status of ['FREEZE_PENDING', 'FROZEN', 'RELEASE_PENDING', 'RELEASED', 'RELEASE_FAILED', 'FAILED']) {
-  const creates = [], confirms = []
+    const calls = []
-  const create = viewHarness({ createPage: true, api: { createProcurement: async payload => { creates.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
+    const result = { status, usable: false, orderNo: 'CG/EXISTING', message: '资金校验失败' }
-  const confirm = viewHarness({ detailPage: true, api: { confirmProcurement: async (_, payload) => { confirms.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
+    const budgets = moduleFrom(readFileSync(new URL('./api/orderBudgets.ts', import.meta.url), 'utf8'), name => {
-  try {
+      assert.equal(name, '@/api/http')
-    Object.assign(create.state.form, draft()); await create.state.submit(); await create.state.submit()
+      return { apiRequest: async request => { calls.push(normalized(request)); return result } }
-    assert.equal(creates[0].idempotencyKey, creates[1].idempotencyKey)
+    })
-    await flush(); await confirm.state.confirmReceived(); await confirm.state.confirmReceived()
+    assert.deepEqual(await budgets.readOrderFunding(kind, result.orderNo), result)
-    assert.equal(confirms[0].idempotencyKey, confirms[1].idempotencyKey)
+    assert.deepEqual(calls, [{ method: 'GET', url: `/merchant/v1/last-leg/order-budgets/${kind}/orders/CG%2FEXISTING` }])
-  } finally { create.dispose(); confirm.dispose() }
+    await budgets.retryOrderFunding(kind, result.orderNo)
+    assert.deepEqual(calls[1], { method: 'POST', url: `/merchant/v1/last-leg/order-budgets/${kind}/orders/CG%2FEXISTING/retry` })
+    assert.equal(calls.length, 2)
+  }
 })
 
-
 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')), '账单结算 · 待审核')
@@ -268,25 +348,48 @@ test('bill-settled manual fees show review results without counting a balance de
 })
 
 
-test('insufficient balance and credit blocks procurement creation and preserves the draft', async () => {
+test('procurement creates immediately while funding is asynchronous and exposes funding states', async () => {
   let creates = 0
-  const harness = viewHarness({ createPage: true, api: { requireOrderBudget: async () => { throw new Error('余额及授信不足') }, createProcurement: async () => { creates++ } } })
+  const harness = viewHarness({ createPage: true, api: { createProcurement: async () => { creates++; return { order: { orderNo: 'CG-PENDING', status: 'FUNDING_PENDING' } } } } })
   try {
     Object.assign(harness.state.form, draft()); await harness.state.submit()
-    assert.equal(creates, 0); assert.equal(harness.state.submitError.value, '余额及授信不足')
+    assert.equal(creates, 1); assert.equal(harness.state.submitError.value, '')
-    assert.equal(harness.state.form.productName, draft().productName)
+    assert.equal(harness.state.submittedOrder.value, 'CG-PENDING')
+    assert.equal(presentation.statusLabel('FUNDING_PENDING'), '订单受理中')
+    assert.equal(presentation.statusLabel('FUNDING_FAILED'), '订单处理失败')
   } finally { harness.dispose() }
 })
 
-test('customer rejection requires a reason and carries current order version', async () => {
+test('confirmation and rejection are list actions only while waiting for customer confirmation', async () => {
-  const calls = []
+  let status = 'WAIT_CUSTOMER_CONFIRM'
-  const harness = viewHarness({ detailPage: true, api: { rejectProcurement: async (orderNo, command) => { calls.push({ orderNo, ...command }); return { orderNo, status: 'RECEIVING', version: 2, rejectionReason: command.reason } } } })
+  const harness = viewHarness({ api: { listProcurements: async () => ({ records: [{ orderNo: 'PO-1', status, purchaseQuantity: 10 }], total: 1 }) } })
   try {
-    await flush(); await harness.state.rejectReceived()
+    await flush()
-    assert.equal(calls.length, 1); assert.equal(calls[0].orderNo, 'PO-1'); assert.equal(calls[0].version, 1)
+    const actions = harness.state.rowActions(harness.state.rows.value[0])
-    assert.equal(calls[0].reason, '照片不清晰'); assert.equal(harness.state.workflow.value.status, 'RECEIVING')
+    assert.deepEqual(normalized(actions.map(action => action.key)), ['detail', 'reject', 'confirm'])
+    actions[1].run(); assert.equal(harness.state.decision.value, 'reject')
+    assert.equal(harness.state.decisionTarget.value.orderNo, 'PO-1')
+    status = 'CONFIRMED'; harness.state.decisionChanged(); await flush()
+    assert.equal(harness.state.decisionTarget.value, null)
+    assert.deepEqual(normalized(harness.state.rowActions(harness.state.rows.value[0]).map(action => action.key)), ['detail'])
+    harness.auth.hasPermission = () => false
+    assert.equal(harness.state.rowActions({ orderNo: 'PO-1', status: 'WAIT_CUSTOMER_CONFIRM' }).length, 1)
+    const source = readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8')
+    const detailHeader = source.slice(source.indexOf('<header class="procurement-heading">'), source.indexOf('</header>', source.indexOf('<header class="procurement-heading">')))
+    assert.doesNotMatch(detailHeader, /确认采购结果|驳回/)
+  } finally { harness.dispose() }
+})
+
+test('product links must be nonblank and use HTTP or HTTPS before budget reservation', async () => {
+  for (const productUrl of ['', '   ', 'javascript:alert(1)', 'invalid', 'https://' ]) {
+    assert.throws(() => presentation.buildProcurementCreate({ ...draft(), productUrl }, 'Company', 'key'), /商品链接/)
+  }
+  let budgets = 0, creates = 0
+  const harness = viewHarness({ createPage: true, api: { requireOrderBudget: async () => { budgets++ }, createProcurement: async () => { creates++ } } })
+  try {
+    for (const productUrl of ['', '   ']) {
+      Object.assign(harness.state.form, draft(), { productUrl }); await harness.state.submit()
+    }
+    assert.equal(budgets, 0); assert.equal(creates, 0); assert.equal(harness.pushes.length, 0)
   } finally { harness.dispose() }
-  const blank = viewHarness({ detailPage: true, api: { rejectionReason: '   ', rejectProcurement: async () => { throw new Error('不得发送空原因') } } })
-  try { await flush(); await blank.state.rejectReceived(); assert.match(blank.state.confirmError.value, /请填写驳回原因/) }
-  finally { blank.dispose() }
 })

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

@@ -0,0 +1,138 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import { runInNewContext } from 'node:vm'
+import ts from 'typescript'
+import * as vue from 'vue'
+import { parse, compileScript } from 'vue/compiler-sfc'
+
+const source = readFileSync(new URL('./components/ProcurementDecisionDialog.vue', import.meta.url), 'utf8')
+const { descriptor } = parse(source)
+const code = ts.transpileModule(compileScript(descriptor, { id: 'decision-test' }).content, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText
+const flush = async () => { await vue.nextTick(); await new Promise(resolve => setImmediate(resolve)); await vue.nextTick() }
+let key = 0
+function harness({ decision = 'confirm', api = {} } = {}) {
+  const props = vue.reactive({ order: { orderNo: 'PO-1', productName: '商品', purchaseQuantity: 10 }, decision })
+  const auth = vue.reactive({ token: 'customer-A', hasPermission: () => true })
+  const calls = [], events = [], disposers = [], created = [], revoked = []
+  const workflow = { orderNo: 'PO-1', status: 'WAIT_CUSTOMER_CONFIRM', version: 7, receivedQuantity: 8, files: [{ fileId: 'F-1', fileName: 'photo.png' }], receipts: [{ id: 'R-1', quantity: 5, fileIds: ['F-1'], receivedAt: '' }, { id: 'R-2', quantity: 3, fileIds: ['F-2'], receivedAt: '' }] }
+  const defaults = {
+    getProcurementWorkflow: async () => workflow,
+    getProcurementFile: async () => ({ type: 'image/png' }),
+    confirmProcurement: async (orderNo, payload) => { calls.push({ orderNo, ...payload }); return { ...workflow, status: 'CONFIRMED' } },
+    rejectProcurement: async (orderNo, payload) => { calls.push({ orderNo, ...payload }); return { ...workflow, status: 'RECEIVING' } },
+  }
+  const context = { exports: {}, Error, URL: { createObjectURL: () => { const url = `blob:${created.length}`; created.push(url); return url }, revokeObjectURL: url => revoked.push(url) }, require(name) {
+    if (name === 'vue') return { ...vue, onBeforeUnmount: callback => disposers.push(callback) }
+    if (name === 'element-plus') return { ElMessage: { success: () => {} } }
+    if (name === '@/api/session') return { accessTokenIdentity: token => token }
+    if (name === '@/modules/auth/public') return { useAuthStore: () => auth }
+    if (name === '../api/procurement') return { ...defaults, ...api }
+    if (name === '../procurementSubmission') return { procurementRequestKey: () => `key-${++key}` }
+    if (name === '../procurementPresentation') return { dateTime: value => value }
+    throw new Error(`unexpected import ${name}`)
+  } }
+  runInNewContext(code, context)
+  const state = context.exports.default.setup(props, { expose: () => {}, emit: (...args) => events.push(args) })
+  return { state, auth, calls, events, created, revoked, workflow, dispose: () => disposers.forEach(callback => callback()) }
+}
+
+test('both decisions load receipt photos and batch quantities with preview URL cleanup', async () => {
+  for (const decision of ['confirm', 'reject']) {
+    const h = harness({ decision })
+    try {
+      await flush()
+      assert.equal(h.state.workflow.value.receivedQuantity, 8)
+      assert.equal(h.state.workflow.value.receipts.length, 2)
+      assert.equal(Object.keys(h.state.photos.value).length, 2)
+      assert.equal(h.state.canSubmit.value, true)
+      assert.equal(h.state.fileName('F-1'), 'photo.png')
+      assert.match(source, /order.purchaseQuantity/)
+      assert.match(source, /receipt.quantity/)
+      assert.match(source, /<el-image/)
+      assert.match(source, /preview-src-list/)
+    } finally { h.dispose() }
+    assert.deepEqual(h.revoked, h.created)
+  }
+})
+
+test('confirmation uses current version, prevents double submits, and signals list refresh', async () => {
+  let finish, calls = []
+  const h = harness({ api: { confirmProcurement: (orderNo, command) => { calls.push({ orderNo, ...command }); return new Promise(resolve => { finish = resolve }) } } })
+  try {
+    await flush()
+    const pending = h.state.submitDecision(); await h.state.submitDecision()
+    assert.equal(calls.length, 1); assert.equal(calls[0].version, 7); assert.equal(calls[0].orderNo, 'PO-1')
+    finish({ status: 'CONFIRMED' }); await pending
+    assert.deepEqual(h.events, [['changed']])
+  } finally { h.dispose() }
+})
+
+test('rejection requires a trimmed reason and retries unchanged payload with the same key', async () => {
+  const calls = []
+  const h = harness({ decision: 'reject', api: { rejectProcurement: async (orderNo, command) => { calls.push({ orderNo, ...command }); throw new Error('网络失败') } } })
+  try {
+    await flush()
+    for (const reason of ['', '   ', 'x'.repeat(1001)]) {
+      h.state.reason.value = reason; await h.state.submitDecision()
+      assert.match(h.state.error.value, /请填写驳回原因/)
+    }
+    assert.equal(calls.length, 0)
+    h.state.reason.value = ' 照片不清晰 '
+    await h.state.submitDecision(); await h.state.submitDecision()
+    assert.equal(calls.length, 2); assert.equal(calls[0].reason, '照片不清晰'); assert.equal(calls[0].version, 7)
+    assert.equal(calls[0].idempotencyKey, calls[1].idempotencyKey)
+    assert.equal(h.state.reason.value, ' 照片不清晰 '); assert.equal(h.events.length, 0)
+    h.state.reason.value = '数量不符'; await h.state.submitDecision()
+    assert.notEqual(calls[1].idempotencyKey, calls[2].idempotencyKey)
+  } finally { h.dispose() }
+})
+
+test('confirmation retry preserves the loaded evidence and idempotency key', async () => {
+  const calls = []
+  const h = harness({ api: { confirmProcurement: async (_, command) => { calls.push(command); throw new Error('版本已更新，请刷新') } } })
+  try {
+    await flush(); await h.state.submitDecision(); await h.state.submitDecision()
+    assert.equal(calls.length, 2); assert.equal(calls[0].idempotencyKey, calls[1].idempotencyKey)
+    assert.equal(h.state.workflow.value.version, 7); assert.equal(Object.keys(h.state.photos.value).length, 2)
+    assert.equal(h.state.saving.value, false); assert.equal(h.events.length, 0)
+  } finally { h.dispose() }
+})
+
+test('successful rejection sends the trimmed reason and signals list refresh', async () => {
+  const h = harness({ decision: 'reject' })
+  try {
+    await flush(); h.state.reason.value = ' 数量不符 '; await h.state.submitDecision()
+    assert.equal(h.calls[0].reason, '数量不符'); assert.equal(h.calls[0].version, 7)
+    assert.deepEqual(h.events, [['changed']])
+  } finally { h.dispose() }
+})
+
+test('photo loading failures can be retried before a decision is submitted', async () => {
+  let fail = true
+  const h = harness({ api: { getProcurementFile: async () => { if (fail) throw new Error('failed'); return { type: 'image/png' } } } })
+  try {
+    await flush(); await h.state.submitDecision()
+    assert.equal(h.calls.length, 0); assert.match(h.state.photoError.value, /照片加载失败/)
+    fail = false; await h.state.load(); await h.state.submitDecision()
+    assert.equal(h.calls.length, 1)
+  } finally { h.dispose() }
+})
+
+test('stale status, revoked permission and changed account cannot submit decisions', async () => {
+  const stale = harness({ api: { getProcurementWorkflow: async () => ({ status: 'CONFIRMED', receipts: [] }) } })
+  try { await flush(); await stale.state.submitDecision(); assert.equal(stale.calls.length, 0) } finally { stale.dispose() }
+  const h = harness()
+  try {
+    await flush(); h.auth.hasPermission = () => false; await h.state.submitDecision(); assert.equal(h.calls.length, 0)
+    h.auth.hasPermission = () => true; h.auth.token = 'customer-B'; await h.state.submitDecision(); assert.equal(h.calls.length, 0)
+  } finally { h.dispose() }
+})
+
+test('late photo responses after closing do not allocate preview URLs', async () => {
+  const pending = []
+  const h = harness({ api: { getProcurementFile: () => new Promise(resolve => pending.push(resolve)) } })
+  await flush(); h.dispose()
+  pending.forEach(resolve => resolve({ type: 'image/png' })); await flush()
+  assert.equal(h.created.length, 0); assert.equal(h.events.length, 0)
+})

src/modules/cross-border/procurementPresentation.ts

@@ -1,9 +1,9 @@
 import type { Amount, ProcurementCreate, ProcurementFee } from './api/procurement'
 
 export const procurementStatuses: Record<string, string> = {
-  PENDING_REVIEW: '待审核', RECEIVING: '收货中', WAIT_CUSTOMER_CONFIRM: '待客户确认', CONFIRMED: '已确认',
+  FUNDING_PENDING: '订单受理中', FUNDING_FAILED: '订单处理失败', PENDING_REVIEW: '待审核', RECEIVING: '收货中', WAIT_CUSTOMER_CONFIRM: '待客户确认', CONFIRMED: '已确认',
   IN_TRANSIT: '运输中', DELIVERING: '派送中', COMPLETED: '签收完成',
-  REJECTED: '已拒绝', CANCELLED: '已取消', EXCEPTION_CLOSED: '异常关闭',
+  REJECTED: '已拒绝', CANCELLED: '已取消',
 }
 export const feePurposes: Record<string, string> = {
   SAMPLE_PAYMENT: '样品货款', INTERNATIONAL_ESTIMATE: '预估国际运费', INTERNATIONAL_FREIGHT: '实际国际运费',
@@ -12,7 +12,7 @@ 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 === 'COMPLETED' || status === 'CONFIRMED') return 'success'
-  if (status === 'REJECTED' || status === 'EXCEPTION_CLOSED') return 'danger'
+  if ((status === 'REJECTED' || status === 'FUNDING_FAILED')) return 'danger'
   if (status === 'CANCELLED') return 'info'
   if (status === 'IN_TRANSIT' || status === 'DELIVERING') return 'primary'
   return 'warning'
@@ -122,7 +122,8 @@ export function buildProcurementCreate(draft: ProcurementDraft, customerName: st
   if (price > BigInt(Number.MAX_SAFE_INTEGER) || cents(Number(decimal(price))) !== price) throw new Error('预算金额过大，无法准确表示，请核对金额')
   if (!['CNY', 'USD'].includes(draft.currency)) throw new Error('预算币种只支持 CNY 或 USD')
   if (!/^[+0-9][0-9 ()-]{5,63}$/.test(draft.contactPhone.trim())) throw new Error('请填写快递可联系的电话号码，微信或邮箱不能代替电话')
-  if (draft.productUrl && (!productHref(draft.productUrl.trim()) || draft.productUrl.trim().length > 2000)) throw new Error('商品链接须为有效的 http 或 https 地址')
+  if (!draft.productUrl.trim()) throw new Error('请输入商品链接')
+  if (!productHref(draft.productUrl.trim()) || draft.productUrl.trim().length > 2000) throw new Error('商品链接须为有效的 http 或 https 地址')
   if (draft.productSpecification.length > 500 || draft.remark.length > 1000) throw new Error('商品规格或备注超过长度限制')
   if (draft.procurementDirection && !['OVERSEAS_TO_DOMESTIC', 'DOMESTIC_TO_OVERSEAS'].includes(draft.procurementDirection)) throw new Error('请选择有效采购方向')
   return { procurementDirection: draft.procurementDirection || 'OVERSEAS_TO_DOMESTIC', customerName: customerName.trim(), purchaseCategory: draft.purchaseCategory.trim(), productName: draft.productName.trim(),

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, ElMessageBox } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { ApiError } from '@/api/types'
 import { accessTokenIdentity } from '@/api/session'
 import { useAuthStore } from '@/modules/auth/public'
@@ -9,9 +9,10 @@ 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 { rejectProcurement, confirmProcurement, createProcurement, getProcurement, getProcurementWorkflow, listProcurements, type ProcurementDetail, type ProcurementSummary, type ProcurementWorkflow } from '../api/procurement'
+import ProcurementDecisionDialog from '../components/ProcurementDecisionDialog.vue'
+import { 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 { requireOrderBudget } from '../api/orderBudgets'
+import OrderFundingStatus from '../components/OrderFundingStatus.vue'
 import { procurementRequestKey } from '../procurementSubmission'
 
 const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean }>(), { createPage: false, detailPage: false })
@@ -23,6 +24,18 @@ const canList = computed(() => auth.hasPermission('merchant:cross-border:procure
 const identity = computed(() => auth.token ? accessTokenIdentity(auth.token) : null)
 const companyName = computed(() => auth.profile.tenantName || (auth.user?.tenantName && !/^企业租户 \d+$/.test(auth.user.tenantName) ? auth.user.tenantName : ''))
 const form = reactive(emptyProcurementDraft())
+const formRef = ref<FormInstance>()
+const formRules: FormRules<typeof form> = {
+  procurementDirection: [{ required: true, message: '请选择采购方向', trigger: 'change' }],
+  productName: [{ required: true, whitespace: true, message: '请输入商品名称', trigger: 'blur' }],
+  productUrl: [{ required: true, whitespace: true, message: '请输入商品链接', trigger: 'blur' }],
+  purchaseQuantity: [{ required: true, whitespace: true, message: '请输入采购数量', trigger: 'blur' }],
+  budgetUnitPrice: [{ required: true, whitespace: true, message: '请输入预算单价', trigger: 'blur' }],
+  currency: [{ required: true, message: '请选择预算币种', trigger: 'change' }],
+  contactName: [{ required: true, whitespace: true, message: '请输入收件人姓名', trigger: 'blur' }],
+  contactPhone: [{ required: true, whitespace: true, message: '请输入联系电话', trigger: 'blur' }],
+  receivingAddress: [{ required: true, whitespace: true, message: '请输入完整收货地址', trigger: 'blur' }],
+}
 const summaryQuantity = computed(() => /^\d+$/.test(form.purchaseQuantity) && Number.isSafeInteger(Number(form.purchaseQuantity)) && Number(form.purchaseQuantity) > 0 ? String(Number(form.purchaseQuantity)) : '—')
 const summaryUnitPrice = computed(() => draftBudgetTotal({ ...form, purchaseQuantity: '1' }) ?? '—')
 const summaryCurrencyName = computed(() => form.currency === 'USD' ? '美元' : '人民币')
@@ -31,13 +44,12 @@ 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 decisionTarget = shallowRef<ProcurementSummary | null>(null)
-const canConfirm = computed(() => canCreate.value && workflow.value?.status === 'WAIT_CUSTOMER_CONFIRM')
+const decision = ref<'confirm' | 'reject'>('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] || '') },
@@ -48,15 +60,27 @@ const queryFields: QueryField[] = [
   { 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' },
+  { key: 'actions', label: '操作', width: 260, fixed: 'left', slotName: 'actions' },
   { prop: 'procurementDirection', label: '采购方向', minWidth: 170, slotName: 'direction' },
   { prop: 'orderNo', label: '采购单号', minWidth: 250, slotName: 'orderNo' },
   { prop: 'purchaseCategory', label: '采购品类', width: 120 }, { prop: 'productName', label: '商品名称', minWidth: 200 },
   { prop: 'productSpecification', label: '商品规格', minWidth: 160 }, { prop: 'purchaseQuantity', label: '采购数量（件）', width: 135 },
   { prop: 'budgetUnitPrice', label: '预算单价', width: 155, slotName: 'budget' },
-  { prop: 'status', label: '履约进度', width: 180, slotName: 'status' }, { prop: 'createdAt', label: '下单时间', width: 185, slotName: 'createdAt' },
+  { prop: 'status', label: '履约进度', width: 180, slotName: 'status' }, { prop: 'reviewRemark', label: '失败 / 拒绝原因', minWidth: 220, slotName: 'reviewRemark' }, { prop: 'createdAt', label: '下单时间', width: 185, slotName: 'createdAt' },
 ]
-function rowActions(row: object): TableAction[] { return [{ key: 'detail', label: '详情', run: () => openDetail(row as ProcurementSummary) }] }
+function rowActions(row: object): TableAction[] {
+  const order = row as ProcurementSummary
+  const actions: TableAction[] = [{ key: 'detail', label: '详情', run: () => openDetail(order) }]
+  if (canCreate.value && order.status === 'WAIT_CUSTOMER_CONFIRM') {
+    actions.push({ key: 'reject', label: '驳回', run: () => beginDecision(order, 'reject') }, { key: 'confirm', label: '确认采购结果', run: () => beginDecision(order, 'confirm') })
+  }
+  return actions
+}
+function beginDecision(order: ProcurementSummary, kind: 'confirm' | 'reject') {
+  if (!canCreate.value || order.status !== 'WAIT_CUSTOMER_CONFIRM') return
+  decision.value = kind; decisionTarget.value = order
+}
+function decisionChanged() { decisionTarget.value = null; void loadList() }
 function openDetail(row: ProcurementSummary) { if (row.orderNo) void router.push({ name: 'cross-border-procurement-detail', params: { orderNo: row.orderNo } }) }
 function returnToList() { if (canList.value) void router.push({ name: 'cross-border-procurement' }) }
 function message(cause: unknown) {
@@ -84,62 +108,34 @@ async function loadDetail() {
   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 }
-}
-// 驳回携带当前版本和必填原因，失败保留当前采购详情。
-async function rejectReceived() {
-  if (!canConfirm.value || confirming.value || !workflow.value) return
-  const owner = identity.value, targetOrder = orderNo.value
-  confirming.value = true; confirmError.value = ''
-  try {
-    const answer = await ElMessageBox.prompt('请说明采购结果不符合要求的原因，平台将重新上传照片。', '驳回采购结果', { inputType: 'textarea', inputValidator: value => !!value?.trim() && value.trim().length <= 1000 || '请填写驳回原因，最多1000字', confirmButtonText: '提交驳回', cancelButtonText: '取消' })
-    if (!active || owner !== identity.value || targetOrder !== orderNo.value || !workflow.value) return
-    const result = await rejectProcurement(targetOrder, { version: workflow.value.version, idempotencyKey: procurementRequestKey(), reason: answer.value.trim() })
-    if (!active || owner !== identity.value || targetOrder !== orderNo.value) return
-    workflow.value = result; 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()); createAttempt = null }
+function resetForm() { submitError.value = ''; submittedOrder.value = ''; Object.assign(form, emptyProcurementDraft()); formRef.value?.clearValidate(); 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 {
+    if (!formRef.value || !await formRef.value.validate().catch(() => false)) return
+    if (!active || owner !== identity.value) return
     const payload = buildProcurementCreate(form, companyName.value, '')
     const fingerprint = JSON.stringify([owner, payload])
     if (createAttempt?.fingerprint !== fingerprint) createAttempt = { fingerprint, key: procurementRequestKey() }
-    await requireOrderBudget('procurement', createAttempt.key, Number((payload.budgetUnitPrice * payload.purchaseQuantity).toFixed(2)), payload.currency)
     if (!active || owner !== identity.value) return
     const result = await createProcurement({ ...payload, idempotencyKey: createAttempt.key })
     if (!active || owner !== identity.value) return
-    createAttempt = null; submittedOrder.value = result.order.orderNo; ElMessage.success('采购订单已提交')
+    createAttempt = null; submittedOrder.value = result.order.orderNo
-    if (canList.value) await router.push({ name: 'cross-border-procurement-detail', params: { orderNo: result.order.orderNo } })
+    ElMessage.success(result.order.status === 'FUNDING_PENDING' ? '采购订单已受理，资金校验完成后进入平台审核' : '采购订单已提交')
-  } catch (cause) { if (/已释放|已过期/.test(message(cause))) createAttempt = null; if (active && owner === identity.value) submitError.value = message(cause) }
+    if (canList.value) await router.push({ name: 'cross-border-procurement' })
+  } catch (cause) {
+    if (/已释放|已过期/.test(message(cause))) createAttempt = null
+    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; createAttempt = null }
-  if (values[4] !== previous?.[4] || values[1] !== previous?.[1]) confirmAttempt = null
+  decisionTarget.value = null
-  ++requestSequence; inFlight = ''; loading.value = false; error.value = ''; detail.value = null; workflow.value = null; confirmError.value = ''
+  ++requestSequence; inFlight = ''; loading.value = false; error.value = ''; detail.value = null; workflow.value = null
   if (mode.value === 'create') resetForm()
   else if (mode.value === 'detail') void loadDetail()
   else void loadList()
@@ -159,14 +155,16 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
           <template #budget="{ row }">{{ money((row as ProcurementSummary).budgetUnitPrice, (row as ProcurementSummary).currency) }}</template>
           <template #direction="{ row }">{{ directionLabel((row as ProcurementSummary).procurementDirection) }}</template>
           <template #status="{ row }"><el-tag :type="statusTone((row as ProcurementSummary).status)" size="small">{{ statusLabel((row as ProcurementSummary).status, (row as ProcurementSummary).procurementDirection) }}</el-tag></template>
+          <template #reviewRemark="{ row }"><OrderFundingStatus v-if="(row as ProcurementSummary).status === 'FUNDING_FAILED'" kind="procurement" :order-no="(row as ProcurementSummary).orderNo" :status="(row as ProcurementSummary).status" :can-retry="false" compact /><span v-else-if="(row as ProcurementSummary).status === 'REJECTED'">{{ (row as ProcurementSummary).reviewRemark || '未填写原因' }}</span><span v-else>—</span></template>
           <template #createdAt="{ row }">{{ dateTime((row as ProcurementSummary).createdAt) }}</template>
         </DataTable>
       </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(workflow?.status || detail.order.status)">{{ statusLabel(workflow?.status || detail.order.status, detail.order.procurementDirection) }}</el-tag><el-button v-if="canConfirm" type="danger" :disabled="confirming" @click="rejectReceived">驳回</el-button><el-button v-if="canConfirm" type="primary" :loading="confirming" @click="confirmReceived">确认采购结果</el-button><el-button :disabled="loading || confirming" @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 :disabled="loading" @click="loadDetail">刷新</el-button></div></header>
+      <OrderFundingStatus v-if="detail" kind="procurement" :order-no="detail.order.orderNo" :status="detail.order.status" :can-retry="canCreate" @changed="loadDetail" />
       <div v-if="error" class="procurement-error" role="alert"><span>{{ error }}</span><el-button :disabled="loading" @click="loadDetail">重新加载</el-button></div>
-      <template v-else-if="detail && workflow"><el-alert v-if="confirmError" :title="confirmError" type="error" :closable="false" /><el-alert v-if="workflow.rejectionReason" title="采购结果驳回原因" :description="workflow.rejectionReason" type="warning" :closable="false" /><ProcurementDetailPanel :detail="detail" :workflow="workflow" /></template><el-skeleton v-else :rows="8" animated />
+      <template v-else-if="detail && workflow"><el-alert v-if="workflow.status === 'RECEIVING' && workflow.rejectionReason" title="采购结果驳回原因" :description="workflow.rejectionReason" type="warning" :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-create-heading">
@@ -200,19 +198,19 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
             <div class="procurement-summary-value">{{ form.currency }}<small>{{ summaryCurrencyName }}</small></div>
           </article>
         </section>
-        <el-form :model="form" label-position="top" :disabled="submitting" @submit.prevent="submit">
+        <el-form ref="formRef" :model="form" :rules="formRules" label-position="top" :disabled="submitting" scroll-to-error @submit.prevent="submit">
           <section class="procurement-form-section" aria-labelledby="procurement-product-heading">
             <h3 id="procurement-product-heading"><span class="procurement-section-dot" aria-hidden="true" />商品与预算</h3>
             <div class="procurement-form-card">
-              <el-form-item class="procurement-direction" label="采购方向" for="procurement-direction" required><el-select id="procurement-direction" v-model="form.procurementDirection" popper-class="procurement-create-select"><el-option v-for="(label, value) in procurementDirections" :key="value" :label="label" :value="value" /></el-select></el-form-item>
+              <el-form-item class="procurement-direction" label="采购方向" for="procurement-direction" prop="procurementDirection" required><el-select id="procurement-direction" v-model="form.procurementDirection" popper-class="procurement-create-select"><el-option v-for="(label, value) in procurementDirections" :key="value" :label="label" :value="value" /></el-select></el-form-item>
               <div class="procurement-form-grid">
                 <el-form-item label="采购品类" for="procurement-category"><el-input id="procurement-category" v-model.trim="form.purchaseCategory" maxlength="128" placeholder="请输入品类" /></el-form-item>
-                <el-form-item label="商品名称" for="procurement-product" required><el-input id="procurement-product" v-model.trim="form.productName" maxlength="255" placeholder="请输入商品名称" /></el-form-item>
+                <el-form-item label="商品名称" for="procurement-product" prop="productName" required><el-input id="procurement-product" v-model.trim="form.productName" maxlength="255" placeholder="请输入商品名称" /></el-form-item>
                 <el-form-item label="商品规格" for="procurement-specification"><el-input id="procurement-specification" v-model.trim="form.productSpecification" maxlength="500" placeholder="规格、型号" /></el-form-item>
-                <el-form-item label="采购数量（件）" for="procurement-quantity" required><el-input id="procurement-quantity" v-model.trim="form.purchaseQuantity" inputmode="numeric" maxlength="18" placeholder="正整数" /></el-form-item>
+                <el-form-item label="采购数量（件）" for="procurement-quantity" prop="purchaseQuantity" required><el-input id="procurement-quantity" v-model.trim="form.purchaseQuantity" inputmode="numeric" maxlength="18" placeholder="正整数" /></el-form-item>
-                <el-form-item label="预算单价" for="procurement-price" required><el-input id="procurement-price" v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="请明确填写；免费样品填 0" /></el-form-item>
+                <el-form-item label="预算单价" for="procurement-price" prop="budgetUnitPrice" required><el-input id="procurement-price" v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="请明确填写；免费样品填 0" /></el-form-item>
-                <el-form-item label="预算币种" for="procurement-currency" required><el-select id="procurement-currency" v-model="form.currency" popper-class="procurement-create-select"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
+                <el-form-item label="预算币种" for="procurement-currency" prop="currency" required><el-select id="procurement-currency" v-model="form.currency" popper-class="procurement-create-select"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
-                <el-form-item class="full" label="商品链接" for="procurement-url"><el-input id="procurement-url" v-model.trim="form.productUrl" maxlength="2000" placeholder="https://..." /></el-form-item>
+                <el-form-item class="full" label="商品链接" for="procurement-url" prop="productUrl" required><el-input id="procurement-url" v-model.trim="form.productUrl" maxlength="2000" placeholder="https://..." /></el-form-item>
               </div>
               <div class="procurement-budget-total">货款预算总上限：{{ money(budgetTotal, form.currency) }}</div>
             </div>
@@ -220,19 +218,20 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
           <section class="procurement-form-section" aria-labelledby="procurement-recipient-heading">
             <h3 id="procurement-recipient-heading"><span class="procurement-section-dot procurement-section-dot--recipient" aria-hidden="true" />{{ regionText('最终国内收件资料', form.procurementDirection) }}</h3>
             <div class="procurement-form-card procurement-form-grid">
-              <el-form-item label="收件人" for="procurement-contact" required><el-input id="procurement-contact" v-model.trim="form.contactName" maxlength="128" placeholder="实际收件人姓名" /></el-form-item>
+              <el-form-item label="收件人" for="procurement-contact" prop="contactName" required><el-input id="procurement-contact" v-model.trim="form.contactName" maxlength="128" placeholder="实际收件人姓名" /></el-form-item>
-              <el-form-item label="联系电话" for="procurement-phone" required><el-input id="procurement-phone" v-model.trim="form.contactPhone" maxlength="64" type="tel" placeholder="快递可联系的电话" /></el-form-item>
+              <el-form-item label="联系电话" for="procurement-phone" prop="contactPhone" required><el-input id="procurement-phone" v-model.trim="form.contactPhone" maxlength="64" type="tel" placeholder="快递可联系的电话" /></el-form-item>
-              <el-form-item class="full" :label="regionText('完整国内地址', form.procurementDirection)" for="procurement-address" required><el-input id="procurement-address" v-model.trim="form.receivingAddress" maxlength="1000" :placeholder="form.procurementDirection === 'DOMESTIC_TO_OVERSEAS' ? '国家、州/省、市、邮编及详细地址' : '省、市、区县、街道及详细门牌'" /></el-form-item>
+              <el-form-item class="full" :label="regionText('完整国内地址', form.procurementDirection)" for="procurement-address" prop="receivingAddress" required><el-input id="procurement-address" v-model.trim="form.receivingAddress" maxlength="1000" :placeholder="form.procurementDirection === 'DOMESTIC_TO_OVERSEAS' ? '国家、州/省、市、邮编及详细地址' : '省、市、区县、街道及详细门牌'" /></el-form-item>
               <el-form-item class="full" label="采购要求" for="procurement-requirements">
-                <el-input id="procurement-requirements" v-model="form.remark" type="textarea" :rows="4" maxlength="1000" resize="vertical" aria-describedby="procurement-requirements-count" />
+                <el-input id="procurement-requirements" v-model="form.remark" type="textarea" :rows="4" maxlength="1000" resize="vertical" placeholder="填写采购要求（选填）" aria-describedby="procurement-requirements-count" />
                 <div id="procurement-requirements-count" class="procurement-character-count">{{ form.remark.length }} / 1000</div>
               </el-form-item>
             </div>
           </section>
         </el-form>
-        <footer class="procurement-form-actions"><el-button v-if="canList" :disabled="submitting" @click="returnToList">返回列表</el-button><el-button type="primary" :loading="submitting" :disabled="!companyName || !identity" @click="submit">提交采购订单</el-button></footer>
+        <footer class="procurement-form-actions"><el-button type="primary" :loading="submitting" :disabled="!companyName || !identity" @click="submit">提交采购订单</el-button></footer>
       </template>
     </section>
+    <ProcurementDecisionDialog v-if="decisionTarget" :key="`${identity}:${decisionTarget.orderNo}:${decision}`" :order="decisionTarget" :decision="decision" @close="decisionTarget = null" @changed="decisionChanged" />
   </section>
 </template>
 
@@ -254,7 +253,7 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
   --client-font-size: 14px;
   --el-color-primary: #2f7bff;
   --el-text-color-regular: #1f2937;
-  --el-text-color-placeholder: #6b7280;
+  --el-text-color-placeholder: #b0b7c3;
   min-width: 0;
   color: #1f2937;
   font: 14px/1.5 "PingFang SC", "Microsoft YaHei", "Noto Sans SC", sans-serif;
@@ -283,14 +282,16 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
 .procurement-create :deep(.el-form-item__label) { height: auto; margin-bottom: 6px; padding: 0; color: #374151; font-size: 14px; font-weight: 600; line-height: 20px; }
 .procurement-create :deep(.el-form-item.is-required .el-form-item__label::before) { color: #e5484d; }
 .procurement-create :deep(.el-form-item__content) { min-width: 0; line-height: 20px; }
+.procurement-create :deep(.el-form-item__error) { position: absolute; top: auto; bottom: calc(100% + 6px); right: 0; left: auto; width: auto; max-width: calc(100% - 120px); padding: 0; font-size: 12px; line-height: 20px; text-align: right; }
 .procurement-create :deep(.procurement-direction) { width: calc((100% - 40px) / 3); margin-bottom: 12px; }
 .procurement-create :deep(.el-select) { width: 100%; }
 .procurement-create :deep(.el-input__wrapper), .procurement-create :deep(.el-select__wrapper), .procurement-create :deep(.el-textarea__inner) { border: 1px solid #d5dce8; border-radius: 6px; background: #fff; box-shadow: none; font-family: inherit; font-size: 14px; }
 .procurement-create :deep(.el-input__wrapper), .procurement-create :deep(.el-select__wrapper) { min-height: 44px; padding: 10px 14px; }
 .procurement-create :deep(.el-input__inner) { height: 22px; color: #1f2937; line-height: 22px; }
 .procurement-create :deep(.el-textarea__inner) { min-height: 110px !important; padding: 11px 14px; color: #1f2937; line-height: 20px; }
-.procurement-create :deep(.el-input__inner::placeholder), .procurement-create :deep(.el-textarea__inner::placeholder) { color: #6b7280; }
+.procurement-create :deep(.el-input__inner::placeholder), .procurement-create :deep(.el-textarea__inner::placeholder) { color: var(--el-text-color-placeholder); opacity: 1; }
 .procurement-create :deep(.el-input__wrapper.is-focus), .procurement-create :deep(.el-select__wrapper.is-focused), .procurement-create :deep(.el-textarea__inner:focus) { outline: 2px solid #2f7bff; outline-offset: 0; }
+.procurement-create :deep(.el-form-item.is-error .el-input__wrapper), .procurement-create :deep(.el-form-item.is-error .el-select__wrapper), .procurement-create :deep(.el-form-item.is-error .el-textarea__inner) { border-color: #e5484d; box-shadow: none; }
 .procurement-create :deep(.el-input.is-disabled .el-input__wrapper), .procurement-create :deep(.el-select__wrapper.is-disabled), .procurement-create :deep(.el-textarea.is-disabled .el-textarea__inner) { background: #f6f9ff; }
 .procurement-character-count { width: 100%; margin-top: 4px; color: #6b7280; font-size: 13px; text-align: right; }
 .procurement-budget-total { margin-top: 10px; color: #6b7280; font-size: 13px; line-height: 20px; overflow-wrap: anywhere; }

src/modules/finance/views/FinanceBillsView.test.mjs

@@ -55,12 +55,18 @@ test('adapts the Finance Java DTO contract and filters nested receipt allocation
   assert.doesNotMatch(adapterSource, /bill_no|customer_name|bill_date|total_amount|outstanding_amount|receipt_no|bill_id|applied_amount/)
   assert.doesNotMatch(adapterSource, /receipt\.billId|receipt\.appliedAmount/)
   assert.doesNotMatch(adapterSource, /voucherNo|voucher_no/)
-  assert.match(viewSource, /name: 'finance-bill-detail', params: \{ billNo: row\.billNo \}/)
+  assert.doesNotMatch(viewSource, /key: 'detail'|label: '查看'/)
   assert.match(detailViewSource, /getMerchantFinanceBill\(summary\.id\)/)
   assert.match(detailViewSource, /getMerchantFinanceReceipts\(summary\.id\)/)
   assert.doesNotMatch(detailViewSource, /getMerchantFinanceBill\(billNo\.value\)/)
 })
 
+test('keeps bill numbers linked to business-number details independently of confirmation actions', () => {
+  assert.match(viewSource, /label: '账单编号',\s*prop: 'billNo',\s*slotName: 'billNo'/)
+  assert.match(viewSource, /<template #billNo="\{ row \}">\s*<RouterLink[^>]*:to="\{ name: 'finance-bill-detail', params: \{ billNo: row\.billNo \} \}"[^>]*>\{\{ row\.billNo \}\}<\/RouterLink>\s*<\/template>/)
+  assert.doesNotMatch(viewSource.match(/<template #billNo[^]*?<\/template>/)?.[0] || '', /canConfirm|confirmationStatus|row\.id/)
+})
+
 test('does not expose draft or voided bills returned by the server', () => {
   const bill = (id, status) => ({
     id,

src/modules/finance/views/FinanceBillsView.vue

@@ -2,7 +2,7 @@
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { RefreshCcw } from '@lucide/vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { RouterLink } from 'vue-router'
 import { ApiError } from '@/api/http'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
@@ -13,7 +13,6 @@ import type { FinanceBillQuery, FinanceBillStatus, FinanceBillSummary, FinanceCu
 
 const loading = ref(false)
 const auth = useAuthStore()
-const router = useRouter()
 const errorMessage = ref('')
 const bills = ref<FinanceBillSummary[]>([])
 const confirmingBillId = ref('')
@@ -38,7 +37,7 @@ const queryFields: QueryField[] = [
 ]
 const tableColumns: DataTableColumn[] = [
   { label: '操作', slotName: 'actions', width: 190, fixed: 'left' },
-  { label: '账单编号', prop: 'billNo', minWidth: 160 },
+  { label: '账单编号', prop: 'billNo', slotName: 'billNo', minWidth: 160 },
   { label: '出账日期', slotName: 'issueDate', width: 120 },
   { label: '到期日', slotName: 'dueDate', width: 120 },
   { label: '账单金额', slotName: 'totalAmount', width: 145, align: 'right' },
@@ -104,11 +103,9 @@ async function loadBills(nextPage = page.value) {
   }
 }
 
-function openDetail(row: FinanceBillSummary) { void router.push({ name: 'finance-bill-detail', params: { billNo: row.billNo } }) }
-
 function rowActions(row: object): TableAction[] {
   const statement = row as FinanceBillSummary
-  const actions: TableAction[] = [{ key: 'detail', label: '查看', run: () => openDetail(statement) }]
+  const actions: TableAction[] = []
   if (statement.customerConfirmationStatus === 'PENDING_CONFIRMATION' && canConfirm.value) {
     actions.push({
       key: 'confirm',
@@ -181,6 +178,7 @@ onMounted(() => { void loadBills(1) })
     <section class="content-card">
       <DataTable v-model:page="page" v-model:page-size="pageSize" :data="bills" :columns="tableColumns" :loading="loading" :total="total" :page-sizes="[20, 50, 100]" :row-actions="rowActions" row-key="billNo" empty-text="暂无账单">
         <template v-if="errorMessage" #error><div class="state-panel state-panel--error" role="alert"><p>{{ errorMessage }}</p><el-button @click="loadBills(1)"><RefreshCcw :size="15" />重试</el-button></div></template>
+        <template #billNo="{ row }"><RouterLink class="bill-number-link" :to="{ name: 'finance-bill-detail', params: { billNo: row.billNo } }">{{ row.billNo }}</RouterLink></template>
         <template #issueDate="{ row }">{{ formatDate(row.issueDate) }}</template>
         <template #dueDate="{ row }">{{ formatDate(row.dueDate) }}</template>
         <template #totalAmount="{ row }">¥ {{ formatAmount(row.totalAmount) }}</template>
@@ -196,6 +194,8 @@ onMounted(() => { void loadBills(1) })
 
 <style scoped>
 .finance-bills-page { display: flex; flex-direction: column; gap: 12px; }
+.bill-number-link { color: var(--primary); text-decoration: none; }
+.bill-number-link:hover { text-decoration: underline; }
 .finance-summary { display: flex; flex-wrap: wrap; gap: 8px 26px; color: var(--muted); font-size: 13px; }.finance-summary strong { margin-left: 6px; color: var(--navy); font-size: 18px; }.amount-warning, .amount-warning strong { color: #b45309; }
 .content-card { min-width: 0; overflow: hidden; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: var(--surface, #fff); }
 .state-panel { display: flex; min-height: 180px; align-items: center; justify-content: center; gap: 12px; flex-direction: column; color: var(--muted); text-align: center; }.state-panel p { margin: 0; }.state-panel--error { color: #b42318; background: #fff8f7; border: 1px solid #f5c2bd; border-radius: 6px; }

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

@@ -58,6 +58,7 @@ let detailRequest = 0
 onBeforeUnmount(() => { disposed = true; detailRequest += 1; resetClearanceResults() })
 
 const taxRefundInbounds = computed(() => detail.value?.inbounds.filter((item) => item.taxMode === 'TAX_REFUND') ?? [])
+const pendingReceipts = computed(() => detail.value?.documents.filter((item) => item.receipt && item.receiptStatus !== 'CONFIRMED') ?? [])
 const locked = computed(() => Boolean(detail.value?.startedAt) || detail.value?.status === 'DECLARING' || detail.value?.status === 'COMPLETED')
 const merchantStatusLabel = computed(() => detail.value?.merchantStatus
   ? MERCHANT_CUSTOMS_STATUS_LABELS[detail.value.merchantStatus]
@@ -273,29 +274,43 @@ async function downloadFile(document: MerchantCustomsDocument, kind: 'source' |
   }
 }
 
-async function confirmReceipt(document: MerchantCustomsDocument) {
+async function confirmReceipt() {
+  const documents = pendingReceipts.value
+  if (!documents.length) return
+  let confirmedCount = 0
   try {
-    await ElMessageBox.confirm('确认已核对整份报关行回执吗？确认后平台会把确认结果发送给报关行执行。', '确认报关行回执', { type: 'warning' })
+    await ElMessageBox.confirm(`确认已核对 ${documents.length} 份报关行回执吗？确认后平台会把确认结果发送给报关行执行。`, '确认报关行回执', { type: 'warning' })
     mutating.value = true
-    await confirmMerchantCustomsReceipt(document)
+    for (const document of documents) {
-    ElMessage.success('回执确认成功')
+      await confirmMerchantCustomsReceipt(document)
+      confirmedCount += 1
+    }
+    ElMessage.success(`已确认 ${documents.length} 份回执`)
     await loadDetail()
   } catch (error) {
     if (error === 'cancel' || error === 'close') return
-    ElMessage.error(merchantCustomsErrorMessage(error, '回执确认失败'))
+    if (confirmedCount) await loadDetail()
+    ElMessage.error(`${confirmedCount ? `已确认 ${confirmedCount}/${documents.length} 份，` : ''}${merchantCustomsErrorMessage(error, '回执确认失败')}`)
   } finally { mutating.value = false }
 }
 
-async function rejectReceipt(document: MerchantCustomsDocument) {
+async function rejectReceipt() {
+  const documents = pendingReceipts.value
+  if (!documents.length) return
+  let rejectedCount = 0
   try {
     const reason = await ElMessageBox.prompt('请填写打回原因', '打回报关行回执', { inputValidator: (value) => value.trim() ? true : '请输入打回原因' })
     mutating.value = true
-    await rejectMerchantCustomsReceipt(document, reason.value)
+    for (const document of documents) {
-    ElMessage.success('回执已打回')
+      await rejectMerchantCustomsReceipt(document, reason.value)
+      rejectedCount += 1
+    }
+    ElMessage.success(`已打回 ${documents.length} 份回执`)
     await loadDetail()
   } catch (error) {
     if (error === 'cancel' || error === 'close') return
-    ElMessage.error(merchantCustomsErrorMessage(error, '回执打回失败'))
+    if (rejectedCount) await loadDetail()
+    ElMessage.error(`${rejectedCount ? `已打回 ${rejectedCount}/${documents.length} 份，` : ''}${merchantCustomsErrorMessage(error, '回执打回失败')}`)
   } finally { mutating.value = false }
 }
 
@@ -404,6 +419,10 @@ function clearanceResultStatusLabel(value: MerchantClearanceResult) {
       <section class="customs-section">
         <div class="customs-section-title">
           <h3>资料版本历史</h3>
+          <div v-if="pendingReceipts.length && detail.status === 'DECLARING'" class="customs-receipt-actions">
+            <el-button type="success" :disabled="mutating" @click="confirmReceipt">确认全部回执</el-button>
+            <el-button type="danger" plain :disabled="mutating" @click="rejectReceipt">打回全部回执</el-button>
+          </div>
         </div>
         <el-empty v-if="!detail.documents.length" description="尚未上传退税报关资料" :image-size="54" />
         <div v-else class="customs-document-list">
@@ -422,10 +441,6 @@ function clearanceResultStatusLabel(value: MerchantClearanceResult) {
               <el-button link type="primary" :loading="downloadingKey === `${item.documentId}:source`" @click="downloadFile(item, 'source')"><Download :size="15" />源文件</el-button>
               <el-button v-if="item.receipt" link type="success" :loading="downloadingKey === `${item.documentId}:receipt`" @click="downloadFile(item, 'receipt')"><Download :size="15" />报关行回执</el-button>
               <el-button v-if="item.finalDocument" link type="success" :loading="downloadingKey === `${item.documentId}:final`" @click="downloadFile(item, 'final')"><Download :size="15" />报关完税文件</el-button>
-              <template v-if="item.receipt && item.receiptStatus !== 'CONFIRMED' && detail.status === 'DECLARING'">
-                <el-button link type="success" :disabled="mutating" @click="confirmReceipt(item)">确认整份回执</el-button>
-                <el-button link type="danger" :disabled="mutating" @click="rejectReceipt(item)">打回回执</el-button>
-              </template>
               <el-tag v-if="item.receipt" size="small" :type="item.receiptStatus === 'CONFIRMED' ? 'success' : item.receiptStatus === 'REJECTED' ? 'danger' : 'warning'">{{ item.receiptStatus === 'CONFIRMED' ? '已确认' : item.receiptStatus === 'REJECTED' ? `已打回：${item.receiptRejectReason || '待补充'}` : '待确认' }}</el-tag>
               <template v-if="canEdit && !locked && !item.frozen">
                 <el-button link type="primary" :disabled="mutating" @click="beginEditInbounds(item)"><Pencil :size="15" />改关联</el-button>
@@ -472,6 +487,7 @@ function clearanceResultStatusLabel(value: MerchantClearanceResult) {
 .clearance-result-row p { grid-column:1 / -1; margin:0; color:var(--navy); font-size:12px; }
 .customs-section-title { display: flex; align-items: center; justify-content: space-between; gap: 18px; margin-bottom: 14px; }
 .customs-section-title h3 { margin: 0; color: var(--navy); font-size: 14px; }
+.customs-receipt-actions { display: flex; flex-wrap: wrap; gap: 8px; }
 .customs-help-heading { display: flex; align-items: center; gap: 4px; }
 .customs-inbound-options { display: flex; flex-wrap: wrap; gap: 8px 18px; padding: 12px 14px; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: var(--client-header-bg); }
 .customs-inbound-options :deep(.el-checkbox) { margin-right: 0; }

src/modules/first-leg/components/InboundBillingPanel.test.mjs

@@ -56,7 +56,7 @@ test('supports a standalone dialog and keeps the unpushed billing-weight state v
 })
 
 test('shows the published merchant inbound, measurement details and customer confirmation entry', () => {
-  for (const label of ['入仓码', '平台收货仓', '实际毛重', '实测体积', '托盘与库位', '换算与精度', '最终计费量', '单价', '基础费用', '附加费用', '费用合计', '平台备注']) {
+  for (const label of ['入仓码', '平台收货仓', '实际毛重', '实测体积', '换算与精度', '最终计费量', '单价', '基础费用', '附加费用', '费用合计', '平台备注']) {
     assert.ok(source.includes(label), `missing label: ${label}`)
   }
   assert.match(source, /formatInboundMoney\(props\.data\.latestFee\.totalAmount/)
@@ -67,7 +67,7 @@ test('shows the published merchant inbound, measurement details and customer con
   assert.match(source, /confirmMerchantInboundFee/)
   assert.match(source, /measurementItems/)
   assert.doesNotMatch(source, /调整费用|发送费用|下载照片/)
-  assert.doesNotMatch(source, /internalNotes|statusHistory|files/)
+  assert.doesNotMatch(source, /internalNotes|statusHistory|files|palletLocations|托盘与库位/)
   assert.doesNotMatch(source, /latestFee\.(feeVersion|ruleCode|rateCode|chargeRuleVersion|carrierRateVersion|sentAt)/)
   assert.match(source, /箱规规则/)
   assert.match(source, /getCalculationRuleLabel\(row\.calculationRuleVersion\)/)
@@ -87,7 +87,7 @@ test('keeps the billing summary, confirmation table, notice and footer', () => {
 test('confirms the selected billing weight and volume even when outer carton totals differ', async () => {
   const html = await renderConfirmation({
     latestFee: {
-      actualWeightKg: 570.5, actualVolumeCbm: 3.6894,
+      actualWeightKg: 393, actualVolumeCbm: 3.6894, convertedQuantity: 616.1298,
       chargeableQuantity: 616.1298, chargeMode: 'KG', chargeUnit: 'KG',
       unitPrice: 13.6, totalAmount: 8379.37, currency: 'CNY',
     },
@@ -96,10 +96,12 @@ test('confirms the selected billing weight and volume even when outer carton tot
       unitVolumeCbm: 0.177, totalVolumeCbm: 3.894, volumeWeightKg: 650.298 }],
   })
 
-  assert.match(html, /570\.5 kg/)
+  assert.match(html, /393 kg/)
   assert.match(html, /3\.6894 m³/)
   assert.match(html, /616\.13 kg/)
   assert.match(html, /8,379\.37/)
+  assert.match(html, /按体积重计费/)
+  assert.doesNotMatch(html, /按重量计费|按毛重计费/)
   assert.doesNotMatch(html, /3\.894|650\.298|0\.177/)
   assert.doesNotMatch(confirmationBody, /measurementItems|billingBasis|箱规长|每箱体积/)
 })
@@ -107,7 +109,7 @@ test('confirms the selected billing weight and volume even when outer carton tot
 test('uses the published volume charge quantity and retains six decimal places', async () => {
   const html = await renderConfirmation({
     latestFee: {
-      actualWeightKg: 600, actualVolumeCbm: 1.234567,
+      actualWeightKg: 600, actualVolumeCbm: 1.234567, convertedQuantity: 1.652893,
       chargeableQuantity: 1.652893, chargeMode: 'CBM', chargeUnit: 'CBM',
       unitPrice: 100, totalAmount: 165.29, currency: 'CNY',
     },
@@ -115,7 +117,7 @@ test('uses the published volume charge quantity and retains six decimal places',
   })
 
   assert.match(html, /计费量/)
-  assert.match(html, /按体积计费/)
+  assert.match(html, /按重量折算体积计费/)
   assert.match(html, /600 kg/)
   assert.match(html, /1\.234567 m³/)
   assert.match(html, /1\.652893 m³/)

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
-import { CircleAlert, Clock3, PackageCheck, RefreshCw, TriangleAlert } from '@lucide/vue'
+import { CircleAlert, Clock3, RefreshCw, TriangleAlert } from '@lucide/vue'
 import { confirmMerchantInboundFee } from '@/modules/first-leg/api/inboundBilling'
 import type { MerchantInboundBilling } from '@/modules/first-leg/types/inboundBilling'
 import {
@@ -136,34 +136,13 @@ async function confirmFee() {
         </el-table>
       </div>
 
-      <div class="inbound-result-section">
-        <div class="inbound-section-title">
-          <h4>托盘与库位</h4>
-          <span>{{ props.data.inbound.palletLocations.length }} 个托盘</span>
-        </div>
-        <div v-if="props.data.inbound.palletLocations.length" class="pallet-location-list">
-          <article v-for="item in props.data.inbound.palletLocations" :key="`${item.palletId}-${item.locationId}`">
-            <PackageCheck :size="18" />
-            <div class="pallet-location-main">
-              <strong>{{ item.palletCode }}</strong>
-              <span>库位 {{ item.locationCode }}</span>
-            </div>
-            <div class="pallet-location-quantity">
-              <span>{{ formatInboundMeasure(item.allocatedVolumeCbm, 'm³') }}</span>
-              <span>{{ formatInboundNumber(item.allocatedPackageCount, 0) }} 箱</span>
-            </div>
-          </article>
-        </div>
-        <p v-else class="inbound-inline-empty">暂无托盘和库位明细</p>
-      </div>
-
       <div class="inbound-result-section fee-result">
         <div class="inbound-section-title">
           <h4>费用结果</h4>
           <span>{{ props.data.latestFee.feeNo }}</span>
         </div>
         <dl class="fee-calculation-grid">
-          <div><dt>计费方式</dt><dd>{{ getChargeModeLabel(props.data.latestFee.chargeMode) }} · {{ getTaxModeLabel(props.data.latestFee.taxMode) }}</dd></div>
+          <div><dt>计费方式</dt><dd>{{ getChargeModeLabel(props.data.latestFee.chargeMode, props.data.latestFee.actualWeightKg, props.data.latestFee.actualVolumeCbm, props.data.latestFee.convertedQuantity) }} · {{ getTaxModeLabel(props.data.latestFee.taxMode) }}</dd></div>
           <div>
             <dt>换算与精度</dt>
             <dd>{{ formatConversionPrecision(
@@ -219,7 +198,7 @@ async function confirmFee() {
       <el-table class="measurement-detail-table fee-dialog-table" :data="[props.data.latestFee]" border>
         <el-table-column label="计费毛重" min-width="180"><template #default="{ row }">{{ formatInboundMeasure(row.actualWeightKg, 'kg') }}</template></el-table-column>
         <el-table-column label="计费体积" min-width="180"><template #default="{ row }">{{ formatInboundMeasure(row.actualVolumeCbm, 'm³', 6) }}</template></el-table-column>
-        <el-table-column label="计费方式" min-width="150"><template #default="{ row }">{{ getChargeModeLabel(row.chargeMode) }}</template></el-table-column>
+        <el-table-column label="计费方式" min-width="150"><template #default="{ row }">{{ getChargeModeLabel(row.chargeMode, row.actualWeightKg, row.actualVolumeCbm, row.convertedQuantity) }}</template></el-table-column>
         <el-table-column label="最终计费量" min-width="180"><template #default="{ row }">{{ formatInboundMeasure(row.chargeableQuantity, row.chargeUnit === 'KG' ? 'kg' : 'm³', row.chargeUnit === 'KG' ? 3 : 6) }}</template></el-table-column>
       </el-table>
       <div class="fee-confirm-notice" :class="{ 'is-confirmed': props.data.latestFee.customerConfirmationStatus === 'CONFIRMED' }" role="status">
@@ -281,14 +260,6 @@ async function confirmFee() {
 .fee-confirm-notice > svg { flex:0 0 auto; fill:#eda332; color:#fff; filter:drop-shadow(0 2px 3px rgba(233,154,37,.25)); }
 .fee-confirm-notice.is-confirmed { border-color:#b7dfc2; background:#f1faf3; color:#2d8a46; }
 .fee-confirm-notice.is-confirmed > svg { fill:#4eae67; }
-.pallet-location-list { margin-top: 9px; border-top: 1px solid var(--border); }
-.pallet-location-list article { display: grid; grid-template-columns: auto minmax(0, 1fr) auto; align-items: center; gap: 11px; padding: 12px 0; border-bottom: 1px solid var(--border); }
-.pallet-location-list article > svg { color: var(--primary); }
-.pallet-location-main, .pallet-location-quantity { display: flex; min-width: 0; flex-direction: column; gap: 3px; }
-.pallet-location-main strong { overflow-wrap: anywhere; color: var(--navy); font-size: 12px; }
-.pallet-location-main span, .pallet-location-quantity span { color: var(--muted); font-size: 10px; }
-.pallet-location-quantity { align-items: flex-end; }
-.inbound-inline-empty { margin: 9px 0 0; padding: 14px; background: #f6f8f8; color: var(--muted); font-size: 11px; text-align: center; }
 .fee-result { padding-top: 18px; border-top: 1px solid var(--border); }
 .fee-calculation-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); margin: 10px 0 0; border: 1px solid var(--border); }
 .fee-calculation-grid > div { min-width: 0; padding: 11px 12px; border-bottom: 1px solid var(--border); }
@@ -327,8 +298,6 @@ async function confirmFee() {
   .inbound-overview, .inbound-measurements, .fee-calculation-grid { grid-template-columns: 1fr; }
   .inbound-overview > div, .inbound-overview > div:nth-child(odd), .fee-calculation-grid > div, .fee-calculation-grid > div:not(:nth-child(3n)) { border-right: 0; border-bottom: 1px solid var(--border); }
   .inbound-overview > div:last-child, .fee-calculation-grid > div:last-child { border-bottom: 0; }
-  .pallet-location-list article { grid-template-columns: auto minmax(0, 1fr); }
-  .pallet-location-quantity { grid-column: 2; align-items: flex-start; flex-direction: row; flex-wrap: wrap; gap: 8px; }
 }
 
 @media (max-width: 360px) {

src/modules/first-leg/utils/inboundBilling.test.mjs

@@ -1,8 +1,23 @@
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
+import ts from 'typescript'
 
 const source = readFileSync(new URL('./inboundBilling.ts', import.meta.url), 'utf8')
+const { getChargeModeLabel } = await import(`data:text/javascript;base64,${Buffer.from(ts.transpileModule(source, {
+  compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2022 },
+}).outputText).toString('base64')}`)
+
+test('describes the quantity basis from the published fee instead of treating the charge unit as the basis', () => {
+  assert.equal(getChargeModeLabel('KG', 393, 3.6894, 616.1298), '按体积重计费')
+  assert.equal(getChargeModeLabel('KG', 700, 3.6894, 616.1298), '按毛重计费')
+  assert.equal(getChargeModeLabel('KG', 616.1298, 3.6894, 616.1298), '按毛重计费')
+  assert.equal(getChargeModeLabel('CBM', 600, 1.2, 1.6), '按重量折算体积计费')
+  assert.equal(getChargeModeLabel('CBM', 600, 2, 1.6), '按体积计费')
+  assert.equal(getChargeModeLabel('CBM', 600, 1.6, 1.6), '按体积计费')
+  assert.equal(getChargeModeLabel('KG', 393, 3.6894, Number.NaN), '-')
+  assert.equal(getChargeModeLabel('KG', Number.POSITIVE_INFINITY, 3.6894, 616.1298), '-')
+})
 
 test('formats zero values, currencies, measurements, and backend dates without hardcoded business factors', () => {
   assert.match(source, /value === null \|\| value === undefined/)

src/modules/first-leg/utils/inboundBilling.ts

@@ -36,8 +36,18 @@ export function formatInboundDateTime(value: string | null | undefined) {
   }).format(date)
 }
 
-export function getChargeModeLabel(value: 'KG' | 'CBM') {
+export function getChargeModeLabel(
-  return value === 'KG' ? '按重量计费' : '按体积计费'
+  chargeMode: 'KG' | 'CBM',
+  actualWeightKg: number,
+  actualVolumeCbm: number,
+  convertedQuantity: number,
+) {
+  const actualQuantity = chargeMode === 'KG' ? actualWeightKg : actualVolumeCbm
+  if (!Number.isFinite(actualQuantity) || !Number.isFinite(convertedQuantity)) return '-'
+  const usesConvertedQuantity = convertedQuantity > actualQuantity
+  return chargeMode === 'KG'
+    ? usesConvertedQuantity ? '按体积重计费' : '按毛重计费'
+    : usesConvertedQuantity ? '按重量折算体积计费' : '按体积计费'
 }
 
 export function getTaxModeLabel(value: string) {

src/modules/overseas-warehouse/api/warehouseServices.ts

@@ -132,7 +132,7 @@ export function getDiscard(discardNo: string) {
 export function listDiscardCandidates(inboundCode?: string) {
   return apiRequest<DiscardCandidate[]>({ method: 'GET', url: '/merchant/v1/last-leg/cargo-discards/inventory-candidates', params: { inboundCode: inboundCode || undefined } })
 }
-export function createDiscard(payload: { items: Array<{ orderId?: string; returnCartonId?: string; inventoryPositionId?: string; cartonIds?: string[]; skuCode: string; discardPackages: number }>; idempotencyKey: string; remark?: string }) {
+export function createDiscard(payload: { items: Array<{ orderId?: string; returnCartonId?: string; inventoryPositionId?: string; cartonIds?: string[]; skuCode: string; discardPackages: number }>; idempotencyKey: string; remark?: string; requestedPackages?: number }) {
   return apiRequest<Record<string, unknown>>({ method: 'POST', url: '/merchant/v1/last-leg/cargo-discards', data: payload })
 }
 export function cancelDiscard(discardNo: string) {

src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs

@@ -2,6 +2,7 @@ import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
 import ts from 'typescript'
+import { createRequire } from 'node:module'
 
 const view = readFileSync(new URL('./ReturnOrdersView.vue', import.meta.url), 'utf8')
 const api = readFileSync(new URL('../api/returnOrders.ts', import.meta.url), 'utf8')
@@ -118,7 +119,7 @@ test('新建退货预报使用独立路由页面，编辑仍保留加宽弹框',
 
 test('新建预报铺满工作区，基础字段等宽对齐且数量输入保持紧凑', () => {
   assert.match(view, /return-create-surface \{ width:100%; min-width:0;[^}]*margin:0;/)
-  assert.match(view, /<el-form label-width="130px" class="return-create-form">/)
+  assert.match(view, /<el-form ref="createFormRef"[^>]*:model="form"[^>]*:rules="createFormRules"[^>]*label-position="top"/)
   assert.match(view, /return-create-form :deep\(\.el-input\), \.return-create-body \.return-create-form :deep\(\.el-select\) \{ width:100%; max-width:none;/)
   assert.match(view, /:deep\(\.el-table \.el-input-number\) \{ width:120px;/)
   assert.match(view, /<el-table class="return-forecast-table"[^>]*>/)
@@ -314,3 +315,37 @@ test('贴标入口保留完成入库门禁与退货来源，箱号只作为目
     { name: 'overseas-labeling-create', query: { returnNo: 'RT-TEST', warehouseId: 'WH-TEST', cartonMark: 'RC-TEST' } },
   ])
 })
+
+test('新增退货校验海外仓与联系人，空白联系人无效，客户参考号可选', async () => {
+  const { default: Schema } = createRequire(import.meta.resolve('element-plus'))('async-validator')
+  const source = view.slice(view.indexOf('const createFormRules:'), view.indexOf('const selectedOperationWarehouse ='))
+  const code = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const rules = new Function(code + '\nreturn createFormRules')()
+  const validator = new Schema(rules)
+  await assert.rejects(validator.validate({ overseasWarehouseId: '', warehouseContactName: ' ', warehouseContactPhone: '' }), error => {
+    assert.deepEqual(Object.keys(error.fields).sort(), ['overseasWarehouseId', 'warehouseContactName', 'warehouseContactPhone'])
+    return true
+  })
+  await validator.validate({ overseasWarehouseId: 'WH', warehouseContactName: 'Contact', warehouseContactPhone: '123456', customerReferenceNo: '' })
+})
+
+test('新增校验失败或正在提交时不继续创建，编辑保持既有校验路径', async () => {
+  const start = view.indexOf('async function submit()')
+  const end = view.indexOf('  const items =', start)
+  const code = view.slice(start, end) + '\nreturn "continue"\n}'
+  const creating = { value: false }, props = { createPage: true }
+  let validations = 0
+  const formRef = { value: { validate: async () => { validations++; throw new Error('required') } } }
+  const submit = new Function('creating', 'props', 'createFormRef', code + '\nreturn submit')(creating, props, formRef)
+  assert.equal(await submit(), undefined)
+  assert.equal(validations, 1)
+  creating.value = true
+  assert.equal(await submit(), undefined)
+  assert.equal(validations, 1)
+  creating.value = false
+  props.createPage = false
+  assert.equal(await submit(), 'continue')
+  props.createPage = true
+  formRef.value.validate = async () => true
+  assert.equal(await submit(), 'continue')
+})

src/modules/overseas-warehouse/views/ReturnOrdersView.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onActivated, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { ArrowLeft, ChevronDown, Plus } from '@lucide/vue'
 import { useRoute, useRouter } from 'vue-router'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
@@ -97,6 +97,12 @@ interface SkuDraft { id: number; skuCode: string; productNameZh: string; expecte
 let skuSequence = 0
 function emptySku(): SkuDraft { return { id: ++skuSequence, skuCode: '', productNameZh: '', expectedQuantity: 1 } }
 const form = reactive({ overseasWarehouseId: '', warehouseContactName: '', warehouseContactPhone: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] })
+const createFormRef = ref<FormInstance>()
+const createFormRules: FormRules = {
+  overseasWarehouseId: [{ required: true, message: '请选择海外仓', trigger: 'change' }],
+  warehouseContactName: [{ required: true, whitespace: true, message: '请输入联系人', trigger: 'blur' }],
+  warehouseContactPhone: [{ required: true, whitespace: true, message: '请输入联系电话', trigger: 'blur' }],
+}
 const selectedOperationWarehouse = computed(() => operationWarehouses.value.find(item => String(item.id) === form.overseasWarehouseId))
 function normalizedSku(value: string) { return value.trim().toUpperCase() }
 const duplicateSkuIds = computed(() => {
@@ -107,7 +113,7 @@ const duplicateSkuIds = computed(() => {
   }
   return new Set([...grouped.values()].filter(ids => ids.length > 1).flat())
 })
-function resetForm() { Object.assign(form, { overseasWarehouseId: '', warehouseContactName: '', warehouseContactPhone: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) }
+function resetForm() { createFormRef.value?.clearValidate(); Object.assign(form, { overseasWarehouseId: '', warehouseContactName: '', warehouseContactPhone: '', customerReferenceNo: '', remark: '', needRelabel: false, items: [emptySku()] }) }
 function warehouseLabel(warehouse: MerchantWarehouse) { return `${warehouse.warehouseName} · ${warehouse.warehouseCode}` }
 function operationWarehouseLabel(warehouseId: string) {
   const warehouse = operationWarehouses.value.find(item => String(item.id) === String(warehouseId))
@@ -117,6 +123,7 @@ function selectOperationWarehouse() {
   const warehouse = operationWarehouses.value.find(item => String(item.id) === form.overseasWarehouseId)
   form.warehouseContactName = warehouse?.contactName || ''
   form.warehouseContactPhone = warehouse?.contactPhone || ''
+  if (props.createPage) createFormRef.value?.clearValidate(['warehouseContactName', 'warehouseContactPhone'])
 }
 async function loadOperationWarehouses() {
   operationWarehousesLoading.value = true
@@ -251,6 +258,8 @@ function openRelabel(order: Pick<ReturnOrderSummary, 'returnNo' | 'overseasWareh
   void router.push({ name: 'overseas-labeling-create', query: { returnNo: order.returnNo, warehouseId: String(order.overseasWarehouseId), ...(cartonMark ? { cartonMark } : {}) } })
 }
 async function submit() {
+  if (creating.value) return
+  if (props.createPage && !await createFormRef.value?.validate().catch(() => false)) return
   const items = form.items.map(({ skuCode, productNameZh, expectedQuantity }) => ({ skuCode: skuCode.trim(), productNameZh: productNameZh.trim(), expectedQuantity }))
   if (!form.overseasWarehouseId || items.some(item => !item.skuCode || item.expectedQuantity <= 0)) { ElMessage.warning('请填写操作仓、SKU 和预报数量'); return }
   if (!form.warehouseContactName.trim() || !form.warehouseContactPhone.trim()) { ElMessage.warning('请填写海外仓联系人和联系电话'); return }
@@ -314,30 +323,38 @@ onBeforeUnmount(clearPhotoUrls)
 </script>
 
 <template>
-  <section class="return-orders-page">
+  <section class="return-orders-page" :class="{ 'return-orders-create client-ui': props.createPage }">
     <template v-if="props.createPage">
       <article class="return-create-surface">
         <header class="return-create-header">
           <div><h2>新建退货预报</h2></div>
           <el-button @click="returnToList"><ArrowLeft :size="16" />返回列表</el-button>
         </header>
-        <div class="return-create-body">
+        <el-form ref="createFormRef" class="return-create-body" :model="form" :rules="createFormRules" label-position="top" :disabled="creating" scroll-to-error @submit.prevent="submit">
-          <el-form label-width="130px" class="return-create-form">
+          <section class="return-create-section">
-            <el-form-item label="海外仓" required><el-select v-model="form.overseasWarehouseId" filterable clearable :loading="operationWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="" @change="selectOperationWarehouse"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><div v-if="operationWarehousesError" class="warehouse-error">{{ operationWarehousesError }}</div></el-form-item>
+            <h3>基础信息</h3>
-            <el-form-item label="客户参考号"><el-input v-model="form.customerReferenceNo" placeholder="" /></el-form-item>
+            <div class="return-create-form">
-            <el-form-item label="海外仓联系人" required><el-input v-model="form.warehouseContactName" :readonly="Boolean(selectedOperationWarehouse?.contactName)" placeholder="" /></el-form-item>
+              <el-form-item label="海外仓" prop="overseasWarehouseId"><el-select v-model="form.overseasWarehouseId" filterable clearable :loading="operationWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="请选择海外仓" popper-class="return-create-popper" @change="selectOperationWarehouse"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><div v-if="operationWarehousesError" class="warehouse-error">{{ operationWarehousesError }}</div></el-form-item>
-            <el-form-item label="海外仓联系电话" required><el-input v-model="form.warehouseContactPhone" :readonly="Boolean(selectedOperationWarehouse?.contactPhone)" placeholder="" /></el-form-item>
+              <el-form-item label="海外仓联系人" prop="warehouseContactName"><el-input v-model="form.warehouseContactName" :readonly="Boolean(selectedOperationWarehouse?.contactName)" placeholder="请输入海外仓联系人" /></el-form-item>
-            <el-form-item label="备注" class="return-form-wide"><el-input v-model="form.remark" type="textarea" :rows="2" placeholder="" /></el-form-item>
+              <el-form-item label="海外仓联系电话" prop="warehouseContactPhone"><el-input v-model="form.warehouseContactPhone" type="tel" :readonly="Boolean(selectedOperationWarehouse?.contactPhone)" placeholder="请输入海外仓联系电话" /></el-form-item>
-          </el-form>
+              <el-form-item label="客户参考号"><el-input v-model="form.customerReferenceNo" placeholder="请输入客户参考号（选填）" /></el-form-item>
-          <div class="items-title"><span>SKU 预报明细</span><el-button text type="primary" @click="addItem"><Plus :size="15" />添加 SKU</el-button></div>
+              <el-form-item label="备注" class="return-form-wide"><el-input v-model="form.remark" type="textarea" :rows="3" resize="vertical" placeholder="请输入退货要求或其他补充信息（选填）" /></el-form-item>
-          <div class="return-relabel-option"><span>是否换标</span><el-radio-group v-model="form.needRelabel" aria-label="是否换标"><el-radio-button :value="false">不换标</el-radio-button><el-radio-button :value="true">需要换标</el-radio-button></el-radio-group></div>␍          <el-table class="return-forecast-table" :data="form.items" row-key="id" size="small">
+            </div>
-            <el-table-column label="操作" width="80" fixed="left"><template #default="{ $index }"><el-button link type="danger" :disabled="form.items.length === 1" @click="removeItem($index)">删除</el-button></template></el-table-column>
+          </section>
-            <el-table-column label="SKU" width="300"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
+          <section class="return-create-section">
-            <el-table-column label="中文品名" min-width="320"><template #default="{ row }"><el-input v-model="row.productNameZh" placeholder="" /></template></el-table-column>
+            <div class="items-title"><h3>SKU 预报明细</h3><el-button type="primary" @click="addItem"><Plus :size="15" />添加 SKU</el-button></div>
-            <el-table-column label="预报数量" width="150"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="" /></template></el-table-column>
+            <div class="return-create-card">
-          </el-table>
+              <div class="return-relabel-option"><span>是否换标</span><el-radio-group v-model="form.needRelabel" aria-label="是否换标"><el-radio-button :value="false">不换标</el-radio-button><el-radio-button :value="true">需要换标</el-radio-button></el-radio-group></div>
-        </div>
+              <el-table class="return-forecast-table" :data="form.items" row-key="id" size="small">
-        <footer class="return-create-actions"><el-button @click="cancelCreate">取消</el-button><el-button type="primary" :loading="creating" @click="submit">提交预报</el-button></footer>
+                <el-table-column label="操作" width="80" fixed="left"><template #default="{ $index }"><el-button link type="danger" :disabled="form.items.length === 1" @click="removeItem($index)">删除</el-button></template></el-table-column>
+                <el-table-column label="SKU" width="300"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="请输入 SKU" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
+                <el-table-column label="中文品名" min-width="320"><template #default="{ row }"><el-input v-model="row.productNameZh" placeholder="请输入中文品名（选填）" /></template></el-table-column>
+                <el-table-column label="预报数量" width="150"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="请输入数量" /></template></el-table-column>
+              </el-table>
+            </div>
+          </section>
+        </el-form>
+        <footer class="return-create-actions"><el-button :disabled="creating" @click="cancelCreate">返回列表</el-button><el-button type="primary" :loading="creating" @click="submit">提交预报</el-button></footer>
       </article>
     </template>
 
@@ -600,3 +617,50 @@ onBeforeUnmount(clearPhotoUrls)
 @media (max-width: 900px) { .return-photo-grid { grid-template-columns:repeat(3,minmax(0,1fr)); } }
 @media (max-width: 720px) { .return-detail-header { grid-template-columns:1fr auto; } .return-back { grid-column:1/-1; } .return-pagination { padding:12px; } .return-photo-grid { grid-template-columns:repeat(2,minmax(0,1fr)); } }
 </style>
+
+<style scoped>
+.return-orders-create { --el-color-primary: #2f7bff; --el-text-color-regular: #1f2937; --el-text-color-placeholder: #b0b7c3; width: 100%; min-width: 0; background: #f4f7fc; color: #1f2937; font: 14px/1.5 "PingFang SC", "Microsoft YaHei", "Noto Sans SC", sans-serif; }
+.return-orders-create .return-create-surface { min-height: 0; overflow: visible; border: 0; border-radius: 0; background: transparent; }
+.return-orders-create .return-create-header { min-height: 44px; margin-bottom: 12px; padding: 0; border: 0; }
+.return-orders-create .return-create-header h2 { color: #1f2937; font-size: 26px; font-weight: 700; }
+.return-orders-create .return-create-body { padding: 0; }
+.return-orders-create .return-create-section { margin-bottom: 12px; }
+.return-orders-create .return-create-section h3 { display: flex; align-items: center; gap: 10px; margin: 0 0 10px; color: #1f2937; font-size: 18px; font-weight: 700; }
+.return-orders-create .return-create-section h3::before { content: ''; width: 9px; height: 9px; flex: 0 0 9px; border-radius: 50%; background: #2f7bff; }
+.return-orders-create .return-create-section:nth-of-type(2) h3::before { background: #0ea5a4; }
+.return-orders-create .return-create-form,
+.return-orders-create .return-create-card { min-width: 0; padding: 16px; box-sizing: border-box; border: 1px solid #e3e8f0; border-radius: 10px; background: #fff; }
+.return-orders-create .return-create-form { --el-component-size: 44px; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 12px 20px; }
+.return-orders-create .return-create-form :deep(.el-form-item) { min-width: 0; margin: 0; }
+.return-orders-create .return-create-form :deep(.el-form-item__label) { height: auto; margin: 0 0 6px; padding: 0; color: #374151; font-size: 14px; font-weight: 600; line-height: 20px; }
+.return-orders-create .return-create-form :deep(.el-form-item.is-required .el-form-item__label::before) { color: #e5484d; }
+.return-orders-create .return-create-form :deep(.el-form-item__content) { min-width: 0; line-height: 20px; }
+.return-orders-create .return-create-form :deep(.el-form-item__error) { position: absolute; top: auto; bottom: calc(100% + 6px); right: 0; left: auto; width: auto; max-width: calc(100% - 140px); padding: 0; font-size: 12px; line-height: 20px; text-align: right; }
+.return-orders-create :deep(.el-input__wrapper),
+.return-orders-create :deep(.el-select__wrapper),
+.return-orders-create :deep(.el-textarea__inner) { border: 1px solid #d5dce8; border-radius: 6px; box-shadow: none; }
+.return-orders-create .return-create-form :deep(.el-input__wrapper),
+.return-orders-create .return-create-form :deep(.el-select__wrapper) { min-height: 44px; box-sizing: border-box; padding: 10px 14px; }
+.return-orders-create .return-create-form :deep(.el-input__inner) { height: 22px; color: #1f2937; font-size: 14px; line-height: 22px; }
+.return-orders-create .return-create-form :deep(.el-textarea__inner) { min-height: 110px !important; padding: 11px 14px; color: #1f2937; font-size: 14px; line-height: 20px; }
+.return-orders-create :deep(.el-input__inner::placeholder),
+.return-orders-create :deep(.el-textarea__inner::placeholder),
+.return-orders-create :deep(.el-select__placeholder.is-transparent) { color: #b0b7c3; opacity: 1; }
+.return-orders-create :deep(.el-input__wrapper.is-focus),
+.return-orders-create :deep(.el-select__wrapper.is-focused),
+.return-orders-create :deep(.el-textarea__inner:focus) { outline: 2px solid #2f7bff; outline-offset: 0; }
+.return-orders-create :deep(.is-error .el-input__wrapper),
+.return-orders-create :deep(.is-error .el-select__wrapper),
+.return-orders-create :deep(.duplicate-sku-input .el-input__wrapper) { border-color: #e5484d; box-shadow: none; }
+.return-orders-create .items-title { margin: 0 0 10px; }
+.return-orders-create .items-title h3 { margin: 0; }
+.return-orders-create .return-relabel-option { margin: 0 0 12px; color: #374151; }
+.return-orders-create .return-relabel-option :deep(.el-radio-button__inner) { box-shadow: none; }
+.return-orders-create .return-create-actions { gap: 12px; padding: 0; border: 0; background: transparent; }
+.return-orders-create :deep(.el-button) { box-shadow: none; }
+.return-orders-create .return-create-header :deep(.el-button),
+.return-orders-create .return-create-actions :deep(.el-button) { min-height: 44px; margin-left: 0; padding: 10px 18px; border: 1px solid #d5dce8; border-radius: 6px; background: #fff; color: #1d5fe0; font-size: 14px; font-weight: 600; }
+.return-orders-create .return-create-actions :deep(.el-button--primary) { padding: 12px 28px; border-color: #2f7bff; background: #2f7bff; color: #fff; }
+.return-orders-create .return-create-actions :deep(.el-button.is-disabled) { opacity: .55; }
+:global(.return-create-popper.el-popper) { border: 1px solid #e3e8f0; border-radius: 6px; box-shadow: none; }
+</style>

src/modules/overseas-warehouse/views/labelingCreateForm.test.mjs

@@ -0,0 +1,67 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { computed, reactive, ref } from 'vue'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const { default: Schema } = createRequire(import.meta.resolve('element-plus'))('async-validator')
+const rulesSource = source.slice(source.indexOf('const labelingFormRules ='), source.indexOf('const orderInfoCollapsed ='))
+const rulesCode = ts.transpileModule(rulesSource, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+function harness(mode = 'carton', patch = {}) {
+  const labelingMode = ref(mode)
+  const form = reactive({ warehouse: 'warehouse-a', sourceOrder: 'source-a', contact: '联系人', phone: '12345678', labelDeadline: '2026-11-10T12:00:00', destination: 'FBA-A', deliveryMethod: 'TRUCK', relabel: false, ...patch })
+  const rules = new Function('computed', 'labelingMode', 'form', `${rulesCode}\nreturn labelingFormRules`)(computed, labelingMode, form)
+  return { form, labelingMode, validate: () => new Schema(rules.value).validate(form) }
+}
+
+test('order information reports every missing required field and rejects whitespace contacts', async () => {
+  const state = harness('carton', { warehouse: '', sourceOrder: '', contact: '  ', phone: ' ', labelDeadline: '', destination: '', deliveryMethod: '' })
+  await assert.rejects(state.validate(), error => {
+    assert.deepEqual(Object.keys(error.fields).sort(), ['warehouse', 'sourceOrder', 'contact', 'phone', 'labelDeadline', 'destination', 'deliveryMethod'].sort())
+    return true
+  })
+})
+
+test('SKU-only labeling excludes hidden destination and delivery requirements', async () => {
+  const state = harness('sku', { destination: '', deliveryMethod: '' })
+  await state.validate()
+  state.labelingMode.value = 'carton_and_sku'
+  await assert.rejects(state.validate(), error => Object.keys(error.fields).sort().join(',') === 'deliveryMethod,destination')
+})
+
+test('shipping label file is required only when express printing is selected', async () => {
+  const state = harness('carton', { deliveryMethod: 'EXPRESS', relabel: true })
+  await assert.rejects(state.validate(), error => Boolean(error.fields.shippingLabelFile))
+  state.form.shippingLabelFile = new File(['label'], 'label.pdf', { type: 'application/pdf' })
+  await state.validate()
+  state.form.shippingLabelFile = null
+  state.form.relabel = false
+  await state.validate()
+  state.form.relabel = true
+  state.form.deliveryMethod = 'TRUCK'
+  await state.validate()
+  state.form.deliveryMethod = 'EXPRESS'
+  state.labelingMode.value = 'sku'
+  await state.validate()
+})
+
+test('invalid create fields expand the order section and stop before submission logic', async () => {
+  const start = source.indexOf("async function submit(action:")
+  const end = source.indexOf("  if (props.service === 'transfer' && inventoryTransfer.value", start)
+  const preamble = source.slice(start, end) + '\nreturn "continue"\n}'
+  const code = ts.transpileModule(preamble, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const collapsed = ref(true), saving = ref(false), isLabelingCreate = ref(true)
+  let validations = 0
+  const formRef = ref({ validate: async () => { validations++; throw new Error('invalid') } })
+  const submit = new Function('saving', 'isLabelingCreate', 'orderInfoCollapsed', 'nextTick', 'labelingFormRef', `${code}\nreturn submit`)(saving, isLabelingCreate, collapsed, async () => {}, formRef)
+  assert.equal(await submit(), undefined)
+  assert.equal(collapsed.value, false)
+  assert.equal(validations, 1)
+  isLabelingCreate.value = false
+  assert.equal(await submit(), 'continue')
+  assert.equal(validations, 1)
+  saving.value = true
+  assert.equal(await submit(), undefined)
+})

src/modules/overseas-warehouse/views/transferCreateForm.test.mjs

@@ -0,0 +1,77 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { computed, reactive, ref } from 'vue'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const { default: Schema } = createRequire(import.meta.resolve('element-plus'))('async-validator')
+const ruleSource = source.slice(source.indexOf('const transferFormRules ='), source.indexOf('watch([inventoryTransfer,'))
+const code = ts.transpileModule(ruleSource, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+function harness(patch = {}) {
+  const form = reactive({ warehouse: 'WH', deliveryMethod: 'WAREHOUSE_PICKUP', address: 'Street 1', pickupContact: 'Contact', pickupPhone: '123456', estimatedArrivalAt: '2026-11-01T12:00:00', relabel: false, ...patch })
+  const inventoryTransfer = ref(false), transferDestinationType = ref('NONE'), labelingMode = ref('carton')
+  const rules = new Function('computed', 'inventoryTransfer', 'transferDestinationType', 'labelingMode', 'form', code + '\nreturn transferFormRules')(computed, inventoryTransfer, transferDestinationType, labelingMode, form)
+  return { form, inventoryTransfer, transferDestinationType, labelingMode, validate: () => new Schema(rules.value).validate(form) }
+}
+const hasFields = (...fields) => error => {
+  assert.deepEqual(Object.keys(error.fields).sort(), fields.sort())
+  return true
+}
+
+test('pickup requires contact and phone; customer delivery hides those requirements', async () => {
+  const state = harness({ pickupContact: ' ', pickupPhone: '' })
+  await assert.rejects(state.validate(), hasFields('pickupContact', 'pickupPhone'))
+  state.form.deliveryMethod = 'CUSTOMER_DELIVERY'
+  await state.validate()
+  state.form.address = ''
+  await assert.rejects(state.validate(), hasFields('address'))
+})
+
+test('inventory transfer excludes inbound address, arrival and pickup fields', async () => {
+  const state = harness({ deliveryMethod: '', address: '', estimatedArrivalAt: '', pickupContact: '', pickupPhone: '' })
+  state.inventoryTransfer.value = true
+  await state.validate()
+  state.form.warehouse = ''
+  await assert.rejects(state.validate(), hasFields('warehouse'))
+})
+
+test('destination switch validates only FBA or private warehouse fields currently visible', async () => {
+  const state = harness()
+  await state.validate()
+  state.transferDestinationType.value = 'FBA'
+  await assert.rejects(state.validate(), hasFields('destination'))
+  state.transferDestinationType.value = 'PRIVATE'
+  await assert.rejects(state.validate(), hasFields('privateDestinationAddress', 'privateDestinationPostalCode', 'privateDestinationContact', 'privateDestinationPhone'))
+  Object.assign(state.form, { privateDestinationAddress: 'Private street', privateDestinationPostalCode: '10000', privateDestinationContact: 'Person', privateDestinationPhone: '123456' })
+  await state.validate()
+  state.transferDestinationType.value = 'NONE'
+  await state.validate()
+})
+
+test('relabeling requires its visible fields, with no delivery method for SKU-only mode', async () => {
+  const state = harness({ relabel: true })
+  await assert.rejects(state.validate(), hasFields('labelDeadline', 'relabelContact', 'relabelPhone', 'relabelDeliveryMethod', 'relabelDestination'))
+  Object.assign(state.form, { labelDeadline: '2026-11-01T12:00:00', relabelContact: 'Contact', relabelPhone: '123456', relabelDestination: 'FBA-A' })
+  state.labelingMode.value = 'sku'
+  await state.validate()
+  state.labelingMode.value = 'carton_and_sku'
+  await assert.rejects(state.validate(), hasFields('relabelDeliveryMethod'))
+  state.form.relabel = false
+  await state.validate()
+})
+
+test('draft and submit stop before business requests when create validation fails; edit remains unchanged', async () => {
+  const start = source.indexOf('  if (isTransferCreate.value) {', source.indexOf('async function submit('))
+  const end = source.indexOf('  const primaryWarehouse =', start)
+  const code = 'return async function submit(action) {' + source.slice(start, end) + '\nreturn action\n}'
+  const isTransferCreate = ref(true)
+  const labelingFormRef = ref({ validate: async () => { throw new Error('required') } })
+  const submit = new Function('isTransferCreate', 'labelingFormRef', 'nextTick', code)(isTransferCreate, labelingFormRef, async () => {})
+  assert.equal(await submit('draft'), undefined)
+  assert.equal(await submit('submit'), undefined)
+  isTransferCreate.value = false
+  assert.equal(await submit('draft'), 'draft')
+  assert.equal(await submit('submit'), 'submit')
+})

src/modules/overseas-warehouse/views/warehouseDisposalForm.test.mjs

@@ -1,8 +1,39 @@
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
+import { createRequire } from 'node:module'
+import ts from 'typescript'
 
 const view = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const { default: Schema } = createRequire(import.meta.resolve('element-plus'))('async-validator')
+
+test('新增废弃逐字段校验仓库、来源单和原因，备注不影响提交资格', async () => {
+  const source = view.slice(view.indexOf('const disposalFormRules:'), view.indexOf('const labelingFormRef ='))
+  const code = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const rules = new Function(code + '\nreturn disposalFormRules')()
+  const validator = new Schema(rules)
+  await assert.rejects(validator.validate({ warehouse: '', sourceOrder: '', reason: '' }), error => {
+    assert.deepEqual(Object.keys(error.fields).sort(), ['reason', 'sourceOrder', 'warehouse'])
+    return true
+  })
+  const form = { warehouse: 'WH-A', sourceOrder: 'document:IN-A', reason: '其他', remark: '' }
+  await validator.validate(form)
+  await assert.rejects(validator.validate({ ...form, sourceOrder: '' }), error => Boolean(error.fields.sourceOrder))
+  await assert.rejects(validator.validate({ ...form, reason: ' ' }), error => Boolean(error.fields.reason))
+})
+
+test('新增废弃校验失败不进入库存提交判断，其他页面不调用废弃表单校验', async () => {
+  const guard = view.match(/  if \(isDisposalCreate\.value && !await labelingFormRef[^\n]+/)[0]
+  let validations = 0
+  const submit = new Function('isDisposalCreate', 'labelingFormRef', 'return async () => {' + guard + '\nreturn "continue"\n}')
+  const formRef = { value: { validate: async () => { validations++; throw new Error('required') } } }
+  assert.equal(await submit({ value: true }, formRef)(), undefined)
+  assert.equal(validations, 1)
+  assert.equal(await submit({ value: false }, formRef)(), 'continue')
+  assert.equal(validations, 1)
+  formRef.value.validate = async () => true
+  assert.equal(await submit({ value: true }, formRef)(), 'continue')
+})
 
 test('货物废弃先选择海外操作仓，再加载并选择该仓入库单', () => {
   assert.match(view, /props\.service === 'disposal'.*操作仓.*v-model="form\.warehouse".*@change="selectDiscardWarehouse"/s)
@@ -11,13 +42,19 @@ test('货物废弃先选择海外操作仓，再加载并选择该仓入库单',
   assert.match(view, /\|\| !primaryWarehouse \|\| invalidCargo/)
 })
 
+test('无箱唛按数量废弃时备注必填，选择箱唛废弃时备注可选', () => {
+  assert.match(view, /props\.service === 'disposal' && discardQuantityMode\.value && !form\.remark\.trim\(\)/)
+  assert.match(view, /请填写废弃备注/)
+  assert.match(view, /props\.service === 'disposal' && discardQuantityMode \? '备注 \*' : '备注'/)
+})
+
 
 test('废弃来源包含通用仓位，选择后带出全部库存且不把选择键提交为订单ID', () => {
   const body = view.match(/function selectDiscardInbound\(orderId: string\) \{([\s\S]*?)\n\}/)[1]
-  const select = new Function('discardSelectedBoxKeys', 'discardBoxSearch', 'selectAllDiscardBoxes', 'discardDocuments', 'cargoRows', 'form', 'cargoSequence', 'orderId', body)
+  const select = new Function('discardRequestedPackages', 'discardSelectedBoxKeys', 'discardBoxSearch', 'selectAllDiscardBoxes', 'discardDocuments', 'cargoRows', 'form', 'cargoSequence', 'orderId', body)
   const cargoRows = { value: [] }; const form = {}
   const source = { orderId: 'inventory:42', sourceType: 'INVENTORY', inventoryPositionId: '42', overseasWarehouseId: '99', inboundCode: 'WT-1', skus: [{ skuCode: 'A', productName: '商品', availablePackages: 100 }] }
-  select({ value: [] }, { value: '' }, () => {}, { value: [{ ...source, orderId: 'document:WT-1', sources: [source] }] }, cargoRows, form, 0, 'document:WT-1')
+  select({ value: 9 }, { value: [] }, { value: '' }, () => {}, { value: [{ ...source, orderId: 'document:WT-1', sources: [source] }] }, cargoRows, form, 0, 'document:WT-1')
   assert.equal(cargoRows.value[0].quantity, 100)
   assert.equal(cargoRows.value[0].sourceInventoryPositionId, '42')
   assert.equal(form.inboundNo, 'WT-1')

src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs

@@ -322,7 +322,8 @@ test('仓储转运可在新建页直接提交，也可保存草稿后编辑提
   assert.match(view, /v-if="props\.service === 'transfer'"[^>]*type="primary"[^>]*native-type="submit"[^>]*>提交订单/)
   assert.match(view, /await updateTransfer\(editingTransferNo\.value, payload\)/)
   assert.match(view, /await submitTransfer\(transferNo\)/)
-  assert.match(view, /<form [^>]*@submit\.prevent="submit\('submit'\)"/)
+  assert.match(view, /const isLabelingCreate = computed\(\(\) => props.service === 'labeling' && mode.value === 'create'\)/)
+  assert.match(view, /<component :is="isServiceCreate \? ElForm : 'form'"[^>]*@submit\.prevent="submit\('submit'\)"/)
   assert.match(view, /selectedDetail\?\.status !== 'DRAFT'[^>]*[\s\S]*?printTransferCartons[^>]*[\s\S]*?打印预报箱唛/)
   assert.doesNotMatch(view, /row\.__status !== 'DRAFT'.*printTransferCartons\(row\['0'\]\)/s)
   assert.doesNotMatch(view, /selectedDetail\?\.status === 'DRAFT'[^>]*[\s\S]*?>提交订单/)

src/modules/tenant-management/AGENTS.md

@@ -10,14 +10,15 @@
 
 | 目标 | 页面/路由 | API 与后端 |
 |---|---|---|
-| 企业资料、资质上传与状态 | `views/CompanyProfileView.vue`、`utils/qualificationFile.ts`、`utils/qualificationStatus.ts`；`company/profile` | `api/merchantIam.ts`；`iam/`、`file/` |
+| 企业资料、资质上传与状态 | `views/CompanyProfileView.vue`；编辑为 `views/CompanyProfileEditView.vue`、`company/profile/edit`；文件工具为 `utils/qualificationFile.ts`、`utils/qualificationStatus.ts` | `api/merchantIam.ts`；`iam/`、`file/` |
-| 企业成员管理 | `views/MembersView.vue`；`organization/members` | 页面经 `store/tenantAdministration.ts` → `api/merchantIam.ts`；`iam/`、`auth/` |
+| 企业成员管理 | 列表 `views/MembersView.vue`、`organization/members`；新增/编辑 `views/MemberEditorView.vue`、`organization/members/create`、`organization/members/:memberId/edit` | 页面经 `store/tenantAdministration.ts` → `api/merchantIam.ts`；`iam/`、`auth/` |
 | 企业角色 | `views/RolesView.vue`；`organization/roles` | 页面经 `store/tenantAdministration.ts` → `api/merchantIam.ts`；`iam/` |
 | 角色权限分配 | `views/PermissionsView.vue`；`organization/permissions` | 页面经 `store/tenantAdministration.ts` → `api/merchantIam.ts`；权限码常量见 `contracts.ts` |
 | 跨页状态与稳定契约 | `store/tenantAdministration.ts`、`contracts.ts`、`public.ts` | 服务端 DTO |
 
 ## 关键边界
 
+- 企业资料编辑、成员新增/编辑使用独立路由页面；角色新增/编辑使用居中弹框；权限分配保持独立页面。资质上传、文件预览、密码重置沿用专项弹框。当前承载依据见 [Client 界面样式规范](../../../../../docs/Client界面样式规范.md) 的“企业设置承载方式”。
 - 企业资料只修改 `contactPhone` 等企业联系信息，不提交或回填成员登录手机号；两者独立维护。
 - 成员登录手机号可选；修改时由 IAM/Auth 同步并撤销该账号现有会话，前端不互相回填或联动提交。
 - 审核必填资质仅营业执照与统一社会信用代码；法人身份证选填，可在已有营业执照后单独补传或替换。

src/modules/tenant-management/routes.ts

@@ -5,6 +5,21 @@ export const tenantManagementModule = {
   key: 'company',
   navigationGroup: { title: '企业管理', icon: Settings, dividerBefore: true },
   routes: [
+    {
+      path: 'company/profile/edit', name: 'company-profile-edit',
+      component: () => import('./views/CompanyProfileEditView.vue'), release: 'active',
+      meta: { title: '编辑企业资料', permission: 'company:profile:edit', keepAlive: false },
+    },
+    {
+      path: 'organization/members/create', name: 'member-create',
+      component: () => import('./views/MemberEditorView.vue'), release: 'active',
+      meta: { title: '新增成员', permission: 'company:member:create', keepAlive: false },
+    },
+    {
+      path: 'organization/members/:memberId/edit', name: 'member-edit', props: true,
+      component: () => import('./views/MemberEditorView.vue'), release: 'active',
+      meta: { title: '编辑成员', permission: 'company:member:edit', keepAlive: false },
+    },
     {
       path: 'company/profile',
       name: 'company-profile',

src/modules/tenant-management/views/CompanyProfileEditView.vue

@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { useTenantAdministrationStore, type TenantCompanyProfile } from '../store/tenantAdministration'
+import { useAuthStore } from '@/modules/auth/public'
+
+const store = useTenantAdministrationStore()
+const auth = useAuthStore()
+const router = useRouter()
+const loading = ref(false)
+const loadError = ref('')
+const profileSubmitting = ref(false)
+const profileFormRef = ref<FormInstance>()
+const draft = reactive<TenantCompanyProfile>({ ...store.company })
+const canEdit = computed(() => auth.hasPermission('company:profile:edit') && store.company.auditStatus !== 'ARCHIVED')
+const profileFormRules: FormRules<TenantCompanyProfile> = {
+  companyName: [{ required: true, whitespace: true, message: '请输入公司名称', trigger: 'blur' }],
+  legalRepresentative: [{ required: true, whitespace: true, message: '请输入法人姓名', trigger: 'blur' }],
+  contactName: [{ required: true, whitespace: true, message: '请输入联系人姓名', trigger: 'blur' }],
+  contactPhone: [
+    { required: true, whitespace: true, message: '请输入公司联系电话', trigger: 'blur' },
+    { pattern: /^[0-9-]{4,32}$/, message: '公司联系电话仅支持 4–32 位数字或连字符', trigger: 'blur' },
+  ],
+  contactEmail: [{ type: 'email', message: '请输入正确的联系邮箱', trigger: 'blur' }],
+}
+async function loadCompanyContext() {
+  loading.value = true
+  loadError.value = ''
+  try {
+    await store.loadCompanyContext()
+    Object.assign(draft, store.company)
+    profileFormRef.value?.clearValidate()
+  } catch (error) { loadError.value = error instanceof Error ? error.message : '企业资料加载失败' }
+  finally { loading.value = false }
+}
+onMounted(() => void loadCompanyContext())
+function returnToProfile() { void router.push({ name: 'company-profile' }) }
+async function saveProfile() {
+  if (profileSubmitting.value || loading.value || loadError.value || !canEdit.value) return
+  const valid = await profileFormRef.value?.validate().then(() => true).catch(() => false)
+  if (!valid) return
+  profileSubmitting.value = true
+  try {
+    await store.updateCompany({ ...draft })
+    ElMessage.success('企业资料已保存')
+    await router.push({ name: 'company-profile' })
+  } catch (error) { ElMessage.error(error instanceof Error ? error.message : '企业资料保存失败') }
+  finally { profileSubmitting.value = false }
+}
+</script>
+
+<template>
+  <section v-loading="loading" class="company-editor client-ui" :aria-busy="loading">
+    <header class="company-editor-heading"><h2>编辑企业资料</h2><el-button :disabled="profileSubmitting" @click="returnToProfile">返回企业资料</el-button></header>
+    <el-alert v-if="loadError" type="error" :closable="false" :title="loadError"><el-button @click="loadCompanyContext">重新加载</el-button></el-alert>
+    <el-alert v-else-if="!loading && !canEdit" title="当前企业资料不可编辑" type="warning" :closable="false" />
+    <el-form v-else ref="profileFormRef" :model="draft" :rules="profileFormRules" label-position="top" :disabled="loading || profileSubmitting || !canEdit" scroll-to-error @submit.prevent="saveProfile">
+      <section class="company-editor-section">
+        <h3>企业基本信息</h3>
+        <div class="company-editor-grid">
+          <el-form-item label="公司名称" prop="companyName" required><el-input v-model="draft.companyName" placeholder="请输入公司名称" /></el-form-item>
+          <el-form-item label="统一社会信用代码"><el-input v-model="draft.creditCode" disabled placeholder="未登记" /></el-form-item>
+          <el-form-item label="法人姓名" prop="legalRepresentative" required><el-input v-model="draft.legalRepresentative" placeholder="请输入法定代表人姓名" /></el-form-item>
+        </div>
+      </section>
+      <section class="company-editor-section">
+        <h3>联系信息</h3>
+        <div class="company-editor-grid">
+          <el-form-item label="联系人" prop="contactName" required><el-input v-model="draft.contactName" placeholder="请输入联系人姓名" /></el-form-item>
+          <el-form-item label="公司联系电话" prop="contactPhone" required><el-input v-model="draft.contactPhone" maxlength="32" inputmode="tel" placeholder="请输入公司联系电话" /><small class="company-editor-help">仅用于公司业务联系，不会修改任何成员的登录手机号。</small></el-form-item>
+          <el-form-item label="联系邮箱" prop="contactEmail"><el-input v-model="draft.contactEmail" placeholder="请输入联系邮箱（选填）" /></el-form-item>
+        </div>
+      </section>
+      <footer class="company-editor-actions"><el-button :disabled="profileSubmitting" @click="returnToProfile">返回企业资料</el-button><el-button v-if="canEdit" type="primary" native-type="submit" :loading="profileSubmitting">保存修改</el-button></footer>
+    </el-form>
+  </section>
+</template>
+
+<style scoped src="./companyEditor.css"></style>

src/modules/tenant-management/views/CompanyProfileView.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadFile } from 'element-plus'
+import type { UploadFile } from 'element-plus'
 import { Building2, CheckCircle2, Clock3, FileCheck2, FileText, Pencil, Trash2, Upload, UserRound } from '@lucide/vue'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
-import { useTenantAdministrationStore, type TenantCompanyProfile, type TenantQualification } from '@/modules/tenant-management/store/tenantAdministration'
+import { useTenantAdministrationStore, type TenantQualification } from '@/modules/tenant-management/store/tenantAdministration'
 import { useAuthStore } from '@/modules/auth/public'
 import { formatQualificationFileSize, qualificationUploadErrorMessage, validateQualificationFile } from '@/modules/tenant-management/utils/qualificationFile'
 import { qualificationStatusMeta } from '@/modules/tenant-management/utils/qualificationStatus'
@@ -20,6 +20,7 @@ import {
 const store = useTenantAdministrationStore()
 const auth = useAuthStore()
 const route = useRoute()
+const router = useRouter()
 const companyApproved = computed(() => store.company.auditStatus === 'ACTIVE')
 const auditStatusCopy = computed(() => ({
   PROFILE_REQUIRED: { title: '请完善企业资质', detail: '上传营业执照并提交审核后，才能提交头程订单；法人身份证可按需补充。' },
@@ -30,7 +31,6 @@ const auditStatusCopy = computed(() => ({
   ARCHIVED: { title: '企业已归档', detail: '该企业已结束使用，资料和历史业务仅供查看，不能再提交或修改。' },
 })[store.company.auditStatus])
 const activeTab = ref('basic')
-const editing = ref(false)
 const qualificationOpen = ref(false)
 const previewOpen = ref(false)
 const previewRecord = ref<TenantQualification | null>(null)
@@ -38,16 +38,13 @@ const previewUrl = ref('')
 const previewKind = ref<'image' | 'pdf'>('image')
 const previewError = ref('')
 const previewLoading = ref(false)
-const profileFormRef = ref<FormInstance>()
 const qualificationPage = ref(1)
 const qualificationPageSize = ref(10)
 const qualificationSubmitting = ref(false)
 const reviewSubmitting = ref(false)
 const deletingQualificationId = ref('')
-const profileSubmitting = ref(false)
 const loading = ref(false)
 const loadError = ref('')
-const draft = reactive<TenantCompanyProfile>({ ...store.company })
 type QualificationUploadState = 'idle' | 'uploading' | 'uploaded' | 'error'
 type QualificationTypeDefinition = { value: MerchantQualificationType; label: string; description: string; required: boolean }
 type QualificationDraftItem = QualificationTypeDefinition & {
@@ -146,16 +143,6 @@ const qualificationReviewDisabledReason = computed(() => {
 const qualificationPanelHint = computed(() => canUploadQualification.value
   ? '营业执照为必填；法人身份证、货代资质证书、银行开户许可证可选填。文件保存后需另行提交审核。'
   : qualificationUploadDisabledReason.value)
-const profileFormRules: FormRules<TenantCompanyProfile> = {
-  companyName: [{ required: true, whitespace: true, message: '请输入公司名称', trigger: 'blur' }],
-  legalRepresentative: [{ required: true, whitespace: true, message: '请输入法人姓名', trigger: 'blur' }],
-  contactName: [{ required: true, whitespace: true, message: '请输入联系人姓名', trigger: 'blur' }],
-  contactPhone: [
-    { required: true, whitespace: true, message: '请输入公司联系电话', trigger: 'blur' },
-    { pattern: /^[0-9-]{4,32}$/, message: '公司联系电话仅支持 4–32 位数字或连字符', trigger: 'blur' },
-  ],
-  contactEmail: [{ type: 'email', message: '请输入正确的联系邮箱', trigger: 'blur' }],
-}
 const qualificationColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 132, fixed: 'left', slotName: 'actions' },
   { key: 'type', prop: 'type', label: '文件类型', minWidth: 150 },
@@ -173,7 +160,6 @@ async function refreshCompanyContext() {
   loadError.value = ''
   try {
     await store.loadCompanyContext()
-    Object.assign(draft, store.company)
     return true
   } catch (error) {
     loadError.value = error instanceof Error ? error.message : '企业资料加载失败'
@@ -197,35 +183,9 @@ onMounted(async () => {
 onBeforeUnmount(() => qualificationDrafts.forEach(releaseQualificationPreview))
 
 function startEdit() {
-  if (store.company.auditStatus === 'ARCHIVED') return
+  if (!auth.hasPermission('company:profile:edit') || store.company.auditStatus === 'ARCHIVED') return
-  Object.assign(draft, store.company)
+  void router.push({ name: 'company-profile-edit' })
-  profileFormRef.value?.clearValidate()
-  editing.value = true
 }
-
-function cancelEdit() {
-  Object.assign(draft, store.company)
-  editing.value = false
-  profileFormRef.value?.clearValidate()
-}
-
-async function saveProfile() {
-  if (profileSubmitting.value) return
-  const valid = await profileFormRef.value?.validate().then(() => true).catch(() => false)
-  if (!valid) return
-  profileSubmitting.value = true
-  try {
-    await store.updateCompany({ ...draft })
-    Object.assign(draft, store.company)
-    editing.value = false
-    ElMessage.success('企业资料已保存')
-  } catch (error) {
-    ElMessage.error(error instanceof Error ? error.message : '企业资料保存失败')
-  } finally {
-    profileSubmitting.value = false
-  }
-}
-
 function openQualificationDialog() {
   if (!canUploadQualification.value) {
     ElMessage.warning(qualificationUploadDisabledReason.value)
@@ -619,23 +579,7 @@ function closeQualificationPreview() {
       </el-tab-pane>
     </el-tabs>
 
-    <el-drawer v-model="editing" title="编辑企业资料" size="min(620px, 94vw)" @closed="cancelEdit">
+
-      <el-form ref="profileFormRef" :model="draft" :rules="profileFormRules" label-position="top" class="profile-form">
-        <h3>企业基本信息</h3>
-        <div class="form-grid-two">
-          <el-form-item label="公司名称" prop="companyName" required><el-input v-model="draft.companyName" placeholder="请输入公司名称" /></el-form-item>
-          <el-form-item label="统一社会信用代码"><el-input v-model="draft.creditCode" disabled /></el-form-item>
-          <el-form-item label="法人姓名" prop="legalRepresentative" required><el-input v-model="draft.legalRepresentative" placeholder="请输入法定代表人姓名" /></el-form-item>
-        </div>
-        <h3>联系信息</h3>
-        <div class="form-grid-two">
-          <el-form-item label="联系人" prop="contactName" required><el-input v-model="draft.contactName" placeholder="请输入联系人姓名" /></el-form-item>
-          <el-form-item label="公司联系电话" prop="contactPhone" required><el-input v-model="draft.contactPhone" maxlength="32" inputmode="tel" placeholder="请输入公司联系电话" /><small class="profile-field-hint">仅用于公司业务联系，不会修改任何成员的登录手机号。</small></el-form-item>
-          <el-form-item label="联系邮箱" prop="contactEmail"><el-input v-model="draft.contactEmail" placeholder="请输入联系邮箱（选填）" /></el-form-item>
-        </div>
-      </el-form>
-      <template #footer><div class="drawer-actions"><el-button :disabled="profileSubmitting" @click="cancelEdit">取消</el-button><el-button type="primary" :loading="profileSubmitting" @click="saveProfile">保存修改</el-button></div></template>
-    </el-drawer>
 
     <el-dialog
       v-model="qualificationOpen"
@@ -741,12 +685,6 @@ function closeQualificationPreview() {
 .qualification-panel-actions { display:flex; flex-wrap:wrap; justify-content:flex-end; gap:8px; }
 .qualification-update-control { display: inline-flex; }
 .mobile-qualification-list { display: none; }
-.profile-form h3 { margin: 4px 0 18px; padding-bottom: 10px; border-bottom: 1px solid var(--border); font-size: 15px; }
-.profile-form h3:not(:first-child) { margin-top: 22px; }
-.profile-field-hint { display: block; margin-top: 5px; color: var(--muted); font-size: 10px; line-height: 1.5; }
-.form-grid-two { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 16px; }
-.form-grid-two .full-row { grid-column: 1 / -1; }
-.drawer-actions { display: flex; justify-content: flex-end; gap: 8px; }
 .mobile-qualification-actions { display: flex; align-items: center; gap: 8px; }
 .qualification-dialog-intro { display: flex; align-items: flex-start; justify-content: space-between; gap: 18px; margin-bottom: 16px; padding: 13px 15px; background: #f4f7f7; }
 .qualification-dialog-intro strong { color: var(--navy); font-size: 13px; }
@@ -784,7 +722,7 @@ function closeQualificationPreview() {
 .document-preview > span { max-width: 440px; padding: 0 16px; color: var(--muted); font-size: 11px; line-height: 1.6; text-align: center; }
 .document-preview-error { max-width: 440px; margin: 0; padding: 0 16px; color: #9a5a09; font-size: 11px; line-height: 1.6; text-align: center; }
 @media (max-width: 720px) {
-  .profile-grid, .form-grid-two { grid-template-columns: 1fr; }
+  .profile-grid { grid-template-columns: 1fr; }
   .qualification-dialog-intro { flex-direction: column; gap: 5px; }
   .qualification-dialog-intro span { text-align: left; }
   .qualification-upload-grid { grid-template-columns: 1fr; }

src/modules/tenant-management/views/EditorPages.test.mjs

@@ -0,0 +1,170 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import test from 'node:test'
+import ts from 'typescript'
+import { createMemoryHistory, createRouter } from 'vue-router'
+import { computed } from 'vue'
+
+const memberSource = readFileSync(new URL('./MemberEditorView.vue', import.meta.url), 'utf8')
+const profileSource = readFileSync(new URL('./CompanyProfileEditView.vue', import.meta.url), 'utf8')
+const listSource = readFileSync(new URL('./MembersView.vue', import.meta.url), 'utf8')
+const rolesSource = readFileSync(new URL('./RolesView.vue', import.meta.url), 'utf8')
+const transpile = source => ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+const compile = (source, bindings, result) => new Function(...Object.keys(bindings), transpile(source) + `\nreturn ${result}`)(...Object.values(bindings))
+
+test('editor routes use their write permissions, have no sidebar entries, and preserve member IDs on refresh', () => {
+  const source = readFileSync(new URL('../routes.ts', import.meta.url), 'utf8').replace(/^import .*$/gm, '').replace('export const', 'const')
+  const module = compile(source, { Building2: {}, KeyRound: {}, Settings: {}, ShieldCheck: {}, Users: {} }, 'tenantManagementModule')
+  const routes = module.routes.map(({ component, ...route }) => ({ ...route, component: {} }))
+  const router = createRouter({ history: createMemoryHistory(), routes: routes.map(route => ({ ...route, path: '/' + route.path })) })
+  for (const [name, path, permission] of [
+    ['member-create', '/organization/members/create', 'company:member:create'],
+    ['member-edit', '/organization/members/1234567890123456789/edit', 'company:member:edit'],
+    ['company-profile-edit', '/company/profile/edit', 'company:profile:edit'],
+  ]) {
+    const resolved = router.resolve(path)
+    assert.equal(resolved.name, name)
+    assert.equal(resolved.meta.permission, permission)
+    assert.equal(resolved.meta.keepAlive, false)
+    assert.equal(module.routes.find(route => route.name === name).navigation, undefined)
+  }
+  assert.equal(router.resolve('/organization/members/1234567890123456789/edit').params.memberId, '1234567890123456789')
+  assert.doesNotMatch(listSource, /<el-drawer/)
+  assert.match(listSource, /name: 'member-edit', params: \{ memberId: member.id \}/)
+  assert.match(rolesSource, /<el-dialog v-model="editorOpen"/)
+  assert.doesNotMatch(rolesSource, /<el-drawer/)
+})
+
+function memberLoader(id = '') {
+  const context = {
+    editingId: { value: id }, loading: { value: false }, loadError: { value: '' },
+    form: { password: 'old-input', roleIds: [] }, formRef: { value: { clearValidate() {} } },
+    store: { members: [], async loadRoles() {}, async loadMembers() {} },
+  }
+  const source = memberSource.slice(memberSource.indexOf('let loadVersion ='), memberSource.indexOf('onMounted('))
+  return { ...context, load: compile(source, context, 'loadEditor') }
+}
+
+test('direct member edit loads current fields and roles; unknown or failed records do not leave an editable blank form', async () => {
+  const state = memberLoader('member-a')
+  state.store.loadMembers = async () => { state.store.members = [{ id: 'member-a', name: '成员甲', account: 'member.a', phone: '', email: '', roleIds: ['role-a'] }] }
+  await state.load()
+  assert.equal(state.form.name, '成员甲')
+  assert.deepEqual(state.form.roleIds, ['role-a'])
+  assert.equal(state.form.password, '')
+  state.form.roleIds.push('role-b')
+  assert.deepEqual(state.store.members[0].roleIds, ['role-a'])
+  state.editingId.value = 'missing'
+  await state.load()
+  assert.match(state.loadError.value, /不存在或已不可访问/)
+  assert.equal(state.form.name, '')
+  state.store.loadMembers = async () => { throw new Error('查询失败') }
+  await state.load()
+  assert.equal(state.loadError.value, '查询失败')
+  assert.equal(state.loading.value, false)
+})
+
+test('a late previous member request cannot overwrite the newly selected member', async () => {
+  const state = memberLoader('member-a')
+  const resolves = []
+  state.store.loadRoles = () => new Promise(resolve => resolves.push(resolve))
+  state.store.members = [
+    { id: 'member-a', name: '甲', account: 'member.a', phone: '', email: '', roleIds: [] },
+    { id: 'member-b', name: '乙', account: 'member.b', phone: '', email: '', roleIds: [] },
+  ]
+  const previous = state.load()
+  state.editingId.value = 'member-b'
+  const current = state.load()
+  resolves[1]()
+  await current
+  assert.equal(state.form.name, '乙')
+  resolves[0]()
+  await previous
+  assert.equal(state.form.name, '乙')
+})
+
+function memberSaver(editing = false) {
+  const requests = [], routes = [], errors = []
+  const context = {
+    editingId: { value: editing ? 'member-a' : '' }, saving: { value: false }, loading: { value: false }, loadError: { value: '' }, canSave: { value: true },
+    form: { name: ' 成员 ', account: 'member.a', password: 'Test1234', phone: '', email: '', roleIds: ['role-a'] },
+    formRef: { value: { async validate() { return true }, async validateField() { return true } } },
+    store: { async createMember(payload) { requests.push({ kind: 'create', payload }) }, async updateMember(id, payload) { requests.push({ kind: 'edit', id, payload }) } },
+    router: { async push(route) { routes.push(route) } }, ElMessage: { success() {}, error(message) { errors.push(message) } },
+  }
+  const source = memberSource.slice(memberSource.indexOf('async function saveMember()'), memberSource.indexOf('</script>'))
+  return { ...context, requests, routes, errors, save: compile(source, context, 'saveMember') }
+}
+
+test('member create and edit retain distinct payloads and return to the list only after success', async () => {
+  const create = memberSaver()
+  await create.save()
+  assert.equal(create.requests[0].kind, 'create')
+  assert.equal(create.requests[0].payload.password, 'Test1234')
+  assert.equal(create.form.password, '')
+  assert.deepEqual(create.routes, [{ name: 'members' }])
+  const edit = memberSaver(true)
+  await edit.save()
+  assert.equal(edit.requests[0].kind, 'edit')
+  assert.equal(edit.requests[0].id, 'member-a')
+  assert.equal(edit.requests[0].payload.password, undefined)
+  assert.deepEqual(edit.requests[0].payload.roleIds, ['role-a'])
+})
+
+test('member permission, loading and invalid forms block writes; save failure keeps input for retry', async () => {
+  for (const field of ['saving', 'loading', 'loadError', 'canSave']) {
+    const state = memberSaver()
+    state[field].value = field === 'canSave' ? false : true
+    await state.save()
+    assert.equal(state.requests.length, 0)
+  }
+  const invalid = memberSaver()
+  invalid.formRef.value.validate = async () => { throw new Error('invalid') }
+  await invalid.save()
+  assert.equal(invalid.requests.length, 0)
+  const failed = memberSaver()
+  failed.store.createMember = async () => { throw new Error('创建失败') }
+  await failed.save()
+  assert.deepEqual(failed.errors, ['创建失败'])
+  assert.deepEqual(failed.routes, [])
+  assert.equal(failed.form.password, 'Test1234')
+  assert.equal(failed.saving.value, false)
+})
+
+test('member validation still requires create password, valid login phone, email and at least one role', async () => {
+  const { default: Schema } = createRequire(import.meta.resolve('element-plus'))('async-validator')
+  const source = memberSource.slice(memberSource.indexOf('const memberRules:'), memberSource.indexOf('let loadVersion'))
+  const rules = compile(source, {}, 'memberRules')
+  const validator = new Schema(rules)
+  const valid = { name: '成员', account: 'member.a', password: 'Test1234', phone: '', email: '', roleIds: ['role-a'] }
+  await validator.validate(valid)
+  for (const patch of [{ password: '' }, { phone: '123' }, { email: 'bad-email' }, { roleIds: [] }, { name: ' ' }]) {
+    await assert.rejects(validator.validate({ ...valid, ...patch }))
+  }
+})
+
+test('archived company blocks direct editing, and failed company saves preserve contact data', async () => {
+  const expression = profileSource.match(/^const canEdit = .*$/m)[0]
+  const store = { company: { auditStatus: 'ARCHIVED' }, async updateCompany() { throw new Error('保存失败') } }
+  const canEdit = compile(expression, { computed, auth: { hasPermission: () => true }, store }, 'canEdit')
+  assert.equal(canEdit.value, false)
+  const errors = [], routes = []
+  const context = {
+    profileSubmitting: { value: false }, loading: { value: false }, loadError: { value: '' }, canEdit: { value: false },
+    profileFormRef: { value: { async validate() { return true } } }, draft: { companyName: '企业', contactPhone: '010-12345678' }, store,
+    ElMessage: { success() {}, error(message) { errors.push(message) } }, router: { async push(route) { routes.push(route) } },
+  }
+  const source = profileSource.slice(profileSource.indexOf('async function saveProfile()'), profileSource.indexOf('</script>'))
+  const save = compile(source, context, 'saveProfile')
+  await save()
+  assert.deepEqual(errors, [])
+  context.canEdit.value = true
+  await save()
+  assert.deepEqual(errors, ['保存失败'])
+  assert.equal(context.draft.contactPhone, '010-12345678')
+  assert.deepEqual(routes, [])
+  store.updateCompany = async payload => { assert.equal(payload.contactPhone, '010-12345678'); assert.equal(payload.phone, undefined) }
+  await save()
+  assert.deepEqual(routes, [{ name: 'company-profile' }])
+})

src/modules/tenant-management/views/MemberEditorView.vue

@@ -0,0 +1,113 @@
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { useTenantAdministrationStore } from '../store/tenantAdministration'
+import { useAuthStore } from '@/modules/auth/public'
+
+const props = withDefaults(defineProps<{ memberId?: string }>(), { memberId: '' })
+const router = useRouter()
+const store = useTenantAdministrationStore()
+const auth = useAuthStore()
+const editingId = computed(() => props.memberId)
+const title = computed(() => editingId.value ? '编辑成员' : '新增成员')
+const canGrantMemberRole = computed(() => auth.hasPermission('company:member:grant-role'))
+const canSave = computed(() => auth.hasPermission(editingId.value ? 'company:member:edit' : 'company:member:create'))
+const loading = ref(false)
+const loadError = ref('')
+const saving = ref(false)
+const formRef = ref<FormInstance>()
+const form = reactive({ name: '', account: '', password: '', phone: '', email: '', roleIds: [] as string[] })
+const memberRules: FormRules = {
+  name: [{ required: true, whitespace: true, message: '请输入成员姓名', trigger: 'blur' }],
+  account: [
+    { required: true, message: '请输入登录账号', trigger: 'blur' },
+    { pattern: /^[A-Za-z0-9_.@-]{4,64}$/, message: '账号需为 4–64 位字母、数字或 _ . @ -', trigger: 'blur' },
+  ],
+  password: [
+    { required: true, message: '请输入初始密码', trigger: 'blur' },
+    { pattern: /^(?=.*[A-Za-z])(?=.*\d).{8,64}$/, message: '密码需为 8–64 位，并同时包含字母和数字', trigger: 'blur' },
+  ],
+  phone: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入有效的中国大陆登录手机号', trigger: 'blur' }],
+  email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }],
+  roleIds: [{ type: 'array', required: true, min: 1, message: '请至少选择一个成员角色', trigger: 'change' }],
+}
+let loadVersion = 0
+async function loadEditor() {
+  const version = ++loadVersion
+  loading.value = true
+  loadError.value = ''
+  Object.assign(form, { name: '', account: '', password: '', phone: '', email: '', roleIds: [] })
+  try {
+    await Promise.all([store.loadRoles(), ...(editingId.value ? [store.loadMembers()] : [])])
+    if (version !== loadVersion) return
+    if (editingId.value) {
+      const member = store.members.find(item => item.id === editingId.value)
+      if (!member) throw new Error('该成员不存在或已不可访问，请返回成员列表重新选择')
+      Object.assign(form, { name: member.name, account: member.account, phone: member.phone, email: member.email, roleIds: [...member.roleIds] })
+    }
+    formRef.value?.clearValidate()
+  } catch (error) {
+    if (version === loadVersion) loadError.value = error instanceof Error ? error.message : '成员资料加载失败'
+  } finally {
+    if (version === loadVersion) loading.value = false
+  }
+}
+onMounted(() => void loadEditor())
+watch(() => props.memberId, () => void loadEditor())
+function returnToList() { void router.push({ name: 'members' }) }
+async function saveMember() {
+  if (saving.value || loading.value || loadError.value || !canSave.value) return
+  form.name = form.name.trim()
+  form.account = form.account.trim()
+  form.phone = form.phone.trim()
+  form.email = form.email.trim()
+  const valid = editingId.value
+    ? await formRef.value?.validateField(['name', 'account', 'phone', 'email', 'roleIds']).then(() => true).catch(() => false)
+    : await formRef.value?.validate().catch(() => false)
+  if (!valid) return
+  saving.value = true
+  try {
+    if (editingId.value) {
+      await store.updateMember(editingId.value, { name: form.name, memberNo: form.account, phone: form.phone, email: form.email, roleIds: [...form.roleIds] })
+      ElMessage.success('成员信息已更新')
+    } else {
+      await store.createMember({ ...form, memberNo: form.account, roleIds: [...form.roleIds] })
+      ElMessage.success('成员已新增')
+    }
+    form.password = ''
+    await router.push({ name: 'members' })
+  } catch (error) {
+    ElMessage.error(error instanceof Error ? error.message : '成员保存失败，请重试')
+  } finally { saving.value = false }
+}
+</script>
+
+<template>
+  <section v-loading="loading" class="company-editor client-ui" :aria-busy="loading">
+    <header class="company-editor-heading"><h2>{{ title }}</h2><el-button :disabled="saving" @click="returnToList">返回列表</el-button></header>
+    <el-alert v-if="loadError" type="error" :closable="false" :title="loadError"><el-button @click="loadEditor">重新加载</el-button></el-alert>
+    <el-form v-else ref="formRef" :model="form" :rules="memberRules" label-position="top" :disabled="saving || loading || !canSave" scroll-to-error @submit.prevent="saveMember">
+      <section class="company-editor-section">
+        <h3>账号信息</h3>
+        <div class="company-editor-grid">
+          <el-form-item label="成员姓名" prop="name" required><el-input v-model="form.name" maxlength="64" placeholder="请输入成员姓名" /></el-form-item>
+          <el-form-item label="登录账号" prop="account" required><el-input v-model="form.account" :disabled="Boolean(editingId)" maxlength="64" placeholder="4–64 位字母、数字或 _ . @ -" /></el-form-item>
+          <el-form-item v-if="!editingId" label="初始密码" prop="password" required><el-input v-model="form.password" type="password" show-password autocomplete="new-password" maxlength="64" placeholder="8–64 位，同时包含字母和数字" /></el-form-item>
+        </div>
+      </section>
+      <section class="company-editor-section">
+        <h3>联系信息与角色</h3>
+        <div class="company-editor-grid">
+          <el-form-item label="登录手机号" prop="phone"><el-input v-model="form.phone" maxlength="11" inputmode="tel" autocomplete="tel" placeholder="请输入登录手机号（选填）" /><span class="company-editor-help">用于该成员手机号登录；修改后会同步认证账号并退出该成员现有会话。</span></el-form-item>
+          <el-form-item label="邮箱" prop="email"><el-input v-model="form.email" maxlength="128" placeholder="请输入邮箱（选填）" /></el-form-item>
+          <el-form-item label="成员角色" prop="roleIds" required><el-select v-model="form.roleIds" multiple :disabled="Boolean(editingId) && !canGrantMemberRole" placeholder="请选择角色" popper-class="company-editor-popper"><el-option v-for="role in store.roles.filter((item) => item.status === 'ACTIVE' && (!item.builtin || form.roleIds.includes(item.id)))" :key="role.id" :label="role.name" :value="role.id" :disabled="role.builtin" /></el-select></el-form-item>
+        </div>
+      </section>
+      <p v-if="!editingId" class="company-editor-help">请通过安全渠道将初始密码交给成员；前端不会保存或再次展示该密码。</p>
+      <footer class="company-editor-actions"><el-button :disabled="saving" @click="returnToList">返回列表</el-button><el-button v-if="canSave" type="primary" native-type="submit" :loading="saving">{{ editingId ? '保存修改' : '新增成员' }}</el-button></footer>
+    </el-form>
+  </section>
+</template>
+
+<style scoped src="./companyEditor.css"></style>

src/modules/tenant-management/views/MembersView.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { computed, nextTick, onMounted, reactive, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
-import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
 import { KeyRound, Pencil, Plus } from '@lucide/vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
@@ -9,31 +10,13 @@ import { useAuthStore } from '@/modules/auth/public'
 
 const store = useTenantAdministrationStore()
 const auth = useAuthStore()
+const router = useRouter()
 const memberFilters = ref({ keyword: '', status: '' as TenantRecordStatus | '' })
 const appliedMemberFilters = ref({ ...memberFilters.value })
 const memberPage = ref(1)
 const memberPageSize = ref(10)
-const editorOpen = ref(false)
-const editingId = ref('')
 const loading = ref(false)
 const loadError = ref('')
-const saving = ref(false)
-const formRef = ref<FormInstance>()
-const form = reactive({ name: '', account: '', password: '', phone: '', email: '', roleIds: [] as string[] })
-const memberRules: FormRules = {
-  name: [{ required: true, message: '请输入成员姓名', trigger: 'blur' }],
-  account: [
-    { required: true, message: '请输入登录账号', trigger: 'blur' },
-    { pattern: /^[A-Za-z0-9_.@-]{4,64}$/, message: '账号需为 4–64 位字母、数字或 _ . @ -', trigger: 'blur' },
-  ],
-  password: [
-    { required: true, message: '请输入初始密码', trigger: 'blur' },
-    { pattern: /^(?=.*[A-Za-z])(?=.*\d).{8,64}$/, message: '密码需为 8–64 位，并同时包含字母和数字', trigger: 'blur' },
-  ],
-  phone: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入有效的中国大陆登录手机号', trigger: 'blur' }],
-  email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }],
-  roleIds: [{ type: 'array', required: true, min: 1, message: '请至少选择一个成员角色', trigger: 'change' }],
-}
 
 const memberQueryFields: QueryField[] = [
   { key: 'keyword', type: 'input', placeholder: '姓名、账号、登录手机号或邮箱' },
@@ -56,7 +39,6 @@ const filteredMembers = computed(() => store.members.filter((member) => {
 const pagedMembers = computed(() => filteredMembers.value.slice((memberPage.value - 1) * memberPageSize.value, memberPage.value * memberPageSize.value))
 const canCreateMember = computed(() => auth.hasPermission('company:member:create'))
 const canEditMember = computed(() => auth.hasPermission('company:member:edit'))
-const canGrantMemberRole = computed(() => auth.hasPermission('company:member:grant-role'))
 const canChangeMemberStatus = computed(() => auth.hasPermission('company:member:status'))
 const canResetMemberPassword = computed(() => auth.hasPermission('company:member:reset-password'))
 
@@ -83,53 +65,8 @@ function searchMembers(filters: QueryModel) {
   void loadMembers()
 }
 
-function resetForm() {
+function openCreate() { void router.push({ name: 'member-create' }) }
-  editingId.value = ''
+function openEdit(member: TenantMember) { void router.push({ name: 'member-edit', params: { memberId: member.id } }) }
-  Object.assign(form, { name: '', account: '', password: '', phone: '', email: '', roleIds: [] })
-  void nextTick(() => formRef.value?.clearValidate())
-}
-
-function openCreate() {
-  resetForm()
-  editorOpen.value = true
-}
-
-function openEdit(member: TenantMember) {
-  editingId.value = member.id
-  Object.assign(form, { name: member.name, account: member.account, password: '', phone: member.phone, email: member.email, roleIds: [...member.roleIds] })
-  editorOpen.value = true
-}
-
-async function saveMember() {
-  if (saving.value) return
-  form.name = form.name.trim()
-  form.account = form.account.trim()
-  form.phone = form.phone.trim()
-  form.email = form.email.trim()
-  if (!editingId.value || form.password) {
-    const valid = await formRef.value?.validate().catch(() => false)
-    if (!valid) return
-  } else {
-    const valid = await formRef.value?.validateField(['name', 'account', 'phone', 'email', 'roleIds']).then(() => true).catch(() => false)
-    if (!valid) return
-  }
-  saving.value = true
-  try {
-    if (editingId.value) {
-      await store.updateMember(editingId.value, { name: form.name, memberNo: form.account, phone: form.phone, email: form.email, roleIds: [...form.roleIds] })
-      ElMessage.success('成员信息已更新')
-    } else {
-      await store.createMember({ ...form, memberNo: form.account, roleIds: [...form.roleIds] })
-      ElMessage.success('成员已新增')
-    }
-    editorOpen.value = false
-  } catch (error) {
-    ElMessage.error(error instanceof Error ? error.message : '成员保存失败，请重试')
-  } finally {
-    saving.value = false
-  }
-}
-
 async function toggleStatus(member: TenantMember) {
   const nextLabel = member.status === 'ACTIVE' ? '停用' : '启用'
   try {
@@ -194,17 +131,7 @@ async function resetPassword(member: TenantMember) {
       <div v-if="!pagedMembers.length" class="mobile-member-empty">没有匹配的企业成员，请调整筛选条件。</div>
     </div>
 
-    <el-drawer v-model="editorOpen" :title="editingId ? '编辑成员' : '新增成员'" size="min(520px, 94vw)" @closed="resetForm">
+
-      <el-form ref="formRef" :model="form" :rules="memberRules" label-position="top">
-        <el-form-item label="成员姓名" prop="name" required><el-input v-model="form.name" maxlength="64" placeholder="例如 张三" /></el-form-item>
-        <el-form-item label="登录账号" prop="account" required><el-input v-model="form.account" :disabled="Boolean(editingId)" maxlength="64" placeholder="4–64 位字母、数字或 _ . @ -" /></el-form-item>
-        <el-form-item v-if="!editingId" label="初始密码" prop="password" required><el-input v-model="form.password" type="password" show-password autocomplete="new-password" maxlength="64" placeholder="8–64 位，同时包含字母和数字" /></el-form-item>
-        <div class="member-form-grid"><el-form-item label="登录手机号" prop="phone"><el-input v-model="form.phone" maxlength="11" inputmode="tel" autocomplete="tel" placeholder="例如 13800138000（选填）" /><span class="member-field-help">用于该成员手机号登录；修改后会同步认证账号并退出该成员现有会话。</span></el-form-item><el-form-item label="邮箱" prop="email"><el-input v-model="form.email" maxlength="128" placeholder="例如 name@example.com（选填）" /></el-form-item></div>
-<el-form-item label="成员角色" prop="roleIds" required><el-select v-model="form.roleIds" multiple :disabled="Boolean(editingId) && !canGrantMemberRole" placeholder="请选择角色"><el-option v-for="role in store.roles.filter((item) => item.status === 'ACTIVE' && (!item.builtin || form.roleIds.includes(item.id)))" :key="role.id" :label="role.name" :value="role.id" :disabled="role.builtin" /></el-select></el-form-item>
-        <div v-if="!editingId" class="member-form-tip"><KeyRound :size="17" /><span>请通过安全渠道将初始密码交给成员；前端不会保存或再次展示该密码。</span></div>
-      </el-form>
-      <template #footer><div class="drawer-actions"><el-button :disabled="saving" @click="editorOpen = false">取消</el-button><el-button type="primary" :loading="saving" @click="saveMember">保存</el-button></div></template>
-    </el-drawer>
     </template>
   </section>
 </template>
@@ -223,14 +150,8 @@ async function resetPassword(member: TenantMember) {
 .member-identity small, .member-contact small { color: var(--muted); font-size: 10px; }
 .role-tags { display: flex; gap: 5px; flex-wrap: wrap; }
 .mobile-member-list, .mobile-member-empty { display: none; }
-.member-form-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 14px; }
-.member-form-tip { display: flex; gap: 10px; padding: 13px; border: 1px solid #cfe1dc; background: #f2f7f6; color: var(--muted); font-size: 11px; line-height: 1.6; }
-.member-field-help { margin-top: 5px; color: var(--muted); font-size: 10px; line-height: 1.5; }
-.member-form-tip svg { flex: 0 0 17px; color: var(--primary); }
-.drawer-actions { display: flex; justify-content: flex-end; gap: 8px; }
 .members-page :deep(.el-form-item__error) { line-height: 1.45; overflow-wrap: anywhere; }
 @media (max-width: 720px) {
-  .member-form-grid { grid-template-columns: 1fr; }
   .desktop-member-table { display: none; }
   .mobile-member-list { display: grid; gap: 10px; padding: 10px; }
   .mobile-member-empty { display: grid; min-height: 150px; place-items: center; border-top: 1px solid var(--border); color: #98a2a9; font-size: 13px; text-align: center; }
@@ -241,6 +162,5 @@ async function resetPassword(member: TenantMember) {
   .mobile-member-list dt { color: var(--muted); font-size: 10px; }
   .mobile-member-list dd { margin: 4px 0 0; font-size: 12px; }
   .mobile-member-list footer { display: flex; justify-content: flex-end; padding-top: 10px; border-top: 1px solid var(--border); }
-  .drawer-actions { flex-wrap: wrap; }
 }
 </style>

src/modules/tenant-management/views/RolesView.vue

@@ -160,15 +160,15 @@ function assignPermissions(role: TenantRole) {
       </DataTable>
     </div>
 
-    <el-drawer v-model="editorOpen" :title="editingId ? '编辑角色' : '新增角色'" size="min(500px, 94vw)" @closed="resetForm">
+    <el-dialog v-model="editorOpen" :title="editingId ? '编辑角色' : '新增角色'" width="560px" align-center :close-on-click-modal="!saving" :close-on-press-escape="!saving" :show-close="!saving" @closed="resetForm">
-      <el-form ref="formRef" :model="form" :rules="roleRules" label-position="top">
+      <el-form ref="formRef" :model="form" :rules="roleRules" label-position="top" class="role-editor-form" :disabled="saving">
         <el-form-item label="角色名称" prop="name" required><el-input v-model="form.name" maxlength="30" placeholder="例如 订单操作员" /></el-form-item>
         <el-form-item label="角色编码" prop="code" required><el-input v-model="form.code" :disabled="Boolean(editingId)" placeholder="例如 ORDER_OPERATOR" maxlength="40" /></el-form-item>
-        <el-form-item label="角色说明" prop="description" required><el-input v-model="form.description" type="textarea" :rows="4" maxlength="200" show-word-limit placeholder="简要说明该角色的职责和适用范围" /></el-form-item>
+        <el-form-item class="role-editor-wide" label="角色说明" prop="description" required><el-input v-model="form.description" type="textarea" :rows="4" maxlength="200" show-word-limit placeholder="简要说明该角色的职责和适用范围" /></el-form-item>
-        <div class="role-form-tip">保存后请前往“菜单权限”为角色分配可见菜单和操作权限。</div>
+        <div class="role-form-tip role-editor-wide">保存后请前往“菜单权限”为角色分配可见菜单和操作权限。</div>
       </el-form>
-      <template #footer><div class="drawer-actions"><el-button :disabled="saving" @click="editorOpen = false">取消</el-button><el-button type="primary" :loading="saving" @click="saveRole">保存</el-button></div></template>
+      <template #footer><div class="dialog-actions"><el-button :disabled="saving" @click="editorOpen = false">取消</el-button><el-button type="primary" :loading="saving" @click="saveRole">保存</el-button></div></template>
-    </el-drawer>
+    </el-dialog>
     </template>
   </section>
 </template>
@@ -186,7 +186,22 @@ function assignPermissions(role: TenantRole) {
 .role-identity strong { overflow-wrap: anywhere; }
 .role-identity code { color: var(--muted); font-size: 10px; }
 .role-form-tip { padding: 12px; background: #f2f7f6; color: var(--muted); font-size: 11px; }
-.drawer-actions { display: flex; justify-content: flex-end; gap: 8px; }
+.dialog-actions { display: flex; justify-content: flex-end; gap: 8px; }
 .roles-page :deep(.el-form-item__error) { line-height: 1.45; overflow-wrap: anywhere; }
-@media (max-width: 600px) { .drawer-actions { flex-wrap: wrap; } }
+@media (max-width: 600px) { .dialog-actions { flex-wrap: wrap; } }
+</style>
+
+<style scoped>
+.role-editor-form { --el-color-primary: #2f7bff; --el-text-color-placeholder: #b0b7c3; --el-component-size: 44px; display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px 20px; }
+.role-editor-wide { grid-column: 1 / -1; }
+.role-editor-form :deep(.el-form-item) { min-width: 0; margin: 0; }
+.role-editor-form :deep(.el-form-item__label) { height: auto; margin: 0 0 6px; padding: 0; color: #374151; font-size: 14px; font-weight: 600; line-height: 20px; }
+.role-editor-form :deep(.el-form-item__content) { line-height: 20px; }
+.role-editor-form :deep(.el-form-item__error) { position: absolute; top: auto; bottom: calc(100% + 6px); right: 0; left: auto; max-width: calc(100% - 70px); padding: 0; font-size: 12px; line-height: 20px; text-align: right; }
+.role-editor-form :deep(.el-input__wrapper) { min-height: 44px; padding: 10px 14px; box-sizing: border-box; border: 1px solid #d5dce8; border-radius: 6px; box-shadow: none; }
+.role-editor-form :deep(.el-input__inner) { height: 22px; line-height: 22px; }
+.role-editor-form :deep(.el-textarea__inner) { min-height: 110px; padding: 11px 14px; border: 1px solid #d5dce8; border-radius: 6px; box-shadow: none; }
+.role-editor-form :deep(.el-input__wrapper.is-focus), .role-editor-form :deep(.el-textarea__inner:focus) { outline: 2px solid #2f7bff; outline-offset: 0; }
+.role-editor-form :deep(.is-error .el-input__wrapper), .role-editor-form :deep(.is-error .el-textarea__inner) { border-color: #e5484d; }
+.role-editor-form .role-form-tip { padding: 0; background: transparent; color: #6b7280; font-size: 12px; }
 </style>

src/modules/tenant-management/views/TenantAdministrationViews.test.mjs

@@ -4,7 +4,10 @@ import test from 'node:test'
 
 const routerSource = fs.readFileSync(new URL('../routes.ts', import.meta.url), 'utf8')
 const profileSource = fs.readFileSync(new URL('./CompanyProfileView.vue', import.meta.url), 'utf8')
-const membersSource = fs.readFileSync(new URL('./MembersView.vue', import.meta.url), 'utf8')
+const membersListSource = fs.readFileSync(new URL('./MembersView.vue', import.meta.url), 'utf8')
+const memberEditorSource = fs.readFileSync(new URL('./MemberEditorView.vue', import.meta.url), 'utf8')
+const membersSource = membersListSource + '\n' + memberEditorSource
+const profileEditorSource = fs.readFileSync(new URL('./CompanyProfileEditView.vue', import.meta.url), 'utf8')
 const rolesSource = fs.readFileSync(new URL('./RolesView.vue', import.meta.url), 'utf8')
 const permissionsSource = fs.readFileSync(new URL('./PermissionsView.vue', import.meta.url), 'utf8')
 const storeSource = fs.readFileSync(new URL('../store/tenantAdministration.ts', import.meta.url), 'utf8')
@@ -15,7 +18,7 @@ test('routes tenant administration modules to implemented views instead of the p
   assert.match(routerSource, /path: 'organization\/members'[\s\S]*?MembersView\.vue/)
   assert.match(routerSource, /path: 'organization\/roles'[\s\S]*?RolesView\.vue/)
   assert.match(routerSource, /path: 'organization\/permissions'[\s\S]*?PermissionsView\.vue/)
-  assert.equal((routerSource.match(/release: 'active'/g) ?? []).length, 4)
+  assert.equal((routerSource.match(/release: 'active'/g) ?? []).length, 7)
   assert.doesNotMatch(routerSource, /ModuleView\.vue/)
 })
 
@@ -23,7 +26,7 @@ test('implements company details, contact information and qualification workflow
   assert.match(profileSource, /企业基本信息/)
   assert.match(profileSource, /联系信息/)
   assert.match(profileSource, /资质文件/)
-  assert.match(profileSource, /async function saveProfile\(\)/)
+  assert.match(profileEditorSource, /async function saveProfile\(\)/)
   assert.match(profileSource, /function submitQualification\(closeDialog = true\)/)
   assert.match(profileSource, /validateQualificationFile/)
   assert.match(profileSource, /function removeSelectedFile\(type: MerchantQualificationType\)/)
@@ -66,9 +69,9 @@ test('implements company details, contact information and qualification workflow
   assert.doesNotMatch(profileSource, /<el-table class="desktop-qualification-table"/)
   assert.doesNotMatch(profileSource, /class="profile-summary-card"/)
   assert.match(profileSource, /class="info-panel-header"[\s\S]*auth\.hasPermission\('company:profile:edit'\)/)
-  assert.match(profileSource, /ref="profileFormRef" :model="draft" :rules="profileFormRules"/)
+  assert.match(profileEditorSource, /ref="profileFormRef" :model="draft" :rules="profileFormRules"/)
-  assert.match(profileSource, /prop="companyName" required><el-input v-model="draft\.companyName" placeholder="请输入公司名称"/)
+  assert.match(profileEditorSource, /prop="companyName" required><el-input v-model="draft\.companyName" placeholder="请输入公司名称"/)
-  assert.match(profileSource, /const valid = await profileFormRef\.value\?\.validate\(\)/)
+  assert.match(profileEditorSource, /const valid = await profileFormRef\.value\?\.validate\(\)/)
   assert.match(profileSource, /const requiredQualificationTypes = qualificationTypes\.filter\(\(type\) => type\.required\)/)
   assert.match(profileSource, /货代资质证书'.*required: false/)
   assert.match(profileSource, /法人身份证'.*required: false/)
@@ -116,9 +119,9 @@ test('implements company details, contact information and qualification workflow
   assert.match(profileSource, /<dt>注册资本<\/dt><dd>\{\{ store\.company\.registeredCapital/)
   assert.match(profileSource, /<dt>联系微信<\/dt><dd>\{\{ store\.company\.contactWechat/)
   assert.match(profileSource, /<dt>公司联系电话<\/dt><dd>\{\{ store\.company\.contactPhone/)
-  assert.match(profileSource, /label="公司联系电话" prop="contactPhone" required/)
+  assert.match(profileEditorSource, /label="公司联系电话" prop="contactPhone" required/)
-  assert.match(profileSource, /不会修改任何成员的登录手机号/)
+  assert.match(profileEditorSource, /不会修改任何成员的登录手机号/)
-  assert.match(profileSource, /pattern: \/\^\[0-9-\]\{4,32\}\$\//)
+  assert.match(profileEditorSource, /pattern: \/\^\[0-9-\]\{4,32\}\$\//)
   assert.doesNotMatch(profileSource, /<dt>联系电话<\/dt><dd>\{\{ store\.company\.contactPhone/)
   assert.match(storeSource, /expiresAt: item\.validTo \|\| '长期有效'/)
   assert.match(storeSource, /fileName: item\.originalFileName\?\.trim\(\) \|\| '—'/)

src/modules/tenant-management/views/companyEditor.css

@@ -0,0 +1,32 @@
+.company-editor {
+  --el-color-primary: #2f7bff;
+  --el-text-color-regular: #1f2937;
+  --el-text-color-placeholder: #b0b7c3;
+  width: 100%; min-width: 0; color: #1f2937; background: #f4f7fc;
+  font: 14px/1.5 "PingFang SC", "Microsoft YaHei", "Noto Sans SC", sans-serif;
+}
+.company-editor-heading { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px; }
+.company-editor-heading h2 { margin: 0; font-size: 26px; font-weight: 700; }
+.company-editor-section { margin-bottom: 12px; }
+.company-editor-section h3 { display: flex; align-items: center; gap: 10px; margin: 0 0 10px; font-size: 18px; font-weight: 700; }
+.company-editor-section h3::before { content: ''; width: 9px; height: 9px; flex: 0 0 9px; border-radius: 50%; background: #2f7bff; }
+.company-editor-section:nth-of-type(2) h3::before { background: #0ea5a4; }
+.company-editor-grid { --el-component-size: 44px; display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 12px 20px; padding: 16px; border: 1px solid #e3e8f0; border-radius: 10px; background: #fff; }
+.company-editor-grid :deep(.el-form-item) { min-width: 0; margin: 0; }
+.company-editor-grid :deep(.el-form-item__label) { height: auto; margin: 0 0 6px; padding: 0; color: #374151; font-size: 14px; font-weight: 600; line-height: 20px; }
+.company-editor-grid :deep(.el-form-item.is-required .el-form-item__label::before) { color: #e5484d; }
+.company-editor-grid :deep(.el-form-item__content) { min-width: 0; line-height: 20px; align-content: flex-start; }
+.company-editor-grid :deep(.el-form-item__error) { position: absolute; top: 0; right: 0; bottom: auto; left: auto; max-width: calc(100% - 120px); padding: 0; transform: translateY(calc(-100% - 6px)); font-size: 12px; line-height: 20px; text-align: right; }
+.company-editor-grid :deep(.el-input), .company-editor-grid :deep(.el-select) { width: 100%; }
+.company-editor-grid :deep(.el-input__wrapper), .company-editor-grid :deep(.el-select__wrapper) { min-height: 44px; padding: 10px 14px; box-sizing: border-box; border: 1px solid #d5dce8; border-radius: 6px; box-shadow: none; }
+.company-editor-grid :deep(.el-input__inner) { height: 22px; color: #1f2937; font-size: 14px; line-height: 22px; }
+.company-editor-grid :deep(.el-input__wrapper.is-focus), .company-editor-grid :deep(.el-select__wrapper.is-focused) { outline: 2px solid #2f7bff; outline-offset: 0; }
+.company-editor-grid :deep(.is-error .el-input__wrapper), .company-editor-grid :deep(.is-error .el-select__wrapper) { border-color: #e5484d; }
+.company-editor-grid :deep(.el-input__inner::placeholder), .company-editor-grid :deep(.el-select__placeholder.is-transparent) { color: #b0b7c3; opacity: 1; }
+.company-editor-help { display: block; margin: 4px 0 12px; color: #6b7280; font-size: 12px; line-height: 20px; }
+.company-editor-grid .company-editor-help { margin-bottom: 0; }
+.company-editor-actions { display: flex; justify-content: flex-end; gap: 12px; }
+.company-editor-heading :deep(.el-button), .company-editor-actions :deep(.el-button) { min-height: 44px; margin-left: 0; padding: 10px 18px; border: 1px solid #d5dce8; border-radius: 6px; background: #fff; color: #1d5fe0; font-size: 14px; font-weight: 600; box-shadow: none; }
+.company-editor-actions :deep(.el-button--primary) { padding: 12px 28px; border-color: #2f7bff; background: #2f7bff; color: #fff; }
+.company-editor-heading :deep(.el-button.is-disabled), .company-editor-actions :deep(.el-button.is-disabled) { opacity: .55; }
+:global(.company-editor-popper.el-popper) { border: 1px solid #e3e8f0; border-radius: 6px; box-shadow: none; }

src/styles/shell.css

@@ -29,9 +29,16 @@
 .client-nav-menu { flex: 1; background: transparent; }
 .client-nav-submenu { margin: 3px 0 2px 15px; padding: 0 0 0 12px; border-left: 1px solid #e6ebf2; }
 .client-nav-node { min-width: 0; }
+.client-nav-menu > .client-nav-node[data-nav-key="dashboard"] { --client-nav-icon-color: #2f7bff; }
+.client-nav-menu > .client-nav-node[data-nav-key="order-center"] { --client-nav-icon-color: #16a34a; }
+.client-nav-menu > .client-nav-node[data-nav-key="first-leg-customs-documents"] { --client-nav-icon-color: #8b5cf6; }
+.client-nav-menu > .client-nav-node[data-nav-key="first-leg-sailing-prices"] { --client-nav-icon-color: #e84877; }
+.client-nav-menu > .client-nav-node[data-nav-key="overseas-warehouse-center"] { --client-nav-icon-color: #0ea5a4; }
+.client-nav-menu > .client-nav-node[data-nav-key="finance-center"] { --client-nav-icon-color: #f59e0b; }
+.client-nav-menu > .client-nav-node[data-nav-key="company-center"] { --client-nav-icon-color: #64748b; }
 .client-nav-node.has-divider-before { margin-top: 9px; padding-top: 9px; border-top: 1px solid #eef2f7; }
 .client-sidebar-group-trigger,
-.client-sidebar-link { display: flex; position: relative; width: 100%; min-height: 46px; min-width: 0; align-items: center; gap: 11px; margin: 2px 0; padding: 7px 10px; border: 1px solid transparent; border-radius: 12px; color: #64748b; font-size: 13px; font-weight: 650; line-height: 1.35; transition: color .25s ease, background .25s ease, border-color .25s ease, transform .25s ease; }
+.client-sidebar-link { display: flex; position: relative; width: 100%; min-height: 46px; min-width: 0; align-items: center; gap: 11px; margin: 2px 0; padding: 7px 10px; border: 1px solid transparent; border-radius: 12px; color: #374151; font-size: 13px; font-weight: 650; line-height: 1.35; transition: color .25s ease, background .25s ease, border-color .25s ease, transform .25s ease; }
 .client-sidebar-group-trigger { border: 0; background: transparent; cursor: pointer; text-align: left; }
 .client-sidebar-link { text-decoration: none; }
 .client-sidebar-group-trigger:hover,
@@ -44,7 +51,7 @@
 .client-nav-submenu .client-sidebar-link[aria-current="page"] { border-color: #dbeafe; background: #eff6ff; color: #2563eb; font-weight: 650; }
 .client-nav-node.is-active-parent > .client-sidebar-group-trigger { background: #f8faff; color: #2563eb; font-weight: 650; }
 .client-sidebar .client-sidebar-group-trigger > .client-sidebar-node-icon,
-.client-nav-menu > .client-nav-node > .client-sidebar-link > .client-sidebar-node-icon { width: 31px; height: 31px; flex: 0 0 31px; padding: 7px; border-radius: 9px; background: #f1f5f9; color: #64748b; }
+.client-nav-menu > .client-nav-node > .client-sidebar-link > .client-sidebar-node-icon { width: 31px; height: 31px; flex: 0 0 31px; padding: 7px; border-radius: 9px; background: #f1f5f9; color: var(--client-nav-icon-color, #64748b); }
 .client-nav-menu > .client-nav-node > .client-sidebar-link[aria-current="page"] > .client-sidebar-node-icon { background: rgba(255, 255, 255, .14); color: #fff; }
 .client-sidebar .client-sidebar-group-chevron { width: 16px; height: 16px; flex: 0 0 16px; margin-left: auto; transform: rotate(-90deg); transition: transform .2s ease; }
 .client-sidebar-group-trigger[aria-expanded="true"] .client-sidebar-group-chevron { transform: rotate(0); }