From 7500f37846484565747162b82beb46b3beaf8f29 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 12:39:57 +0800
Subject: [PATCH 01/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 output/appointment-calendar/compact-month.png | Bin 0 -> 92086 bytes
 output/appointment-calendar/compact-week.png  | Bin 0 -> 70039 bytes
 .../appointment-calendar/delete-success.png   | Bin 0 -> 43688 bytes
 output/appointment-calendar/final-week.png    | Bin 0 -> 83487 bytes
 output/appointment-calendar/verification.json |  36 ++++++++++++------
 5 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 output/appointment-calendar/compact-month.png
 create mode 100644 output/appointment-calendar/compact-week.png
 create mode 100644 output/appointment-calendar/delete-success.png
 create mode 100644 output/appointment-calendar/final-week.png

diff --git a/output/appointment-calendar/compact-month.png b/output/appointment-calendar/compact-month.png
new file mode 100644
index 0000000000000000000000000000000000000000..d673a5bca6e571addb5ca6ad1ece3d30d53eb801
GIT binary patch
literal 92086
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

literal 0
HcmV?d00001

diff --git a/output/appointment-calendar/compact-week.png b/output/appointment-calendar/compact-week.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d1a19071f2d98a7c5a35a52ea637052d0d3359b
GIT binary patch
literal 70039
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
W9IOBFFSvyNv)%Cax1alV`2Pc!htT2x

literal 0
HcmV?d00001

diff --git a/output/appointment-calendar/delete-success.png b/output/appointment-calendar/delete-success.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffc7e6a933d65c865b8a1d81d0f9550d6b540bdf
GIT binary patch
literal 43688
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
F0stz({4oFk

literal 0
HcmV?d00001

diff --git a/output/appointment-calendar/final-week.png b/output/appointment-calendar/final-week.png
new file mode 100644
index 0000000000000000000000000000000000000000..537754b2c36184691186f2a4da9781c9eb63b570
GIT binary patch
literal 83487
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
Oe(vl4`1H~Dy?+4;jm-D}

literal 0
HcmV?d00001

diff --git a/output/appointment-calendar/verification.json b/output/appointment-calendar/verification.json
index d07ba16f..3d7be27c 100644
--- a/output/appointment-calendar/verification.json
+++ b/output/appointment-calendar/verification.json
@@ -3,9 +3,9 @@
   "testOnly": true,
   "deployment": {
     "admin": {
-      "build": 531,
+      "build": 536,
       "result": "SUCCESS",
-      "commit": "2caeb12"
+      "commit": "73c29f5"
     },
     "firstleg": {
       "build": 488,
@@ -40,7 +40,13 @@
     "stale_update_conflict",
     "stale_delete_conflict",
     "delete_and_calendar_absence",
-    "rebook_after_delete"
+    "rebook_after_delete",
+    "two_new_customer_accounts_10_negative_isolation_checks",
+    "nonempty_customer_75_rows_all_owned",
+    "nonempty_customer_forged_filter_stays_scoped",
+    "own_plan_detail_visible_other_plan_hidden",
+    "existing_customer_platform_appointment_forbidden",
+    "browser_deleted_appointment_absence_http_confirmed"
   ],
   "uiPassed": [
     "1920x1080_month",
@@ -51,7 +57,11 @@
     "two_customer_selection",
     "cross_page_selection_retained",
     "create_saved",
-    "final_month_top_alignment"
+    "final_month_top_alignment",
+    "final_week_top_alignment",
+    "delete_confirmation_and_active_dispatch_rejection",
+    "month_week_three_previews_233_total_title",
+    "browser_successful_delete_two_to_one"
   ],
   "initialCalendarRequests": [
     {
@@ -65,14 +75,18 @@
       "durationMs": 106
     }
   ],
-  "pending": [
-    "merchant_identity_isolation: configured login returned HTTP401 A0401",
-    "week_alignment_final_browser_recheck",
-    "browser_delete_confirmation_flow"
-  ],
+  "pending": [],
   "screenshots": [
     "month-five-customers.png",
     "week-five-customers.png",
-    "final-month.png"
-  ]
+    "final-month.png",
+    "compact-month.png",
+    "compact-week.png",
+    "delete-success.png"
+  ],
+  "scope": {
+    "admin": "appointment calendar and inbound appointment consumer",
+    "client": "no page or code change; merchant inbound API positive and negative isolation verified",
+    "remainingSample": "QA-UI-20261009-2CUSTOMERS"
+  }
 }
\ No newline at end of file

From f405452c37f910f52576ef6be5f5e5731a21d462 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 13:33:57 +0800
Subject: [PATCH 02/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appointment-gray-release/preflight.json   | 26 ++++++++++++++
 .../review-schema-permissions.sql             | 35 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 output/appointment-gray-release/preflight.json
 create mode 100644 output/appointment-gray-release/review-schema-permissions.sql

diff --git a/output/appointment-gray-release/preflight.json b/output/appointment-gray-release/preflight.json
new file mode 100644
index 00000000..84c1d023
--- /dev/null
+++ b/output/appointment-gray-release/preflight.json
@@ -0,0 +1,26 @@
+{
+  "scope": [
+    "admin-web",
+    "firstleg",
+    "lastleg-service"
+  ],
+  "databaseAuthorized": true,
+  "schemaPreflight": {
+    "appointmentRows": 0,
+    "itemRows": 0,
+    "permissionConflicts": 0,
+    "adminRoleCount": 1,
+    "affectedAdminSubjects": 1
+  },
+  "targets": {
+    "backend": "7fd7699f6",
+    "admin": "73c29f5"
+  },
+  "sourceEquivalence": {
+    "backendMergeTreeMatchesTestedSource": true,
+    "adminMergeTreeMatchesTestedSource": true
+  },
+  "sqlExecuted": false,
+  "deployed": false,
+  "pending": "explicit approval for two isolated remote release branches required by repository instructions; main rejects direct pushes"
+}
\ No newline at end of file
diff --git a/output/appointment-gray-release/review-schema-permissions.sql b/output/appointment-gray-release/review-schema-permissions.sql
new file mode 100644
index 00000000..c8a1d26c
--- /dev/null
+++ b/output/appointment-gray-release/review-schema-permissions.sql
@@ -0,0 +1,35 @@
+-- REVIEW ONLY: gray appointment schema and platform administrator permissions.
+-- Execute only with explicit gray SQL authorization, after verifying both appointment tables remain empty.
+-- No DROP TABLE, DELETE, TRUNCATE, or business-data backfill.
+-- DDL auto-commits; stop immediately on any error. Do not use mysql --force.
+USE baiyue_lastleg;
+ALTER TABLE ll_inbound_fba_appointment
+  DROP INDEX uk_ll_fba_appointment_no,
+  DROP INDEX idx_ll_fba_appointment_list,
+  DROP COLUMN customer_id,
+  ADD COLUMN appointment_end_at DATETIME(3) NULL COMMENT '预约结束时间，未明确时为空' AFTER appointment_at,
+  ADD COLUMN version INT NOT NULL DEFAULT 0 COMMENT '并发版本' AFTER appointment_end_at,
+  ADD UNIQUE KEY uk_ll_fba_appointment_no (appointment_no),
+  ADD KEY idx_ll_fba_appointment_list (appointment_at, appointment_status, fba_warehouse_code);
+ALTER TABLE ll_inbound_fba_appointment_item
+  ADD COLUMN customer_id VARCHAR(128) NOT NULL COMMENT '本票货物客户ID' AFTER appointment_id,
+  ADD KEY idx_ll_fba_appointment_item_cargo (line_id, appointment_id);
+USE baiyue_iam;
+START TRANSACTION;
+INSERT INTO iam_permission
+  (id,tenant_id,app_code,permission_type,parent_id,permission_code,permission_name,route_path,http_method,sort_no,status,built_in,deleted)
+VALUES
+  (5107280,0,'PLATFORM','MENU',0,'platform:appointment:list','预约列表','/appointment-calendar','GET',740,'ACTIVE',1,0),
+  (5107281,0,'PLATFORM','BUTTON',5107280,'platform:appointment:delete','删除预约',NULL,'DELETE',741,'ACTIVE',1,0);
+INSERT INTO iam_role_permission (tenant_id,role_id,permission_id,created_at)
+SELECT 0,r.id,p.id,NOW(3) FROM iam_role r CROSS JOIN iam_permission p
+WHERE r.id=4000001 AND r.tenant_id=0 AND r.role_code='PLATFORM_ADMIN' AND r.status='ACTIVE' AND r.deleted=0
+AND p.id IN (5107280,5107281);
+INSERT INTO iam_security_subject_version (auth_user_id,permission_version,updated_at)
+SELECT DISTINCT u.auth_user_id,1,NOW(3)
+FROM iam_membership_role mr
+JOIN iam_membership m ON m.id=mr.membership_id AND m.tenant_id=mr.tenant_id
+JOIN iam_user u ON u.id=m.user_id
+WHERE mr.tenant_id=0 AND mr.role_id=4000001 AND m.deleted=0 AND u.deleted=0
+ON DUPLICATE KEY UPDATE permission_version=permission_version+1,updated_at=NOW(3);
+COMMIT;

From 6475b7b12d3586ade792aead825a4b1b77791f08 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 9 Oct 2026 15:25:19 +0800
Subject: [PATCH 03/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overseas-warehouse/api/lastMileOrders.ts  |  5 ++++
 .../pages/LastMileOrderDetailView.test.ts     | 13 +++++++++
 .../pages/LastMileOrderDetailView.vue         | 27 +++++++++++++++++++
 .../pages/ReturnInventoryManagementView.vue   |  4 +--
 src/styles/adminDensity.test.ts               |  2 +-
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.ts b/src/modules/overseas-warehouse/api/lastMileOrders.ts
index eed2e084..6fce718c 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.ts
@@ -344,6 +344,11 @@ export interface ChangeContainerReceivingWarehousePayload {
 }
 
 export interface LastMileOrderDetailDto {
+  returnReceipt?: {
+    order: { returnNo: string; receivedQuantity: number; expectedQuantity: number }
+    receipts: Array<{ receiptNo: string; unitType: string; unitCode?: string; palletCode?: string; receivedQuantity: number; boxCount: number; signedAt: string }>
+    cartons?: Array<{ receiptNo: string; palletCode?: string; cartonMark: string; countStatus: string; countedAt?: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }>
+  } | null
   order: LastMileOrderDto
   manualNodes?: ManualNodesResponse['nodes']
   cargo: LastMileCargoDto[]
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
index 2c73f5cb..2cfbfb64 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
@@ -13,6 +13,19 @@ vi.mock('../api/warehouseTransfers', () => ({ getWarehouseTransfer: vi.fn() }))
 enableAutoUnmount(afterEach)
 
 describe('LastMileOrderDetailView domestic detail alignment', () => {
+  it('shows signed box contents and actual quantities on return orders', async () => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'tail-return', customerId: 'customer-1', orderNo: 'RETU-1', orderType: 'RETURN_RELABEL', currentStatus: 'INBOUND_COMPLETED' }, cargo: [], fees: [], statusHistory: [], operationHistory: [],
+      returnReceipt: { order: { returnNo: 'RT-1', receivedQuantity: 10, expectedQuantity: 10 }, receipts: [{ receiptNo: 'RR-1', unitType: 'PALLET', unitCode: 'PLT-1', receivedQuantity: 10, boxCount: 2, signedAt: '' }],
+        cartons: [{ receiptNo: 'RR-1', cartonMark: 'RC#2-1', countStatus: 'CONFIRMED', items: [{ skuCode: 'SKU-A', quantity: 3 }, { skuCode: 'SKU-B', quantity: 7 }] }, { receiptNo: 'RR-2', cartonMark: 'RC-PENDING', countStatus: 'PENDING', items: [] }] } })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    await wrapper.findAll('[role="tab"]').find(tab => tab.text().includes('退货签收与箱内清点'))!.trigger('click'); await flushPromises()
+    const panel = wrapper.get('[aria-label="退货签收与箱内清点"]')
+    expect(panel.text()).toContain('实收 10 / 预报 10 件')
+    expect(panel.text()).toContain('RC#2-1')
+    expect(panel.text()).toContain('SKU-A')
+    expect(panel.text()).toContain('实际签收数量')
+    expect(panel.text()).toContain('待清点')
+  })
   it('loads transfer fulfillment only on the plan tab using sourceOrderNo, never the tail order number', async () => {
     vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'internal-transfer-tail', customerId: 'customer-1', orderNo: 'WT-TAIL-1', sourceOrderNo: 'WT-SOURCE-1', orderType: 'WAREHOUSE_TRANSFER', currentStatus: 'INBOUND_COMPLETED' }, cargo: [], fees: [], statusHistory: [], operationHistory: [] })
     vi.mocked(getWarehouseTransfer).mockResolvedValue({ id: 'internal-transfer', transferNo: 'WT-SOURCE-1', needRelabel: true, status: 'WAIT_RELABEL', relabelNo: 'RL-1', relabelStatus: 'CUSTOMER_CONFIRM_PENDING', packageCount: 2, items: [], cartons: [], pallets: [], relabelBindings: [] })
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
index 1c31a67d..9f9b3c56 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
@@ -216,6 +216,33 @@ onMounted(load)
           </dl>
         </el-tab-pane>
         <el-tab-pane name="cargo"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>货物信息</span></template><section class="table-panel"><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" empty-text="暂无货物明细"></DataTable></section></el-tab-pane>
+        <el-tab-pane v-if="detail?.order.orderType === 'RETURN_RELABEL'" name="return-receipt"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>退货签收与箱内清点</span></template>
+          <section v-if="detail.returnReceipt" class="table-panel" aria-label="退货签收与箱内清点">
+            <h3>{{ detail.returnReceipt.order.returnNo }} · 实收 {{ detail.returnReceipt.order.receivedQuantity }} / 预报 {{ detail.returnReceipt.order.expectedQuantity }} 件</h3>
+            <el-table :data="detail.returnReceipt.receipts" size="small" border>
+              <el-table-column prop="receiptNo" label="签收单号" min-width="190" />
+              <el-table-column label="签收方式" width="90"><template #default="{ row }">{{ row.unitType === 'PALLET' ? '托盘' : row.unitType === 'BOX' ? '箱子' : '包裹' }}</template></el-table-column>
+              <el-table-column prop="unitCode" label="签收载体" min-width="220" />
+              <el-table-column prop="boxCount" label="实收箱数" width="100" />
+              <el-table-column prop="receivedQuantity" label="实收数量" width="100" />
+            </el-table>
+            <h3>签收箱号明细（{{ detail.returnReceipt.cartons?.length || 0 }} 箱）</h3>
+            <el-collapse v-if="detail.returnReceipt.cartons?.length">
+              <el-collapse-item v-for="box in detail.returnReceipt.cartons" :key="box.cartonMark" :name="box.cartonMark">
+                <template #title>{{ box.cartonMark }} · {{ box.countStatus === 'CONFIRMED' ? `已确认 · ${box.items.length} 种 SKU · ${box.items.reduce((sum, item) => sum + Number(item.quantity), 0)} 件` : box.countStatus === 'PENDING' ? '待清点' : '未留存箱内签收明细' }}</template>
+                <p>签收单 {{ box.receiptNo }}<template v-if="box.palletCode"> · 托盘 {{ box.palletCode }}</template><template v-if="box.countedAt"> · 确认时间 {{ formatOverseasDateTime(box.countedAt) }}</template></p>
+                <el-table v-if="box.countStatus === 'CONFIRMED'" :data="box.items" size="small" border>
+                  <el-table-column prop="skuCode" label="SKU" min-width="220" />
+                  <el-table-column prop="productNameZh" label="中文品名" min-width="180" />
+                  <el-table-column prop="quantity" label="实际签收数量" width="130" />
+                </el-table>
+                <p v-else>{{ box.countStatus === 'PENDING' ? '箱内数量待仓库清点确认' : '未留存原始箱内明细，不以当前库存代替签收数量' }}</p>
+              </el-collapse-item>
+            </el-collapse>
+            <el-empty v-else description="暂无签收箱号明细" />
+          </section>
+          <el-empty v-else description="暂无退货签收记录" />
+        </el-tab-pane>
         <el-tab-pane name="plan" lazy><template #label><span class="density-tab-icon" aria-hidden="true">🗓️</span><span>计划信息</span></template>
           <WarehouseTransferFulfillmentPanel v-if="detail?.order.orderType === 'WAREHOUSE_TRANSFER'" :customer-id="detail.order.customerId" :transfer-no="detail.order.sourceOrderNo || ''" />
           <section class="info-panel plan-panel" aria-label="计划信息"><dl class="detail-fields plan-fields density-fields"><div v-for="field in planFields" :key="field.label"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div></dl></section>
diff --git a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
index 2b7d7d49..861b35a8 100644
--- a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
+++ b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
@@ -204,7 +204,7 @@ function warehouseName(warehouseId?: string) {
   );
 }
 function statusLabel(status?: string) {
-  return status === "AVAILABLE" ? "可用" : status === "MERGED" ? "已合箱" : "—";
+  return status === "PENDING_COUNT" ? "箱内待清点" : status === "AVAILABLE" ? "可用" : status === "MERGED" ? "已合箱" : "—";
 }
 async function loadCustomerOptions() {
   const records: PlatformTenantResource[] = [];
@@ -634,7 +634,7 @@ const tableColumns = computed(() =>
             v-model="query.status"
             clearable
             placeholder="箱状态"
-            ><el-option label="可用" value="AVAILABLE" /><el-option
+            ><el-option label="箱内待清点" value="PENDING_COUNT" /><el-option label="可用" value="AVAILABLE" /><el-option
               label="已合箱"
               value="MERGED" /></el-select
           ><el-button type="primary" @click="search"
diff --git a/src/styles/adminDensity.test.ts b/src/styles/adminDensity.test.ts
index e3a8addf..6f1fca0b 100644
--- a/src/styles/adminDensity.test.ts
+++ b/src/styles/adminDensity.test.ts
@@ -321,7 +321,7 @@ describe('approved Admin density ownership', () => {
         visit(node.children)
       } }
       visit(ast.children)
-      expect(panes).toBe(file === 'LastMileOrderDetailView' ? 5 : 4)
+      expect(panes).toBe(file === 'LastMileOrderDetailView' ? 6 : 4)
     }
   })
 

From 3a917324f197f83c3712f925f543ed4d5156d59f Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 15:31:57 +0800
Subject: [PATCH 04/47] feat(fleet): publish capacity from a single guided
 dialog

---
 .../components/CapacityDialogClosing.test.ts  |  7 +-
 .../CapacityOfferSettingsDialog.test.ts       | 73 ++++++++++++++
 .../CapacityOfferSettingsDialog.vue           | 97 ++++++++++++++++---
 .../components/TripLoadingPanel.vue           | 18 ++--
 .../pages/TripDetailView.vue                  |  4 +-
 5 files changed, 177 insertions(+), 22 deletions(-)
 create mode 100644 src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts

diff --git a/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts b/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts
index 07ad3b5b..be75ddee 100644
--- a/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts
+++ b/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts
@@ -11,19 +11,21 @@ import type { CapacityOffer } from '../capacityOfferTypes'
 import type { FleetTrip } from '../tripTypes'
 import { useUnsavedWorkStore } from '@/core/unsaved-work/unsavedWork'
 import { getCapacityOffer, listCapacityOffers } from '../api/capacityOffers'
+import { getTrip, getTripCapacityPlan } from '../api/trips'
 import { isWorkspaceRoute, workspaceRouteId } from '@/core/workspace-tabs/routeWorkspace'
 
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('../api/trips', () => ({ getTrip: vi.fn(), getTripCapacityPlan: vi.fn(), getTripLoading: vi.fn(), confirmTripCapacityPlan: vi.fn(), confirmTripLoading: vi.fn(), updateTripPlan: vi.fn() }))
 vi.mock('../api/capacityOffers', () => ({ listCapacityOffers: vi.fn(), getCapacityOffer: vi.fn(), getCapacityInquiry: vi.fn(), listCapacityInquiries: vi.fn(), listOfferCustomers: vi.fn(), listOfferQuotes: vi.fn(), saveCapacityInquiry: vi.fn(), saveCapacityOffer: vi.fn(), commandCapacityOffer: vi.fn(), commandCapacityInquiry: vi.fn() }))
 const offer: CapacityOffer = { offerNo: 'CO-CLOSE', tripNo: 'TR-CLOSE', status: 'OPEN', recordVersion: 1, tripRecordVersion: 2, warehouseId: '9', warehouseName: '测试仓', plannedDepartureAt: '2026-10-20T12:00:00Z', cutoffAt: '2026-10-20T10:00:00Z', contactName: null, contactPhone: null, remark: null, destinations: [{ destinationKey: 'FBA:ONT8', name: 'ONT8', deliveryIndex: 1, remaining: null }], segments: [], capacityKnown: false, canCreateInquiry: true, canConfirm: false, blockReason: '待核对', actions: { canEdit: true, canPublish: false, canPause: true, canResume: false, canClose: true } }
 const wrappers: VueWrapper[] = []
-beforeEach(() => { vi.clearAllMocks(); vi.mocked(listCapacityOffers).mockResolvedValue({ records: [offer], total: 1, page: 1, size: 1, pages: 1 }); vi.mocked(getCapacityOffer).mockResolvedValue({ offer, inquiries: { records: [], total: 0, page: 1, size: 20, pages: 0 } }) })
+beforeEach(() => { vi.clearAllMocks(); vi.mocked(getTrip).mockResolvedValue({ trip: { tripNo: offer.tripNo, recordVersion: 2, plannedDepartureAt: offer.plannedDepartureAt, stops: [{ name: '起运仓' }, { name: 'ONT8', destinationKey: 'FBA:ONT8' }] } } as Awaited<ReturnType<typeof getTrip>>); vi.mocked(getTripCapacityPlan).mockResolvedValue({ tripNo: offer.tripNo, recordVersion: 2, cargo: [], manifestHash: 'hash', capacityPlan: null, planValid: false, blockReason: null, availableSegments: [] }); vi.mocked(listCapacityOffers).mockResolvedValue({ records: [offer], total: 1, page: 1, size: 1, pages: 1 }); vi.mocked(getCapacityOffer).mockResolvedValue({ offer, inquiries: { records: [], total: 0, page: 1, size: 20, pages: 0 } }) })
 afterEach(async () => { ElMessageBox.close(); wrappers.splice(0).forEach(wrapper => wrapper.unmount()); await flushPromises(); document.body.innerHTML = ''; vi.restoreAllMocks() })
 function mountDialog(kind: 'inquiry' | 'settings') {
   const pinia = createPinia()
   const wrapper = kind === 'inquiry'
     ? mount(CapacityInquiryDialog, { attachTo: document.body, props: { modelValue: true, offer, inquiry: null, readonly: false }, global: { plugins: [pinia, ElementPlus] } })
-    : mount(CapacityOfferSettingsDialog, { attachTo: document.body, props: { modelValue: false, trip: { tripNo: offer.tripNo, recordVersion: 2 } as FleetTrip }, global: { plugins: [pinia, ElementPlus] } })
+    : mount(CapacityOfferSettingsDialog, { attachTo: document.body, props: { modelValue: false, trip: { tripNo: offer.tripNo, recordVersion: 2 } as FleetTrip }, global: { plugins: [pinia, ElementPlus, createRouter({ history: createMemoryHistory(), routes: [{ path: '/', component: { template: '<div/>' } }] })] } })
   wrappers.push(wrapper)
   return { wrapper, pinia }
 }
@@ -38,6 +40,7 @@ it.each(['inquiry', 'settings'] as const)('keeps the real %s dialog and edited i
   const { wrapper, pinia } = mountDialog(kind)
   if (kind === 'settings') await wrapper.setProps({ modelValue: true })
   await flushPromises()
+  if (kind === 'settings') await wrapper.get('details summary').trigger('click')
   const input = wrapper.find<HTMLInputElement>(kind === 'inquiry' ? 'input[placeholder="选填"]' : 'input[placeholder="填写公开给销售的联系人（选填）"]')
   expect(input.exists()).toBe(true)
   await input.setValue('UI-未保存检查'); await flushPromises()
diff --git a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts
new file mode 100644
index 00000000..a9518832
--- /dev/null
+++ b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts
@@ -0,0 +1,73 @@
+import { shallowMount, flushPromises } from '@vue/test-utils'
+import { defineComponent } from 'vue'
+import { createPinia } from 'pinia'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import Dialog from './CapacityOfferSettingsDialog.vue'
+import * as offers from '../api/capacityOffers'
+import * as trips from '../api/trips'
+import type { FleetTrip } from '../tripTypes'
+const state = vi.hoisted(() => ({ plan: vi.fn(), push: vi.fn() }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: state.push }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
+vi.mock('../api/capacityOffers', () => ({ listCapacityOffers: vi.fn(), saveCapacityOffer: vi.fn(), commandCapacityOffer: vi.fn() }))
+vi.mock('../api/trips', () => ({ getTrip: vi.fn(), getTripLoading: vi.fn(), updateTripPlan: vi.fn(), getTripCapacityPlan: vi.fn(), confirmTripCapacityPlan: vi.fn(), confirmTripLoading: vi.fn() }))
+const trip = { tripNo: 'TR-1', recordVersion: 5, plannedDepartureAt: '2099-01-01T12:00:00Z', stops: [{ name: '起运仓' }, { name: 'ACY2', destinationKey: 'FBA:ACY2' }] } as FleetTrip
+const draft = { offerNo: 'FO-1', tripNo: 'TR-1', status: 'DRAFT', recordVersion: 1, tripRecordVersion: 6, actions: { canEdit: true } }
+const wrappers: ReturnType<typeof shallowMount>[] = []
+function mount(realPlanner = false) {
+ const wrapper = shallowMount(Dialog, { props: { modelValue: true, trip }, global: { plugins: [createPinia()], stubs: {
+  AppDialog: { name: 'AppDialog', props: ['confirmText'], emits: ['confirm'], template: '<div><slot/><button @click="$emit(\'confirm\')">{{confirmText}}</button></div>' },
+  TripLoadingPanel: realPlanner ? false : defineComponent({ name: 'TripLoadingPanel', setup(_, { expose }) { expose({ save: state.plan }); return {} }, template: '<div/>' }),
+  DataTable: { name: 'DataTable', props: ['data'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="weight" :row="row"/><slot name="volume" :row="row"/></div></div>' },
+  ElInputNumber: { name: 'ElInputNumber', props: ['modelValue'], emits: ['update:modelValue'], template: '<input/>' },
+  ElForm: { template: '<div><slot/></div>' }, ElFormItem: { template: '<div><slot/></div>' },
+  ElButton: { template: '<button><slot/></button>' }, ElDatePicker: true, ElInput: true, LoadErrorState: true, ApiErrorMeta: true,
+ } } }); wrappers.push(wrapper); return wrapper
+}
+beforeEach(() => {
+ vi.clearAllMocks()
+ vi.mocked(trips.getTrip).mockResolvedValue({ trip } as Awaited<ReturnType<typeof trips.getTrip>>)
+ vi.mocked(offers.listCapacityOffers).mockResolvedValue({ records: [], total: 0, page: 1, size: 1, pages: 0 })
+ state.plan.mockResolvedValue({ tripNo: 'TR-1', recordVersion: 6 })
+ vi.mocked(offers.saveCapacityOffer).mockResolvedValue({ offer: draft, replayed: false } as Awaited<ReturnType<typeof offers.saveCapacityOffer>>)
+ vi.mocked(offers.commandCapacityOffer).mockResolvedValue({ offer: { ...draft, status: 'OPEN', recordVersion: 2 }, replayed: false } as Awaited<ReturnType<typeof offers.commandCapacityOffer>>)
+})
+afterEach(() => wrappers.splice(0).forEach(wrapper => wrapper.unmount()))
+it('confirms capacity, saves metadata and publishes from one click using returned versions', async () => {
+ const wrapper = mount(); await flushPromises()
+ expect(wrapper.findComponent({ name: 'ElDatePicker' }).attributes('modelvalue')).toBe(trip.plannedDepartureAt)
+ wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+ expect(state.plan).toHaveBeenCalledOnce()
+ expect(offers.saveCapacityOffer).toHaveBeenCalledWith(null, expect.objectContaining({ tripRecordVersion: 6, cutoffAt: trip.plannedDepartureAt }))
+ expect(offers.commandCapacityOffer).toHaveBeenCalledWith('FO-1', 'publish', expect.objectContaining({ tripRecordVersion: 6, offerRecordVersion: 1 }))
+ expect(wrapper.text()).toContain('查看需求池发布')
+})
+it('does not publish if capacity validation is incomplete', async () => {
+ state.plan.mockResolvedValue(undefined)
+ const wrapper = mount(); await flushPromises()
+ wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+ expect(offers.saveCapacityOffer).not.toHaveBeenCalled(); expect(offers.commandCapacityOffer).not.toHaveBeenCalled()
+})
+it('retries only the uncertain publish command with the original key', async () => {
+ vi.mocked(offers.commandCapacityOffer).mockRejectedValueOnce(new Error('network'))
+ const wrapper = mount(); await flushPromises()
+ wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+ const first = vi.mocked(offers.commandCapacityOffer).mock.calls[0]!
+ expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmText')).toBe('重试原请求')
+ wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+ expect(offers.commandCapacityOffer).toHaveBeenNthCalledWith(2, ...first)
+ expect(state.plan).toHaveBeenCalledOnce(); expect(offers.saveCapacityOffer).toHaveBeenCalledOnce()
+})
+
+it('submits measurements from the embedded panel before saving and publishing', async () => {
+ const basis = { tripNo: 'TR-1', recordVersion: 5, cargo: [{ dispatchNo: 'DP-1', customerId: '1', dispatchItemId: '2', warehousePalletId: '3', palletNo: 'PLT-1', packages: 1, destinationKey: 'FBA:ACY2', destinationLabel: 'ACY2' }], manifestHash: 'hash', capacityPlan: null, planValid: false, blockReason: null, availableSegments: [] }
+ vi.mocked(trips.getTripCapacityPlan).mockResolvedValue(basis)
+ vi.mocked(trips.confirmTripCapacityPlan).mockResolvedValue({ ...basis, recordVersion: 6, planValid: true })
+ const wrapper = mount(true); await flushPromises()
+ const fields = wrapper.findAllComponents({ name: 'ElInputNumber' })
+ fields[0]!.vm.$emit('update:modelValue', 100); fields[1]!.vm.$emit('update:modelValue', 2); await flushPromises()
+ wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+ expect(trips.confirmTripCapacityPlan).toHaveBeenCalledWith('TR-1', expect.objectContaining({ recordVersion: 5, pallets: [{ warehousePalletId: '3', palletSpaces: 1, weightKg: 100, volumeCbm: 2, deliveryIndex: 1 }] }))
+ expect(offers.commandCapacityOffer).toHaveBeenCalledOnce()
+})
diff --git a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue
index 7f748e32..855a8877 100644
--- a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, reactive, ref, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import TripLoadingPanel from './TripLoadingPanel.vue'
+import { getTrip, getTripLoading, updateTripPlan } from '../api/trips'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -12,51 +15,121 @@ import type { FleetTrip } from '../tripTypes'
 import { useFleetDraftGuard } from '../useFleetDraftGuard'
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ trip: FleetTrip }>()
-const emit = defineEmits<{ saved: [version: number] }>()
+const emit = defineEmits<{ saved: [version: number]; tripUpdated: [trip: FleetTrip] }>()
 const access = useAccessPreviewStore(), offer = ref<CapacityOffer | null>(null), loading = ref(false), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
-const loaded = ref(false)
+const loaded = ref(false), publishAfterSave = ref(false)
+const router = useRouter()
+const currentTrip = ref<FleetTrip>(props.trip)
+const planner = ref<InstanceType<typeof TripLoadingPanel> | null>(null)
+const planState = ref('')
+let planInitialized = false
+const canPlan = computed(() => access.can('platform:fleet:trip:edit'))
 const form = reactive({ cutoffAt: '', contactName: '', contactPhone: '', remark: '' })
 const pending = ref<{ action: 'save'; offerNo: string | null; body: OfferWrite } | { action: 'publish' | 'pause' | 'resume' | 'close'; offerNo: string; body: OfferCommand } | null>(null)
 let generation = 0
 const writable = computed(() => access.can('platform:fleet:capacity-offer:manage'))
-const guard = useFleetDraftGuard('capacity-offer-settings', open, form, busy, computed(() => !!pending.value))
+const guard = useFleetDraftGuard('capacity-offer-settings', open, reactive({ form, planState }), busy, computed(() => !!pending.value))
 async function load() {
   if (!writable.value || !open.value || pending.value) return
   const current = ++generation; loading.value = true; error.value = null; loaded.value = false
-  try { const value = await listCapacityOffers({ scope: 'ALL', tripNo: props.trip.tripNo, page: 1, size: 1 }); if (current !== generation) return; offer.value = value.records[0] || null; loaded.value = true; Object.assign(form, { cutoffAt: offer.value?.cutoffAt || '', contactName: offer.value?.contactName || '', contactPhone: offer.value?.contactPhone || '', remark: offer.value?.remark || '' }); await nextTick(); guard.capture() }
+  try {
+    const [value, detail] = await Promise.all([listCapacityOffers({ scope: 'ALL', tripNo: props.trip.tripNo, page: 1, size: 1 }), getTrip(props.trip.tripNo)])
+    if (current !== generation) return
+    currentTrip.value = detail.trip
+    offer.value = value.records[0] || null
+    planInitialized = false; planState.value = ''
+    Object.assign(form, { cutoffAt: offer.value?.cutoffAt || detail.trip.plannedDepartureAt, contactName: offer.value?.contactName || '', contactPhone: offer.value?.contactPhone || '', remark: offer.value?.remark || '' })
+    loaded.value = true; await nextTick(); guard.capture()
+  }
   catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '发布设置读取失败') }
   finally { if (current === generation) loading.value = false }
 }
-watch(open, value => { generation++; if (value) { if (pending.value) return; void load() } })
+watch(open, value => { generation++; if (value) { if (pending.value) return; loaded.value = false; void load() } }, { immediate: true })
 async function execute() {
   if (!pending.value || busy.value || !writable.value) return
   const current = generation; busy.value = true; error.value = null
-  try { const p = pending.value; const result = p.action === 'save' ? await saveCapacityOffer(p.offerNo, p.body) : await commandCapacityOffer(p.offerNo, p.action, p.body); if (current !== generation) return; offer.value = result.offer; pending.value = null; emit('saved', result.offer.tripRecordVersion); guard.capture(); ElMessage.success('发布设置已更新') }
+  try {
+    while (pending.value) {
+      const p: NonNullable<typeof pending.value> = pending.value
+      const result: Awaited<ReturnType<typeof saveCapacityOffer>> = p.action === 'save' ? await saveCapacityOffer(p.offerNo, p.body) : await commandCapacityOffer(p.offerNo, p.action, p.body)
+      if (current !== generation) return
+      offer.value = result.offer
+      currentTrip.value = { ...currentTrip.value, recordVersion: result.offer.tripRecordVersion }
+      emit('saved', result.offer.tripRecordVersion)
+      pending.value = null
+      if (p.action === 'save' && publishAfterSave.value) {
+        pending.value = { action: result.offer.status === 'DRAFT' ? 'publish' : 'resume', offerNo: result.offer.offerNo,
+          body: { tripRecordVersion: result.offer.tripRecordVersion, offerRecordVersion: result.offer.recordVersion, idempotencyKey: crypto.randomUUID() } }
+      }
+    }
+    guard.capture()
+    if (publishAfterSave.value) { publishAfterSave.value = false; ElMessage.success('拼车余位已发布，可在需求池登记意向') }
+    else ElMessage.success('发布设置已更新')
+  }
   catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '发布操作未完成'); if (cause instanceof ApiResponseError) pending.value = null } }
   finally { if (current === generation) busy.value = false }
 }
+async function matchExistingStops() {
+  if (busy.value || !canPlan.value || pending.value) return
+  busy.value = true; error.value = null
+  try {
+    const cargo = await getTripLoading(currentTrip.value.tripNo)
+    const stops = currentTrip.value.stops
+    const next = stops.length === 2 && !stops[1]?.destinationKey && stops[1]?.name.startsWith('待确定卸货点') ? [stops[0]!] : [...stops]
+    for (const item of cargo.cargo) {
+      if (!item.destinationKey) throw new Error('排车货物目的地未确认，请先完善排车单')
+      if (!next.some(stop => stop.destinationKey === item.destinationKey)) next.push({ name: item.destinationLabel || '卸货站', destinationKey: item.destinationKey })
+    }
+    const result = await updateTripPlan(currentTrip.value.tripNo, { recordVersion: cargo.recordVersion, plannedDepartureAt: currentTrip.value.plannedDepartureAt, expectedDriverEndAt: currentTrip.value.expectedDriverEndAt, stops: next, remark: currentTrip.value.remark, reason: '发布前按货物匹配卸货站' })
+    currentTrip.value = result.trip; emit('tripUpdated', result.trip); emit('saved', result.trip.recordVersion)
+    if (offer.value) offer.value = { ...offer.value, tripRecordVersion: result.trip.recordVersion }
+  } catch (cause) { error.value = getApiErrorDetails(cause, '卸货站匹配未完成') }
+  finally { busy.value = false }
+}
+function planChanged(value: string) {
+  planState.value = value
+  if (!planInitialized) { planInitialized = true; void nextTick(() => guard.capture()) }
+}
 async function save() {
+  if (busy.value) return
   if (pending.value) { await execute(); return }
   if (loading.value || !loaded.value || !writable.value || offer.value && !offer.value.actions.canEdit) return
   if (!form.cutoffAt) { ElMessage.warning('请填写交货截止时间'); return }
-  pending.value = { action: 'save', offerNo: offer.value?.offerNo || null, body: { tripNo: props.trip.tripNo, tripRecordVersion: offer.value?.tripRecordVersion ?? props.trip.recordVersion, offerRecordVersion: offer.value?.recordVersion ?? null, cutoffAt: form.cutoffAt, contactName: form.contactName.trim() || null, contactPhone: form.contactPhone.trim() || null, remark: form.remark.trim() || null, idempotencyKey: crypto.randomUUID() } }
+  if (new Date(form.cutoffAt).getTime() <= Date.now() || new Date(form.cutoffAt).getTime() > new Date(currentTrip.value.plannedDepartureAt).getTime()) { ElMessage.warning('交货截止须晚于现在且不晚于计划发车'); return }
+  busy.value = true
+  let plan
+  try { plan = await planner.value?.save() } finally { busy.value = false }
+  if (!plan) return
+  currentTrip.value = { ...currentTrip.value, recordVersion: plan.recordVersion }
+  emit('saved', plan.recordVersion)
+  publishAfterSave.value = true
+  pending.value = { action: 'save', offerNo: offer.value?.offerNo || null, body: { tripNo: currentTrip.value.tripNo, tripRecordVersion: currentTrip.value.recordVersion, offerRecordVersion: offer.value?.recordVersion ?? null, cutoffAt: form.cutoffAt, contactName: form.contactName.trim() || null, contactPhone: form.contactPhone.trim() || null, remark: form.remark.trim() || null, idempotencyKey: crypto.randomUUID() } }
   await execute()
 }
 async function command(action: 'publish' | 'pause' | 'resume' | 'close') {
   if (!offer.value || loading.value || !loaded.value || busy.value || pending.value || !writable.value) return
-  if (guard.dirty.value) { ElMessage.warning('请先保存发布信息，再执行发布状态操作'); return }
+  if (guard.dirty.value) { ElMessage.warning('有未保存修改，请先确认发布或关闭后重新打开再操作'); return }
+  publishAfterSave.value = false
   const labels = { publish: '发布运力', pause: '暂停接单', resume: '恢复接单', close: '关闭发布' }
   try { await ElMessageBox.confirm(`${labels[action]} ${offer.value.offerNo}？已确认预订及客户订单不会被取消。`, labels[action], { customClass: 'admin-density-confirm' }) } catch { return }
   pending.value = { action, offerNo: offer.value.offerNo, body: { tripRecordVersion: offer.value.tripRecordVersion, offerRecordVersion: offer.value.recordVersion, idempotencyKey: crypto.randomUUID() } }; await execute()
 }
 onBeforeUnmount(() => { generation++ })
 </script>
-<template><AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog" title="发布设置" width="1080px" :show-confirm="writable && (!offer || offer.actions.canEdit || !!pending)" :confirm-text="pending ? '重试原请求' : '保存发布信息'" :confirm-loading="busy" :confirm-disabled="loading || !loaded" @confirm="save">
+<template><AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog" title="发布拼车余位" width="1080px" :show-confirm="writable && (!offer || offer.actions.canEdit || !!pending)" :confirm-text="pending ? '重试原请求' : '确认发布'" :confirm-loading="busy" :confirm-disabled="loading || !loaded" @confirm="save">
   <LoadErrorState v-if="error" title="发布操作未完成" :message="error.message" @retry="pending ? execute() : load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-  <p>{{ trip.tripNo }} · {{ offer ? `${offer.offerNo} · ${offerStatusLabels[offer.status]}` : '尚未建立发布' }}</p><p v-if="offer?.blockReason">{{ offer.blockReason }}</p><p v-if="pending">上次结果尚未确定，原请求已保留，请重试核对。</p>
+  <p>{{ trip.tripNo }} · {{ offer ? `${offer.offerNo} · ${offerStatusLabels[offer.status]}` : '尚未建立发布' }}</p><p v-if="offer?.blockReason && offer.status !== 'DRAFT'">{{ offer.blockReason }}</p><p v-if="pending">上次结果尚未确定，原请求已保留，请重试核对。</p>
+  <template v-if="loaded && open && (!offer || offer.actions.canEdit)">
+    <h3>本车货物与余位</h3>
+    <p>卸货站已按货物匹配。核对下方数据，确认发布时一并保存容量；多个目的地的先后顺序请在车次计划中确认。</p>
+    <el-button v-if="canPlan && planner?.destinationIssue" :disabled="busy || !!pending" @click="matchExistingStops">按货物补齐卸货站</el-button>
+    <TripLoadingPanel ref="planner" :trip="currentTrip" :editable="canPlan && !busy && !pending" planning embedded @changed="planChanged" />
+  </template>
+  <p v-if="!canPlan">已有有效容量可直接发布；需要修改容量时请联系有车次编辑权限的调度。</p>
+  <el-button v-if="offer?.status === 'OPEN'" :disabled="busy || !!pending" type="primary" link @click="open = false; router.push({ name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: offer.offerNo } })">查看需求池发布</el-button>
   <el-form v-loading="loading" label-position="top" class="density-form offer-settings-form" :disabled="busy || loading || !!pending || !writable || !!offer && !offer.actions.canEdit">
-    <el-form-item label="交货截止时间" required><el-date-picker v-model="form.cutoffAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="选择交货截止时间" /></el-form-item><el-form-item label="公开给销售的调度联系人"><el-input v-model="form.contactName" maxlength="128" placeholder="填写公开给销售的联系人（选填）" /></el-form-item><el-form-item label="公开联系方式"><el-input v-model="form.contactPhone" maxlength="128" placeholder="填写公开电话或其他联系方式（选填）" /></el-form-item><el-form-item label="公开说明" class="offer-settings-wide"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" placeholder="补充交货要求或运力说明（选填）" /></el-form-item>
+    <el-form-item label="交货截止时间" required><el-date-picker v-model="form.cutoffAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="选择交货截止时间" /><span>默认与计划发车时间一致，可提前截止。</span></el-form-item><details class="offer-settings-wide"><summary>联系人与交货说明（选填）</summary><div class="offer-settings-form"><el-form-item label="公开给销售的调度联系人"><el-input v-model="form.contactName" maxlength="128" placeholder="填写公开给销售的联系人（选填）" /></el-form-item><el-form-item label="公开联系方式"><el-input v-model="form.contactPhone" maxlength="128" placeholder="填写公开电话或其他联系方式（选填）" /></el-form-item><el-form-item label="公开说明" class="offer-settings-wide"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" placeholder="补充交货要求或运力说明（选填）" /></el-form-item></div></details>
   </el-form>
-  <div v-if="offer && writable" class="density-actions"><el-button v-if="offer.actions.canPublish" :disabled="busy || loading || !loaded || !!pending || guard.dirty.value" type="primary" @click="command('publish')">发布运力</el-button><el-button v-if="offer.actions.canPause" :disabled="busy || loading || !loaded || !!pending || guard.dirty.value" @click="command('pause')">暂停接单</el-button><el-button v-if="offer.actions.canResume" :disabled="busy || loading || !loaded || !!pending || guard.dirty.value" type="primary" @click="command('resume')">重新核对并恢复</el-button><el-button v-if="offer.actions.canClose" :disabled="busy || loading || !loaded || !!pending || guard.dirty.value" type="danger" plain @click="command('close')">关闭发布</el-button></div>
+  <div v-if="offer && writable" class="density-actions"><el-button v-if="offer.actions.canPause" :disabled="busy || loading || !loaded || !!pending || guard.dirty.value" @click="command('pause')">暂停接单</el-button><el-button v-if="offer.actions.canClose" :disabled="busy || loading || !loaded || !!pending || guard.dirty.value" type="danger" plain @click="command('close')">关闭发布</el-button></div>
 </AppDialog></template>
 <style scoped>.offer-settings-form{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.offer-settings-wide{grid-column:1/-1}.offer-settings-form :deep(.el-date-editor){width:100%}</style>
diff --git a/src/modules/overseas-master-data/components/TripLoadingPanel.vue b/src/modules/overseas-master-data/components/TripLoadingPanel.vue
index d1fc2a1f..6b59ffa6 100644
--- a/src/modules/overseas-master-data/components/TripLoadingPanel.vue
+++ b/src/modules/overseas-master-data/components/TripLoadingPanel.vue
@@ -8,11 +8,13 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getTripLoading, confirmTripLoading, getTripCapacityPlan, confirmTripCapacityPlan } from '../api/trips'
 import type { FleetTrip, TripLoading, TripCapacityPlanning, TripMeasurement } from '../tripTypes'
 
-const props = defineProps<{ trip: FleetTrip; editable: boolean; planning?: boolean }>()
-const emit = defineEmits<{ saved: [loading: TripLoading]; planned: [plan: TripCapacityPlanning] }>()
+const props = defineProps<{ trip: FleetTrip; editable: boolean; planning?: boolean; embedded?: boolean }>()
+const emit = defineEmits<{ saved: [loading: TripLoading]; planned: [plan: TripCapacityPlanning]; changed: [value: string] }>()
 type PalletRow = { warehousePalletId: string; palletNo: string; destinations: string; destinationKeys: string[]; palletSpaces: number; weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null }
 const info = ref<TripLoading | TripCapacityPlanning | null>(null), rows = ref<PalletRow[]>([]), busy = ref(false), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
 let sequence = 0
+const baseline = ref('')
+watch(rows, value => emit('changed', JSON.stringify(value)), { deep: true })
 const columns = computed<DataTableColumn[]>(() => [{ key: 'palletNo', prop: 'palletNo', label: '实物托盘', minWidth: 150 },
   { key: 'destinations', prop: 'destinations', label: '货物目的地', minWidth: 160 }, { key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 175 },
   { key: 'weight', label: props.planning ? '预计重量（kg）' : '实测重量（kg）', slotName: 'weight', width: 190 }, { key: 'volume', label: props.planning ? '预计体积（m³）' : '实测体积（m³）', slotName: 'volume', width: 190 },
@@ -45,6 +47,7 @@ function apply(value: TripLoading | TripCapacityPlanning) {
       palletSpaces: saved?.palletSpaces ?? 1, weightKg: saved?.weightKg ?? null, volumeCbm: saved?.volumeCbm ?? null, deliveryIndex: saved && saved.deliveryIndex > 0 && props.trip.stops[saved.deliveryIndex]?.destinationKey === cargo.destinationKey ? saved.deliveryIndex : (index > 0 ? index : null) })
   }
   rows.value = [...pallets.values()]
+  baseline.value = JSON.stringify(rows.value)
 }
 async function load() {
   const current = ++sequence; loading.value = true; error.value = null
@@ -53,7 +56,9 @@ async function load() {
   finally { if (current === sequence) loading.value = false }
 }
 async function save() {
-  if (busy.value || loading.value || !props.editable || !info.value) return
+  if (busy.value || loading.value || !info.value) return
+  if (props.planning && 'planValid' in info.value && info.value.planValid && baseline.value === JSON.stringify(rows.value)) return info.value
+  if (!props.editable) { ElMessage.warning('计划容量需重新核对，请由有车次编辑权限的调度操作'); return }
   if (destinationIssue.value) { ElMessage.warning(destinationIssue.value); return }
   if (rows.value.some(row => !matchingStops(row).some(stop => stop.index === row.deliveryIndex))) { ElMessage.warning('请选择与货物目的地匹配的卸货站'); return }
   if (!rows.value.length || rows.value.some(row => row.weightKg == null || row.volumeCbm == null || row.deliveryIndex == null)) { ElMessage.warning(props.planning ? '请填写每托预计重量、体积和卸货站' : '请填写每托实测重量、体积和卸货站'); return }
@@ -65,7 +70,7 @@ async function save() {
     const body = { recordVersion: snapshot.recordVersion, manifestHash: snapshot.manifestHash, pallets, reason: props.planning ? '核对本车自有货计划载荷' : '核对实物托盘及实际装载' }
     if (props.planning) {
       const result = await confirmTripCapacityPlan(props.trip.tripNo, body)
-      if (current === sequence) { apply(result); emit('planned', result); ElMessage.success('计划容量已核对') }
+      if (current === sequence) { apply(result); emit('planned', result); if (!props.embedded) ElMessage.success('计划容量已核对'); return result }
     } else {
       const result = await confirmTripLoading(props.trip.tripNo, body)
       if (current === sequence) { apply(result); emit('saved', result); ElMessage.success('实际装载已确认') }
@@ -74,6 +79,7 @@ async function save() {
   finally { busy.value = false }
 }
 watch(() => [props.trip.tripNo, props.trip.recordVersion, props.planning], () => { if (info.value?.tripNo !== props.trip.tripNo || info.value.recordVersion !== props.trip.recordVersion || !!props.planning !== ('capacityPlan' in info.value)) void load() }, { immediate: true })
+defineExpose({ save, destinationIssue })
 onBeforeUnmount(() => { sequence++ })
 </script>
 <template>
@@ -89,8 +95,8 @@ onBeforeUnmount(() => { sequence++ })
       <template #spaces="{ row }"><el-input-number v-model="row.palletSpaces" :min="1" :precision="0" :disabled="!editable || busy" placeholder="占用托位" /></template>
       <template #weight="{ row }"><el-input-number v-model="row.weightKg" :min="0.001" :precision="3" :disabled="!editable || busy" :placeholder="planning ? '预计重量' : '实际重量'" /></template>
       <template #volume="{ row }"><el-input-number v-model="row.volumeCbm" :min="0.001" :precision="3" :disabled="!editable || busy" :placeholder="planning ? '预计体积' : '实际体积'" /></template>
-      <template #stop="{ row }"><el-select v-model="row.deliveryIndex" :disabled="!editable || busy || loading || !matchingStops(row as PalletRow).length" placeholder="请先匹配货物目的地"><el-option v-for="stop in matchingStops(row as PalletRow)" :key="stop.index" :value="stop.index" :label="stop.name" /></el-select></template>
-      <template #toolbar-actions><el-button @click="load">{{ planning ? '重新读取容量计划' : '重新读取装载' }}</el-button><el-button v-if="editable" type="primary" :loading="busy" :disabled="loading || !!info?.blockReason || !!destinationIssue || !rows.length" @click="save">{{ planning ? '确认计划容量' : '确认实际装载' }}</el-button></template>
+      <template #stop="{ row }"><span v-if="matchingStops(row as PalletRow).length === 1">{{ matchingStops(row as PalletRow)[0]?.name }}</span><el-select v-else v-model="row.deliveryIndex" :disabled="!editable || busy || loading || !matchingStops(row as PalletRow).length" placeholder="请先匹配货物目的地"><el-option v-for="stop in matchingStops(row as PalletRow)" :key="stop.index" :value="stop.index" :label="stop.name" /></el-select></template>
+      <template v-if="!embedded" #toolbar-actions><el-button @click="load">{{ planning ? '重新读取容量计划' : '重新读取装载' }}</el-button><el-button v-if="editable" type="primary" :loading="busy" :disabled="loading || !!info?.blockReason || !!destinationIssue || !rows.length" @click="save">{{ planning ? '确认计划容量' : '确认实际装载' }}</el-button></template>
     </DataTable>
     <table v-if="savedLoad && !stalePlan" class="density-table"><thead><tr><th>行驶区间</th><th>占用托位</th><th>重量（kg）</th><th>体积（m³）</th><th v-if="planning">剩余托位 / kg / m³</th></tr></thead><tbody><tr v-for="segment in segments" :key="segment.fromIndex"><td>{{ trip.stops[segment.fromIndex]?.name }} → {{ trip.stops[segment.toIndex]?.name }}</td><td>{{ segment.occupied.palletSpaces }} / {{ trip.maxPalletSpaces }}</td><td>{{ segment.occupied.weightKg }} / {{ trip.maxLoadKg }}</td><td>{{ segment.occupied.volumeCbm }} / {{ trip.maxVolumeCbm }}</td><td v-if="planning">{{ segment.remaining.palletSpaces }} / {{ segment.remaining.weightKg }} / {{ segment.remaining.volumeCbm }}</td></tr></tbody></table>
   </div>
diff --git a/src/modules/overseas-master-data/pages/TripDetailView.vue b/src/modules/overseas-master-data/pages/TripDetailView.vue
index 6014ab6b..bb1f8d61 100644
--- a/src/modules/overseas-master-data/pages/TripDetailView.vue
+++ b/src/modules/overseas-master-data/pages/TripDetailView.vue
@@ -184,7 +184,7 @@ onBeforeUnmount(() => { generation++; inspectionSequence++; historySequence++ })
 </script>
 <template>
   <AdminPage class="admin-density"><DetailPageLayout class="density-detail-layout surface-panel" aria-label="车次详情">
-    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-master-data-trips' })">返回车次列表</el-button><h1 class="density-detail-title">{{ detail?.trip.tripNo || '车次详情' }}</h1><span v-if="detail">{{ tripStatusLabels[detail.trip.status] }}</span></div><div class="density-actions"><el-button :disabled="!!busy" @click="load">刷新车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage')" @click="offerSettingsOpen = true">发布设置</el-button><el-button v-if="editable" :disabled="!!busy" @click="editorOpen = true">编辑计划</el-button><el-button v-if="planned && access.can(permission.tripCancel)" type="danger" plain :disabled="!!busy || !!detail?.dispatches.length" @click="cancel">取消车次</el-button></div></div></template>
+    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-master-data-trips' })">返回车次列表</el-button><h1 class="density-detail-title">{{ detail?.trip.tripNo || '车次详情' }}</h1><span v-if="detail">{{ tripStatusLabels[detail.trip.status] }}</span></div><div class="density-actions"><el-button :disabled="!!busy" @click="load">刷新车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage')" @click="offerSettingsOpen = true">发布拼车余位</el-button><el-button v-if="editable" :disabled="!!busy" @click="editorOpen = true">编辑计划</el-button><el-button v-if="planned && access.can(permission.tripCancel)" type="danger" plain :disabled="!!busy || !!detail?.dispatches.length" @click="cancel">取消车次</el-button></div></div></template>
     <LoadErrorState v-if="error" title="车次详情加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="operationError" title="操作未完成" :message="operationError.message" @retry="load"><template #details><ApiErrorMeta :details="operationError" /></template></LoadErrorState>
     <div v-loading="loading"><template v-if="detail">
@@ -218,7 +218,7 @@ onBeforeUnmount(() => { generation++; inspectionSequence++; historySequence++ })
       </template>
       <FormSection v-if="activeTab === 'history'" class="density-form-section" title="操作历史"><DataTable v-model:page="historyPage" :page-size="20" :data="history" :total="historyTotal" :loading="historyLoading" :columns="historyColumns" row-key="recordVersion"><template #time="{ row }">{{ time(row.occurredAt) }}</template><template #action="{ row }">{{ actionLabels[row.action] || '更新记录' }}</template></DataTable></FormSection>
       <TripPlanDialog v-model="editorOpen" :trip="detail.trip" @saved="accept" />
-      <CapacityOfferSettingsDialog v-model="offerSettingsOpen" :trip="detail.trip" @saved="detail.trip.recordVersion = $event" />
+      <CapacityOfferSettingsDialog v-model="offerSettingsOpen" :trip="detail.trip" @trip-updated="detail.trip = $event" @saved="detail.trip.recordVersion = $event" />
     </template></div>
   </DetailPageLayout></AdminPage>
 </template>

From 00a186b37c1d32ff8bbe1bd34ffd481f838b77ff Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 16:11:59 +0800
Subject: [PATCH 05/47] feat(lastleg): expose commercial source and booking
 references

---
 .../pages/OverseasBusinessViews.test.ts       | 10 ++++++++-
 .../pages/TransportOrdersView.vue             | 13 ++++++------
 .../overseas-warehouse/PROTOTYPE_MATRIX.md    |  8 +++++++
 .../overseas-warehouse/api/lastMileOrders.ts  | 11 ++++++++++
 .../businessOrderLink.test.ts                 | 20 ++++++++++++++++++
 .../overseas-warehouse/businessOrderLink.ts   | 12 +++++++++++
 .../lastMilePresentation.ts                   |  4 ++++
 .../pages/LastMileOrderDetailView.test.ts     | 12 +++++++++++
 .../pages/LastMileOrderDetailView.vue         | 14 ++++++++++++-
 .../pages/LastMileOrdersView.behavior.test.ts | 17 +++++++++++++--
 .../pages/LastMileOrdersView.vue              | 21 ++++++++++++++++---
 .../pages/prototypeContract.test.ts           |  2 +-
 src/modules/overseas-warehouse/types.ts       |  4 ++++
 13 files changed, 134 insertions(+), 14 deletions(-)
 create mode 100644 src/modules/overseas-warehouse/businessOrderLink.test.ts
 create mode 100644 src/modules/overseas-warehouse/businessOrderLink.ts

diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index b93c2f1e..c069cb03 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -67,6 +67,14 @@ describe('overseas business mounted pages', () => {
   })
 
 
+  it('opens the associated commercial order using a server-side order number filter', async () => {
+    routing.route.query = { orderNo: 'LB-LINKED' }
+    const wrapper = mount(TransportOrdersView, { props: { domain: 'looseboard' }, global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(listLocalLooseboardOrders).toHaveBeenCalledWith(expect.objectContaining({ orderNo: 'LB-LINKED' }))
+    expect(wrapper.find('input[placeholder="请输入商业单号"]').element).toHaveProperty('value', 'LB-LINKED')
+  })
+
   it('opens pool arrangements from the list without another request or exposing edit actions', async () => {
     vi.mocked(listUsTruckOrders).mockResolvedValue({ records: [{ ...truck, fleetArrangement: arrangement, status: 'WAITING_INBOUND' }], page: 1, size: 20, total: 1, pages: 1 })
     const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises()
@@ -162,7 +170,7 @@ describe('overseas business mounted pages', () => {
   it('keeps truck edit form and version unchanged after a 409', async () => { routing.route.params = { orderId: 'TK-200' }; routing.route.query = { customerId: '10002' }; vi.mocked(updateUsTruckOrder).mockRejectedValue(new ApiResponseError('订单版本冲突', 'B0409', 409)); const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await destination.setValue('Ontario-MARKER-EDIT'); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(updateUsTruckOrder).toHaveBeenCalledWith('TK-200', '10002', expect.objectContaining({ version: 1, destination: 'Ontario-MARKER-EDIT' })); expect((destination.element as HTMLInputElement).value).toBe('Ontario-MARKER-EDIT'); expect(document.body.textContent).toContain('订单版本冲突'); expect(routing.push).not.toHaveBeenCalled() })
   it('mounts truck create with explicit customer selector and enabled submit', async () => { const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); expect(listPlatformTenants).toHaveBeenCalledWith({ page: 1, size: 200, status: 'ACTIVE' }); expect(wrapper.text()).toContain('客户信息'); expect(wrapper.text()).toContain('请选择客户'); expect(wrapper.findAll('button').find((button) => button.text().includes('提交订单'))?.attributes('disabled')).toBeUndefined() })
   it('reuses one idempotency key and preserves truck create input after retries fail', async () => { vi.mocked(createUsTruckOrder).mockRejectedValue(new ApiResponseError('temporary failure', 'S0500', 500)); const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0].vm.$emit('update:modelValue', '10001'); wrapper.findComponent({ name: 'ElRadioGroup' }).vm.$emit('update:modelValue', 'PORT_PICKUP'); const origin = wrapper.find('input[placeholder="城市 / 港口 / 州"]'); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await origin.setValue('LA-MARKER'); await destination.setValue('ONT-MARKER'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('联系人'))!.find('input').setValue('联系人'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('联系方式'))!.find('input').setValue('13800000000'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总重量'))!.find('input').setValue('100'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总体积'))!.find('input').setValue('2.5'); wrapper.findComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-08-31'); await wrapper.vm.$nextTick(); const submit = wrapper.findAll('button').find((button) => button.text().includes('提交订单')); await submit?.trigger('click'); await flushPromises(); await submit?.trigger('click'); await flushPromises(); expect(createUsTruckOrder).toHaveBeenCalledTimes(2); const keys = vi.mocked(createUsTruckOrder).mock.calls.map((call) => call[1].idempotencyKey); expect(keys[0]).toBeTruthy(); expect(keys[1]).toBe(keys[0]); expect((origin.element as HTMLInputElement).value).toBe('LA-MARKER'); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER'); expect(document.body.textContent).toContain('服务暂时不可用'); expect(routing.push).not.toHaveBeenCalled() })
-  it('loads the real looseboard list', async () => { const wrapper = mountPage(TransportOrdersView, { domain: 'looseboard' }); await flushPromises(); expect(listLocalLooseboardOrders).toHaveBeenCalledWith({ page: 1, size: 20, routeKeyword: '', status: '' }); expect(wrapper.text()).toContain('LB-300'); expect(wrapper.text()).toContain('待接单'); expect(wrapper.text()).toContain('2026-08-01 10:00'); expect(listUsTruckOrders).not.toHaveBeenCalled() })
+  it('loads the real looseboard list', async () => { const wrapper = mountPage(TransportOrdersView, { domain: 'looseboard' }); await flushPromises(); expect(listLocalLooseboardOrders).toHaveBeenCalledWith({ page: 1, size: 20, orderNo: '', routeKeyword: '', status: '' }); expect(wrapper.text()).toContain('LB-300'); expect(wrapper.text()).toContain('待接单'); expect(wrapper.text()).toContain('2026-08-01 10:00'); expect(listUsTruckOrders).not.toHaveBeenCalled() })
   it('loads and submits pending-acceptance looseboard edit with PUT adapter', async () => { routing.route.params = { orderId: 'LB-300' }; routing.route.query = { customerId: '10003' }; const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(getLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003'); expect(updateLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003', expect.objectContaining({ version: 0, transportMode: 'SHARED_TRUCK', palletRequired: 'YES' })) })
   it('keeps looseboard edit form and version unchanged after a 409', async () => { routing.route.params = { orderId: 'LB-300' }; routing.route.query = { customerId: '10003' }; vi.mocked(updateLocalLooseboardOrder).mockRejectedValue(new ApiResponseError('订单版本冲突', 'B0409', 409)); const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await destination.setValue('ONT-MARKER-EDIT'); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(updateLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003', expect.objectContaining({ version: 0, destination: 'ONT-MARKER-EDIT' })); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER-EDIT'); expect(document.body.textContent).toContain('订单版本冲突'); expect(routing.push).not.toHaveBeenCalled() })
   it('mounts looseboard create without a detail route or pending notice', async () => { const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); expect(wrapper.text()).toContain('客户信息'); expect(wrapper.text()).toContain('请选择客户'); expect(wrapper.text()).not.toContain('接口能力待后端补齐'); expect(wrapper.findAll('button').find((button) => button.text().includes('提交订单'))?.attributes('disabled')).toBeUndefined() })
diff --git a/src/modules/overseas-business/pages/TransportOrdersView.vue b/src/modules/overseas-business/pages/TransportOrdersView.vue
index f732665d..71eed679 100644
--- a/src/modules/overseas-business/pages/TransportOrdersView.vue
+++ b/src/modules/overseas-business/pages/TransportOrdersView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
 import { computed, onMounted, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { Plus } from '@lucide/vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -19,7 +19,7 @@ import { overseasBusinessPermissions } from '../permissions'
 import type { LocalLooseboardOrder, LocalLooseboardQuery, LocalLooseboardStatus, LocalTransportOrder, LocalTransportQuery, LocalTransportStatus, LocalTransportType, LooseboardTransportMode } from '../types'
 
 const props = defineProps<{ domain: 'truck' | 'looseboard' }>()
-const router = useRouter(); const access = useAccessPreviewStore()
+const route = useRoute(); const router = useRouter(); const access = useAccessPreviewStore()
 const isLooseboard = computed(() => props.domain === 'looseboard'); const domainLabel = computed(() => isLooseboard.value ? '本土散板' : '本土卡车')
 const queryPreferenceKey = computed(() => isLooseboard.value ? 'overseas-business-looseboard-query' : 'overseas-business-truck-query')
 const createPermission = computed(() => isLooseboard.value ? overseasBusinessPermissions.looseboardCreate : overseasBusinessPermissions.truckCreate)
@@ -28,12 +28,13 @@ const rows = ref<Array<LocalTransportOrder | LocalLooseboardOrder>>([]); const l
 const page = ref(1); const pageSize = ref(20); const total = ref(0)
 const arrangementOpen = ref(false), arrangement = ref<FleetArrangement | null>(null)
 function showArrangement(row: LocalTransportOrder | LocalLooseboardOrder) { arrangement.value = row.fleetArrangement; arrangementOpen.value = true }
-const filters = ref<QueryModel>({ status: '', routeKeyword: '' }); const applied = ref({ ...filters.value })
+const filters = ref<QueryModel>({ orderNo: String(route.query.orderNo || ''), status: '', routeKeyword: '' }); const applied = ref({ ...filters.value })
 const truckStatusLabels: Record<LocalTransportStatus, string> = { PENDING_REVIEW: '待审核', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PALLET_OVERAGE_REVIEW: '超托待审', PARTIALLY_ALLOCATED: '部分分配', ALLOCATED: '已分配', PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', REJECTED: '已拒绝', CANCELLED: '已取消' }
 const looseboardStatusLabels: Record<LocalLooseboardStatus, string> = { PENDING_ACCEPTANCE: '待接单', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消', ...poolOrderStatusLabels }
 const transportTypeLabels: Record<LocalTransportType, string> = { PORT_PICKUP: '港口提柜', WAREHOUSE_TO_WAREHOUSE: '仓到仓', WAREHOUSE_TO_DOOR: '仓到门' }
 const transportModeLabels: Record<LooseboardTransportMode, string> = { SHARED_TRUCK: '拼车', PRIORITY_CONSOLIDATION: '优先拼载' }
 const fields = computed<QueryField[]>(() => [
+  { key: 'orderNo', type: 'input', label: '商业单号', placeholder: '请输入商业单号', width: 230 },
   { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 170, options: Object.entries(isLooseboard.value ? looseboardStatusLabels : truckStatusLabels).map(([value, label]) => ({ value, label })) },
   { key: 'routeKeyword', type: 'input', label: '运输路线', placeholder: '起运地/目的地', width: 240 },
 ])
@@ -64,10 +65,10 @@ async function load() {
   rows.value = []; total.value = 0; loadError.value = null; loading.value = true
   try {
     if (isLooseboard.value) {
-      const result = await listLocalLooseboardOrders({ page: page.value, size: pageSize.value, routeKeyword: String(applied.value.routeKeyword || ''), status: String(applied.value.status || '') as LocalLooseboardStatus | '' } satisfies LocalLooseboardQuery)
+      const result = await listLocalLooseboardOrders({ page: page.value, size: pageSize.value, orderNo: String(applied.value.orderNo || ''), routeKeyword: String(applied.value.routeKeyword || ''), status: String(applied.value.status || '') as LocalLooseboardStatus | '' } satisfies LocalLooseboardQuery)
       rows.value = result.records; total.value = result.total
     } else {
-      const result = await listUsTruckOrders({ page: page.value, size: pageSize.value, routeKeyword: String(applied.value.routeKeyword || ''), status: String(applied.value.status || '') as LocalTransportStatus | '' } satisfies LocalTransportQuery)
+      const result = await listUsTruckOrders({ page: page.value, size: pageSize.value, orderNo: String(applied.value.orderNo || ''), routeKeyword: String(applied.value.routeKeyword || ''), status: String(applied.value.status || '') as LocalTransportStatus | '' } satisfies LocalTransportQuery)
       rows.value = result.records; total.value = result.total
     }
   } catch (error) { loadError.value = getApiErrorDetails(error, `${domainLabel.value}订单加载失败，请稍后重试`) } finally { loading.value = false }
@@ -76,7 +77,7 @@ function search(model: QueryModel) { applied.value = { ...model }; if (page.valu
 function openCreate() { void router.push({ name: isLooseboard.value ? 'overseas-business-looseboard-new' : 'overseas-business-truck-new' }) }
 function canEdit(row: LocalTransportOrder | LocalLooseboardOrder) { return !row.fleetArrangement && (isLooseboard.value ? row.status === 'PENDING_ACCEPTANCE' : row.status === 'PENDING_REVIEW') }
 function openEdit(row: LocalTransportOrder | LocalLooseboardOrder) { if (!canEdit(row)) return; void router.push({ name: isLooseboard.value ? 'overseas-business-looseboard-edit' : 'overseas-business-truck-edit', params: { orderId: row.orderNo }, query: { customerId: row.customerId } }) }
-watch([page, pageSize], () => { void load() }); watch(isLooseboard, () => { page.value = 1; applied.value = { status: '', routeKeyword: '' }; filters.value = { ...applied.value }; void load() }); onMounted(() => { void load() })
+watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route.query.orderNo], () => { page.value = 1; applied.value = { orderNo: String(route.query.orderNo || ''), status: '', routeKeyword: '' }; filters.value = { ...applied.value }; void load() }); onMounted(() => { void load() })
 </script>
 
 <template>
diff --git a/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md b/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
index 3d276af2..a1d0e400 100644
--- a/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
@@ -1,5 +1,13 @@
 # 海外仓原型核对矩阵
 
+### 尾程商业来源展示
+
+| 页面 | 操作 | 依据 | 承载与结论 | 验收 |
+|---|---|---|---|---|
+| 尾程列表 | 来源展示、筛选、导出 | 本轮用户截图1及已确认方案 | 保留横向列表与原操作；增加业务来源、商业单号、预订号；订单类型改称履约类型 | 待人工1920×1080、100%截图确认 |
+| 尾程详情 | 查看关联单据 | 本轮用户截图2及已确认方案 | 保留独立详情、基本信息页签；增加紧凑关联单据区 | 待人工截图确认 |
+| 本土散板/卡车列表 | 来源商业单跳转 | 本轮已确认方案、现有承运安排入口 | 有列表权限才跳转既有列表，携带商业单号筛选；池来源保留1080px承运安排弹框 | 自动检查与人工确认分别报告 |
+
 ### F33 已有库存转运履约接入（2026-10-04）
 
 | 页面 | 操作 | 依据 | 承载方式与本轮结论 | 验收 |
diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.ts b/src/modules/overseas-warehouse/api/lastMileOrders.ts
index eed2e084..78daa216 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.ts
@@ -27,6 +27,9 @@ export interface LastMileOrderQuery {
   orderNo?: string
   relabelNo?: string
   orderType?: string
+  businessType?: string
+  businessOrderNo?: string
+  externalBookingNo?: string
   sailingStage?: 'BEFORE_DEPARTURE' | 'AFTER_DEPARTURE'
   inboundCode?: string
   lxCode?: string
@@ -42,7 +45,15 @@ export interface LastMileOrderQuery {
   createdTo?: string
 }
 
+export interface LastMileBusinessSource {
+  businessType: string
+  label: string
+  businessOrderNo: string | null
+  externalBookingNo: string | null
+}
+
 export interface LastMileOrderSummaryDto {
+  businessSource?: LastMileBusinessSource | null
   id: string
   customerId: string
   sourceContainerBookingId?: string | null
diff --git a/src/modules/overseas-warehouse/businessOrderLink.test.ts b/src/modules/overseas-warehouse/businessOrderLink.test.ts
new file mode 100644
index 00000000..92b119bb
--- /dev/null
+++ b/src/modules/overseas-warehouse/businessOrderLink.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest'
+import { businessOrderLink } from './businessOrderLink'
+import { toLastMileOrderListItem } from './lastMilePresentation'
+
+describe('tail order business source', () => {
+  it('keeps physical fulfillment type and uses only formal business references', () => {
+    const row = toLastMileOrderListItem({ id: '1', customerId: 'A', orderNo: 'WT-1', orderType: 'WAREHOUSE_TRANSFER', customerRemark: '外接预订 FB-WRONG', businessSource: { businessType: 'LOCAL_LOOSEBOARD', label: '本土散板 · 拼车需求池', businessOrderNo: 'LB-1', externalBookingNo: 'FB-1' } })
+    expect(row).toMatchObject({ orderTypeCode: 'WAREHOUSE_TRANSFER', orderType: '仓储转运', businessSource: '本土散板 · 拼车需求池', businessOrderNo: 'LB-1', externalBookingNo: 'FB-1' })
+    const unlinked = toLastMileOrderListItem({ id: '2', customerId: 'A', orderNo: 'WT-2', customerRemark: '外接预订 FB-WRONG' })
+    expect(unlinked.businessOrderNo).toBe('—')
+    expect(unlinked.externalBookingNo).toBe('—')
+  })
+  it('links only known business numbers with the target list permission', () => {
+    expect(businessOrderLink('LOCAL_LOOSEBOARD', 'LB-1', p => p.endsWith('looseboard:list'))).toEqual({ name: 'overseas-business-looseboards', query: { orderNo: 'LB-1' } })
+    expect(businessOrderLink('US_TRUCK', 'TRUCK-1', p => p.endsWith('truck:list'))).toEqual({ name: 'overseas-business-trucks', query: { orderNo: 'TRUCK-1' } })
+    expect(businessOrderLink('LOCAL_LOOSEBOARD', 'LB-1', () => false)).toBeUndefined()
+    expect(businessOrderLink('LOCAL_LOOSEBOARD', null, () => true)).toBeUndefined()
+    expect(businessOrderLink('WAREHOUSE_TRANSFER', 'WT-1', () => true)).toBeUndefined()
+  })
+})
diff --git a/src/modules/overseas-warehouse/businessOrderLink.ts b/src/modules/overseas-warehouse/businessOrderLink.ts
new file mode 100644
index 00000000..c3e2b501
--- /dev/null
+++ b/src/modules/overseas-warehouse/businessOrderLink.ts
@@ -0,0 +1,12 @@
+import { overseasBusinessPermissions } from '@/modules/overseas-business'
+
+export function businessOrderLink(type: string | undefined, orderNo: string | null | undefined, can: (permission: string) => boolean) {
+  if (!orderNo || orderNo === '—') return undefined
+  if (type === 'LOCAL_LOOSEBOARD' && can(overseasBusinessPermissions.looseboardList)) {
+    return { name: 'overseas-business-looseboards', query: { orderNo } }
+  }
+  if (type === 'US_TRUCK' && can(overseasBusinessPermissions.truckList)) {
+    return { name: 'overseas-business-trucks', query: { orderNo } }
+  }
+  return undefined
+}
diff --git a/src/modules/overseas-warehouse/lastMilePresentation.ts b/src/modules/overseas-warehouse/lastMilePresentation.ts
index 8376253c..9acabc41 100644
--- a/src/modules/overseas-warehouse/lastMilePresentation.ts
+++ b/src/modules/overseas-warehouse/lastMilePresentation.ts
@@ -153,6 +153,10 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
     sourceContainerBookingId: String(dto.sourceContainerBookingId ?? '').trim(),
     orderNo: lastMileOrderReference(dto.orderNo),
     sourceOrderNo: lastMileOrderReference(dto.sourceOrderNo, ''),
+    businessType: dto.businessSource?.businessType || '',
+    businessSource: text(dto.businessSource?.label),
+    businessOrderNo: text(dto.businessSource?.businessOrderNo),
+    externalBookingNo: text(dto.businessSource?.externalBookingNo),
     orderTypeCode: String(dto.orderType ?? '').trim(),
     currentStatusCode: String(dto.currentStatus ?? '').trim(),
     warning: dto.abnormal ? '异常' : '—',
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
index 2c73f5cb..61fd520a 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
@@ -33,6 +33,18 @@ describe('LastMileOrderDetailView domestic detail alignment', () => {
     })
   })
 
+  it('shows business references without changing the transfer workflow or requiring business-list permission', async () => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'internal-order-id', customerId: 'A', orderNo: 'WT-1', sourceOrderNo: 'WT-1', orderType: 'WAREHOUSE_TRANSFER', businessSource: { businessType: 'LOCAL_LOOSEBOARD', label: '本土散板 · 拼车需求池', businessOrderNo: 'LB-1', externalBookingNo: 'FB-1' } }, cargo: [], fees: [], statusHistory: [], operationHistory: [] })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    const source = wrapper.get('[aria-label="商业来源与关联单据"]')
+    expect(source.text()).toContain('本土散板 · 拼车需求池')
+    expect(source.text()).toContain('LB-1')
+    expect(source.text()).toContain('FB-1')
+    expect(source.find('button').exists()).toBe(false)
+    expect(wrapper.get('[aria-label="基本信息"]').text()).toContain('履约类型仓储转运')
+    expect(getWarehouseTransfer).not.toHaveBeenCalled()
+  })
+
   it('shows one business heading, a semantic status and summary without losing basic fields', async () => {
     const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
index 1c31a67d..f9bcc40f 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
@@ -16,6 +16,7 @@ import { createLastMileOrderFee, getLastMileOrder, type LastMileOrderDetailDto }
 import { relabelApplicationStatusLabel, relabelBusinessStatusLabel, formatOverseasDateTime, lastMileOrderReference, lastMileOrderTypeLabel, lastMileStatusLabel, packageDifferenceText } from '../lastMilePresentation'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import OverseasDetailShell from '../components/OverseasDetailShell.vue'
+import { businessOrderLink } from '../businessOrderLink'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import WarehouseTransferFulfillmentPanel from '../components/WarehouseTransferFulfillmentPanel.vue'
 
@@ -58,7 +59,7 @@ const referenceValue = computed(() => lastMileOrderReference(detail.value?.order
 const orderFields = computed<DetailField[]>(() => {
   const order = detail.value?.order
   const fields: DetailField[] = [
-    { label: '订单类型', value: text(order?.orderTypeName || lastMileOrderTypeLabel(order?.orderType)) },
+    { label: '履约类型', value: text(order?.orderTypeName || lastMileOrderTypeLabel(order?.orderType)) },
     { label: '入仓码', value: text(order?.inboundCode) },
     { label: '货主', value: text(order?.customerName) },
     { label: '海外仓', value: text(order?.overseasWarehouseName) },
@@ -94,6 +95,7 @@ const containerFields = computed<DetailField[]>(() => {
     { label: '货柜节点', value: containerNodeLabel(order?.containerNode) },
   ]
 })
+const commercialLink = computed(() => businessOrderLink(detail.value?.order.businessSource?.businessType, detail.value?.order.businessSource?.businessOrderNo, access.can))
 const basicFields = computed(() => [...orderFields.value, ...containerFields.value])
 const overviewFields = computed(() => {
   const order = detail.value?.order
@@ -211,6 +213,15 @@ onMounted(load)
     <section v-else v-loading="loading" class="detail-surface" :aria-busy="loading">
       <el-tabs v-model="activeTab" class="detail-tabs density-element-tabs density-contained-tabs">
         <el-tab-pane name="basic"><template #label><span class="density-tab-icon" aria-hidden="true">📋</span><span>基本信息</span></template>
+          <section aria-label="商业来源与关联单据">
+            <h2 class="source-heading">关联单据</h2>
+            <dl class="detail-fields density-fields">
+              <div class="wide"><dt>业务来源</dt><dd>{{ text(detail?.order.businessSource?.label) }}</dd></div>
+              <div class="wide"><dt>关联商业单号</dt><dd><el-button v-if="commercialLink" link type="primary" @click="router.push(commercialLink)">{{ detail?.order.businessSource?.businessOrderNo }}</el-button><span v-else>{{ text(detail?.order.businessSource?.businessOrderNo) }}</span></dd></div>
+              <div class="wide"><dt>外接预订号</dt><dd>{{ text(detail?.order.businessSource?.externalBookingNo) }}</dd></div>
+              <div class="wide"><dt>来源单号</dt><dd>{{ text(detail?.order.sourceOrderNo) }}</dd></div>
+            </dl>
+          </section>
           <dl class="detail-fields density-fields" aria-label="基本信息">
             <div v-for="field in basicFields" :key="field.label" :class="{ wide: field.wide }"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field), 'package-difference--nonzero': isNonzeroDifference(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div>
           </dl>
@@ -241,6 +252,7 @@ onMounted(load)
 </template>
 
 <style scoped>
+.source-heading { margin: 0; padding: var(--admin-space-3); font-size: var(--admin-font-section); font-weight: 600; }
 .detail-fields > div.wide { grid-column: span 2; }
 .detail-field-value--business { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .package-difference--nonzero { color: var(--el-color-danger); font-weight: 600; }
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
index 99b7b0ea..94db1bc1 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
@@ -186,6 +186,19 @@ async function chooseContainer(wrapper: Awaited<ReturnType<typeof mountView>>) {
 }
 
 describe('LastMileOrdersView pending order and container conversion', () => {
+  it('shows commercial source alongside fulfillment type and sends source filters to the server', async () => {
+    vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{ id: '1', customerId: 'A', orderNo: 'WT-1', orderType: 'WAREHOUSE_TRANSFER', businessSource: { businessType: 'LOCAL_LOOSEBOARD', label: '本土散板 · 拼车需求池', businessOrderNo: 'LB-1', externalBookingNo: 'FB-1' } }], page: 1, size: 10, total: 1, pages: 1 })
+    const wrapper = await mountView()
+    const table = wrapper.findComponent(DataTable)
+    expect(table.props('data')[0]).toMatchObject({ businessSource: '本土散板 · 拼车需求池', businessOrderNo: 'LB-1', externalBookingNo: 'FB-1', orderType: '仓储转运', orderTypeCode: 'WAREHOUSE_TRANSFER' })
+    const toolbar = wrapper.findComponent(QueryToolbar)
+    toolbar.vm.$emit('search', { ...toolbar.props('modelValue'), businessType: 'LOCAL_LOOSEBOARD', businessOrderNo: ' LB-1 ', externalBookingNo: ' FB-1 ' })
+    await flushPromises()
+    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ businessType: 'LOCAL_LOOSEBOARD', businessOrderNo: 'LB-1', externalBookingNo: 'FB-1' }))
+    toolbar.vm.$emit('reset'); await flushPromises()
+    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ businessType: undefined, businessOrderNo: undefined, externalBookingNo: undefined }))
+  })
+
   it('supports keyboard status switching and keeps selection and queries in sync', async () => {
     const wrapper = await mountView()
     const tabs = wrapper.findAll('[role="tab"]')
@@ -240,7 +253,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     expect(toolbar.props('fields').map((field) => field.key)).toEqual(['orderNo', 'inboundCode', 'warehouse'])
     const initialCalls = vi.mocked(listLastMileOrders).mock.calls.length
     await button(wrapper, '高级筛选')!.trigger('click')
-    expect(toolbar.props('fields')).toHaveLength(13)
+    expect(toolbar.props('fields')).toHaveLength(16)
     toolbar.vm.$emit('update:modelValue', {
       ...toolbar.props('modelValue'), containerNo: ' CONT-15 ', abnormal: 'false',
       createdAt: ['2026-09-01', '2026-09-30'],
@@ -497,7 +510,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     })
     expect(availableFields.filter((field) => ['orderType', 'status', 'abnormal', 'detained'].includes(field.key)))
       .toEqual(expect.arrayContaining([
-        expect.objectContaining({ key: 'orderType', placeholder: '请选择订单类型' }),
+        expect.objectContaining({ key: 'orderType', placeholder: '请选择履约类型' }),
         expect.objectContaining({ key: 'status', placeholder: '请选择当前状态' }),
         expect.objectContaining({ key: 'abnormal', placeholder: '请选择是否异常' }),
         expect.objectContaining({ key: 'detained', placeholder: '请选择是否暂扣' }),
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
index 1320f047..cca3c05f 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
@@ -17,6 +17,7 @@ import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
 import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, getContainerInboundPlanPreview, getContainerPlanProgress, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, reviewDirectRelabelOrder, reviewReturnOrder, transferLastMileOrders, updateLastMileOrderHold, updateLastMileOrderManualNodes, type ContainerInboundPlanPreviewDto, type ContainerInboundPlanPreviewGroupDto, type ContainerInboundPlanPreviewOrderDto, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto, type ManualNodeCode, type LastMileOrderQuery } from '../api/lastMileOrders'
+import { businessOrderLink } from '../businessOrderLink'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { reviewCargoDiscard } from '../api/lastMileOrders'
 import WarehouseTransferReviewDialog from '../components/WarehouseTransferReviewDialog.vue'
@@ -153,13 +154,20 @@ let containerOptionRequest = 0
 const statusTab = ref<'全部' | '开船前' | '开船后' | '柜子'>('全部')
 const statusTabs = ['全部', '开船前', '开船后'] as const
 const showAdvancedFilters = ref(false)
-const filters = ref<QueryModel>({ orderNo: '', relabelNo: '', orderType: '', warehouse: '', inboundCode: '', lxCode: '', sourceOrderNo: '', containerNo: '', status: '', transferWarehouseCode: '', abnormal: '', detained: '', createdAt: [] })
+const filters = ref<QueryModel>({ businessType: '', businessOrderNo: '', externalBookingNo: '', orderNo: '', relabelNo: '', orderType: '', warehouse: '', inboundCode: '', lxCode: '', sourceOrderNo: '', containerNo: '', status: '', transferWarehouseCode: '', abnormal: '', detained: '', createdAt: [] })
 const allFields: QueryField[] = [
+  { key: 'businessType', type: 'select', label: '业务来源', width: 180, placeholder: '请选择业务来源', options: [
+    { label: '本土散板（全部来源）', value: 'LOCAL_LOOSEBOARD' }, { label: '本土卡车', value: 'US_TRUCK' },
+    { label: '仓储转运', value: 'WAREHOUSE_TRANSFER' }, { label: '头程订单', value: 'FIRST_LEG' },
+    { label: '换标下单', value: 'RELABEL_APPLICATION' }, { label: '退货换标', value: 'RETURN_RELABEL' }, { label: '一件代发', value: 'ONE_CLICK_DROPSHIP' },
+  ] },
+  { key: 'businessOrderNo', type: 'input', label: '关联商业单号', width: 210, placeholder: '请输入商业单号' },
+  { key: 'externalBookingNo', type: 'input', label: '外接预订号', width: 210, placeholder: '请输入外接预订号' },
   { key: 'orderNo', type: 'input', label: '尾程单号', width: 190, placeholder: '请输入尾程单号' },
   { key: 'relabelNo', type: 'input', label: '换标单号', width: 190, placeholder: '请输入换标单号' },
   { key: 'inboundCode', type: 'input', label: '入仓码', width: 180, placeholder: '请输入入仓码' },
   { key: 'lxCode', type: 'input', label: 'LX代码', width: 180, placeholder: '请输入LX代码' },
-  { key: 'orderType', type: 'select', label: '订单类型', width: 170, placeholder: '请选择订单类型', options: [
+  { key: 'orderType', type: 'select', label: '履约类型', width: 170, placeholder: '请选择履约类型', options: [
     { label: '头程订单', value: 'FIRST_LEG' }, { label: '换标下单', value: 'RELABEL_APPLICATION' },
     { label: '仓储转运', value: 'WAREHOUSE_TRANSFER' }, { label: '本土散板', value: 'LOCAL_LOOSEBOARD' },
     { label: '退货换标', value: 'RETURN_RELABEL' }, { label: '一件代发', value: 'ONE_CLICK_DROPSHIP' },
@@ -246,10 +254,13 @@ const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 330, fixed: 'left', slotName: 'actions' },
   { key: 'selection', type: 'selection', width: 48, fixed: 'left' },
   { key: 'orderNo', prop: 'orderNo', label: '尾程单号', minWidth: 170, slotName: 'orderNo' },
+  { key: 'businessSource', prop: 'businessSource', label: '业务来源', minWidth: 220 },
+  { key: 'businessOrderNo', prop: 'businessOrderNo', label: '关联商业单号', minWidth: 230, slotName: 'businessOrderNo' },
+  { key: 'externalBookingNo', prop: 'externalBookingNo', label: '外接预订号', minWidth: 220 },
   { key: 'consolidated', prop: 'consolidated', label: '合托标记', width: 100, hideable: false },
   { key: 'palletMergeRelation', prop: 'palletMergeRelation', label: '合托关联入仓单', minWidth: 220, hideable: false },
   { key: 'warning', prop: 'warning', label: '预警', width: 90 },
-  { key: 'orderType', prop: 'orderType', label: '订单类型', minWidth: 110 },
+  { key: 'orderType', prop: 'orderType', label: '履约类型', minWidth: 110 },
   { key: 'rejectedAt', prop: 'rejectedAt', label: '拒收时间', minWidth: 150 },
   { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140 },
   { key: 'lxCode', prop: 'lxCode', label: 'LX代码', minWidth: 150 },
@@ -340,6 +351,9 @@ function orderQuery(): LastMileOrderQuery {
   return {
     page: page.value,
     size: pageSize.value,
+    businessType: String(filters.value.businessType || '').trim() || undefined,
+    businessOrderNo: String(filters.value.businessOrderNo || '').trim() || undefined,
+    externalBookingNo: String(filters.value.externalBookingNo || '').trim() || undefined,
     orderNo: String(filters.value.orderNo || '').trim() || undefined,
     relabelNo: String(filters.value.relabelNo || '').trim() || undefined,
     orderType: statusTab.value === '全部' ? String(filters.value.orderType || '').trim() || undefined : 'FIRST_LEG',
@@ -1097,6 +1111,7 @@ onMounted(() => { void load() })
       <template #relabelOrderNo="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.relabelNo }}</div><span v-if="!row.relabelApplications?.length">{{ row.relabelOrderNo }}</span></template>
       <template #relabelStatus="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.statusLabel }} · {{ application.quantity }} 件</div><span v-if="!row.relabelApplications?.length">{{ row.relabelStatus }}</span></template>
       <template #actions="{ row }"><RowActions text-actions :actions="lastMileRowActions(row as LastMileOrderListItem)" :more-label="`更多尾程订单操作 · ${(row as LastMileOrderListItem).orderNo || '当前记录'}`" @action="handleLastMileRowAction($event, row as LastMileOrderListItem)" /></template>
+      <template #businessOrderNo="{ row }"><el-button v-if="businessOrderLink(row.businessType, row.businessOrderNo, access.can)" link type="primary" @click="router.push(businessOrderLink(row.businessType, row.businessOrderNo, access.can)!)">{{ row.businessOrderNo }}</el-button><span v-else>{{ row.businessOrderNo }}</span></template>
       <template #orderNo="{ row }"><OrderReferenceText :value="String(row.orderNo || '')" copyable /></template>
       <template #cartonDifference="{ row }"><span :class="{ 'package-difference--nonzero': typeof row.cartonDifference === 'number' && row.cartonDifference !== 0 }">{{ packageDifferenceText(row.cartonDifference) }}</span></template>
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
index a803c8c3..2bdf21d1 100644
--- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
+++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
@@ -397,7 +397,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
 
   it('keeps every prototype list column in its frozen order', () => {
     expect(columnKeys('LastMileOrdersView.vue')).toEqual([
-      'actions', 'selection', 'orderNo', 'consolidated', 'palletMergeRelation', 'warning', 'orderType', 'rejectedAt', 'inboundCode', 'lxCode', 'owner', 'warehouse',
+      'actions', 'selection', 'orderNo', 'businessSource', 'businessOrderNo', 'externalBookingNo', 'consolidated', 'palletMergeRelation', 'warning', 'orderType', 'rejectedAt', 'inboundCode', 'lxCode', 'owner', 'warehouse',
       'transferWarehouse', 'fbaWarehouse', 'containerNo', 'abnormal', 'held', 'pallets',
       'cartons', 'cartonDifference', 'volume', 'quantity', 'volumeWeight', 'portEta', 'portAta', 'warehouseEta', 'inboundOrderNo',
       'dispatchStatus', 'outboundOrderNo', 'dispatchOrderNo', 'relabelOrderNo', 'relabelStatus', 'status',
diff --git a/src/modules/overseas-warehouse/types.ts b/src/modules/overseas-warehouse/types.ts
index 8a254111..79afda07 100644
--- a/src/modules/overseas-warehouse/types.ts
+++ b/src/modules/overseas-warehouse/types.ts
@@ -4,6 +4,10 @@
  * identifiers, timestamps, money precision, or mutation request contracts.
  */
 export interface LastMileOrderListItem {
+  businessType: string
+  businessSource: string
+  businessOrderNo: string
+  externalBookingNo: string
   id: string
   customerId: string
   sourceContainerBookingId: string

From 692beff78230beedbcf449259712de7aeffb98c1 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 9 Oct 2026 17:27:47 +0800
Subject: [PATCH 06/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/LastMileOrdersView.vue              | 37 +++++++++++++++----
 .../pages/OutboundsView.vue                   | 15 ++++++--
 .../overseas-warehouse/relabelRework.test.ts  | 18 +++++++++
 .../overseas-warehouse/relabelRework.ts       |  8 ++++
 4 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 src/modules/overseas-warehouse/relabelRework.test.ts
 create mode 100644 src/modules/overseas-warehouse/relabelRework.ts

diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
index cca3c05f..0f1231e6 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
@@ -26,6 +26,11 @@ import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { lastMileStatusLabel, packageDifferenceText, toLastMileOrderListItem } from '../lastMilePresentation'
 import type { LastMileOrderListItem } from '../types'
+import { reworkRelabelApplications } from '../relabelRework'
+const reworkOpen = ref(false)
+const reworkSaving = ref(false)
+const reworkOptions = ref<Array<{ relabelNo: string; status: string }>>([])
+const reworkForm = reactive({ relabelNo: '', remark: '' })
 const rows = ref<LastMileOrderListItem[]>([])
 const submitExport = useExportTask()
 const access = useAccessPreviewStore()
@@ -955,7 +960,7 @@ async function reviewDirectRelabel(source: object) {
   }
 }
 function canConfirmRelabel(row: { relabelStatusCode?: string }) { return row.relabelStatusCode === 'CUSTOMER_CONFIRM_PENDING' }
-function canReworkRelabel(row: { relabelStatusCode?: string }) { return ['CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(row.relabelStatusCode ?? '') }
+function canReworkRelabel(row: LastMileOrderListItem) { return reworkRelabelApplications(row).length > 0 }
 function hasRelabelActions(row: LastMileOrderListItem) {
   return access.can(permission.relabelOrderStatus)
     && Boolean(row.relabelOrderNo)
@@ -986,7 +991,7 @@ function lastMileRowActions(row: LastMileOrderListItem): RowActionItem[] {
     { key: 'hold', label: row.detained ? '解除暂扣' : '暂扣订单', priority: 300, tone: 'warning', visible: access.can(permission.lastMileOrderTransfer) && (row.detained || row.currentStatusCode === 'INBOUND_COMPLETED') },
     { key: 'manual-nodes', label: '人工修改节点', priority: 200, visible: access.can(permission.lastMileOrderTransfer) },
     { key: 'confirm-relabel', label: '换标完成确认', priority: 150, visible: access.can(permission.relabelOrderStatus) && Boolean(row.relabelOrderNo) && canConfirmRelabel(row) },
-    { key: 'rework-relabel', label: '重新换标', priority: 100, tone: 'danger', divided: true, visible: access.can(permission.relabelOrderStatus) && Boolean(row.relabelOrderNo) && canReworkRelabel(row) },
+    { key: 'rework-relabel', label: '换标退回重做', priority: 100, tone: 'danger', divided: true, visible: access.can(permission.relabelOrderStatus) && canReworkRelabel(row) },
   ]
 }
 function handleLastMileRowAction(command: string, row: LastMileOrderListItem) {
@@ -1011,16 +1016,26 @@ async function confirmRelabel(row: { relabelOrderNo?: string }) {
     await load()
   } catch (error) { if (error !== 'cancel' && error !== 'close') ElMessage.error(getApiErrorDetails(error, '换标完成确认失败').message) }
 }
-async function reworkRelabel(row: { relabelOrderNo?: string }) {
-  const relabelNo = row.relabelOrderNo
-  if (!relabelNo) return
+function reworkRelabel(row: LastMileOrderListItem) {
+  reworkOptions.value = reworkRelabelApplications(row)
+  if (!reworkOptions.value.length) return
+  reworkForm.relabelNo = reworkOptions.value[0].relabelNo
+  reworkForm.remark = ''
+  reworkOpen.value = true
+}
+async function submitReworkRelabel() {
+  if (reworkSaving.value || !reworkForm.relabelNo || !reworkForm.remark.trim()) return
+  const relabelNo = reworkForm.relabelNo
+  reworkSaving.value = true
   try {
     const task = await getRelabelReviewTask(relabelNo)
-    const { value } = await ElMessageBox.prompt('填写退回原因，仓库将重新执行换标并上传照片。', '重新换标', { customClass: 'admin-density-confirm', inputType: 'textarea', inputValidator: (value) => Boolean(value?.trim()) && value.trim().length <= 1000 || '请填写 1 至 1000 字原因', confirmButtonText: '确认重新换标', cancelButtonText: '取消' })
-    await returnRelabelForRework(relabelNo, task.version, value.trim(), crypto.randomUUID())
+    if (task.taskStatus !== 'WAIT_REVIEW') { ElMessage.warning('仓库尚未提交完工复核，暂不能退回重做'); return }
+    await returnRelabelForRework(relabelNo, task.version, reworkForm.remark.trim(), crypto.randomUUID())
     ElMessage.success('已退回重新换标')
+    reworkOpen.value = false
     await load()
-  } catch (error) { if (error !== 'cancel' && error !== 'close') ElMessage.error(getApiErrorDetails(error, '重新换标失败').message) }
+  } catch (error) { ElMessage.error(getApiErrorDetails(error, '重新换标失败').message) }
+  finally { reworkSaving.value = false }
 }
 function openDetail(source: object) {
   const row = source as LastMileOrderListItem
@@ -1255,6 +1270,12 @@ onMounted(() => { void load() })
     <el-alert title="保存后该订单只显示人工节点，不再跟随柜级节点；请至少填写一个节点时间。" type="warning" :closable="false" show-icon />
     <div class="manual-node-table"><div class="manual-node-table__head"><span>节点</span><span>节点时间</span></div><div v-for="node in manualNodeDefinitions" :key="node.code" class="manual-node-table__row"><span>{{ node.label }}</span><el-date-picker v-model="manualNodeValues[node.code]" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="年/月/日 --:--" /></div></div>
   </AppDialog>
+  <AppDialog class="admin-density-dialog" v-model="reworkOpen" title="换标退回重做" width="min(620px, calc(100vw - 28px))" confirm-text="确认退回重做" :confirm-loading="reworkSaving" :confirm-disabled="!reworkForm.relabelNo || !reworkForm.remark.trim()" @confirm="submitReworkRelabel">
+    <el-form class="density-form" label-position="top">
+      <el-form-item label="换标单" required><el-select v-model="reworkForm.relabelNo" :disabled="reworkSaving" placeholder="请选择需要退回的换标单"><el-option v-for="application in reworkOptions" :key="application.relabelNo" :label="application.relabelNo" :value="application.relabelNo" /></el-select></el-form-item>
+      <el-form-item label="退回原因" required><el-input v-model="reworkForm.remark" :disabled="reworkSaving" type="textarea" :rows="4" maxlength="1000" show-word-limit placeholder="填写退回原因，仓库将重新执行换标并上传照片" /></el-form-item>
+    </el-form>
+  </AppDialog>
 </template>
 
 <style scoped>
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.vue b/src/modules/overseas-warehouse/pages/OutboundsView.vue
index ff838d3c..3f087d6b 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.vue
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.vue
@@ -64,7 +64,7 @@ function transferCustomerName(row: WarehouseTransferOutboundCandidate) {
   const customer = tenantOptions.value.find(item => String(item.id) === String(row.customerId))
   return customer?.legalName?.trim() || customer?.tenantName?.trim() || `客户 ${row.customerId}`
 }
-const selectedReturnStock = computed(() => returnStockRows.value.filter((item) => Number(item.availableQuantity || 0) > 0))
+const selectedReturnStock = computed(() => returnStockRows.value.filter((item) => Number(returnPickMode.value === 'SKU' ? item.looseAvailableQuantity || 0 : item.availableQuantity || 0) > 0))
 const selectedReturnCartons = computed(() => returnCartonRows.value.filter((item) => item.status === 'AVAILABLE'))
 const returnOrderOptions = computed(() => [...new Set([
   ...returnCandidates.value.flatMap(item => (item.returnNo || '').split(',')),
@@ -79,7 +79,7 @@ const filteredReturnCartons = computed(() => selectedReturnCartons.value.filter(
   if (selectedReturnNo.value && !(item.sourceReturnNo || returnCandidateByMark.value[item.cartonMark]?.returnNo || '').split(',').includes(selectedReturnNo.value)) return false
   if (returnPickMode.value === 'SKU') {
     const detail = returnCartonDetails.value[item.cartonMark]
-    if (!selectedReturnSkus.value.length || returnCandidateByMark.value[item.cartonMark]?.palletCode
+    if (!selectedReturnSkus.value.length || item.sourceUnitType !== 'PARCEL' || !returnCandidateByMark.value[item.cartonMark]
       || detail?.items?.length !== 1 || detail.items[0]?.skuCode !== selectedReturnSkus.value[0]) return false
   }
   const detailSkus = returnCartonDetails.value[item.cartonMark]?.items?.map((detail) => detail.skuCode).join(',') || ''
@@ -200,8 +200,15 @@ async function submit() {
       await bindWarehouseTransferDestination({ transfers: selected.map(item => ({ customerId: item.customerId, transferNo: item.transferNo })), destinationType: destinationType.value, destinationWarehouseId: destination?.value, destinationWarehouseCode: destination?.code, destinationWarehouseName: destination?.name, privateDestinationAddress: deliveryAddress.value.trim() || undefined, privateDestinationPostalCode: postalCode.value.trim() || undefined, privateDestinationContactName: contactName.value.trim() || undefined, privateDestinationContactPhone: contactPhone.value.trim() || undefined, idempotencyKey: `web-transfer-destination-${Date.now()}` })
       ElMessage.success(`已为 ${selected.length} 个转运单绑定目的地，可进入智能排车`)
     } else if (outboundType.value === 'RETURN_OUTBOUND') {
-      if (!recipient.value.trim() || !selectedReturnNo.value || !selectedReturnMarks.value.length) { ElMessage.warning('请填写收件信息并选择退货单和箱唛'); return }
+      if (!recipient.value.trim()) { ElMessage.warning('请填写收件信息'); return }
+      if (!selectedReturnNo.value) { ElMessage.warning('请选择退货单'); return }
       if (returnPickMode.value === 'SKU' && selectedReturnSkus.value.length !== 1) { ElMessage.warning('请选择一个 SKU'); return }
+      if (!selectedReturnMarks.value.length) {
+        ElMessage.warning(returnPickMode.value === 'SKU'
+          ? filteredReturnCartons.value.length ? '请在右侧选择该 SKU 的散件来源记录' : '该退货单没有此 SKU 可出库的散件库存；已装箱货物请切换箱／托出库'
+          : '请选择出库箱号或托盘')
+        return
+      }
       await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, skuCode: returnPickMode.value === 'SKU' ? selectedReturnSkus.value[0] : undefined, unitType: returnPickMode.value === 'SKU' ? 'BOX' : returnUnitType.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` })
       ElMessage.success('退货出库单和待派送单已创建，作业已推送 PDA')
     } else {
@@ -329,7 +336,7 @@ onMounted(load)
           <section class="return-list-card">
             <div class="list-title"><span>SKU库存</span><small>按 SKU 查询</small></div>
             <div class="candidate-query"><el-input v-model="returnSkuQueryInput" clearable placeholder="如：SKU001,SKU002" /><el-button type="primary" @click="searchReturnSkus">查询</el-button></div>
-            <el-table :data="pagedReturnStocks" border stripe class="return-result-table" max-height="400"><el-table-column v-if="returnPickMode === 'SKU'" label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnSkus.includes(row.skuCode)" @change="toggleReturnSku(row.skuCode, $event)" /></template></el-table-column><el-table-column prop="skuCode" label="SKU" min-width="150" show-overflow-tooltip /><el-table-column prop="productNameZh" label="品名" min-width="150" show-overflow-tooltip /><el-table-column prop="availableQuantity" label="可用数量" width="100" align="right" /></el-table>
+            <el-table :data="pagedReturnStocks" border stripe class="return-result-table" max-height="400"><el-table-column v-if="returnPickMode === 'SKU'" label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnSkus.includes(row.skuCode)" @change="toggleReturnSku(row.skuCode, $event)" /></template></el-table-column><el-table-column prop="skuCode" label="SKU" min-width="150" show-overflow-tooltip /><el-table-column prop="productNameZh" label="品名" min-width="150" show-overflow-tooltip /><el-table-column :label="returnPickMode === 'SKU' ? '散件可用数量' : '可用数量'" width="110" align="right"><template #default="{ row }">{{ returnPickMode === 'SKU' ? row.looseAvailableQuantity : row.availableQuantity }}</template></el-table-column></el-table>
             <div class="return-pagination"><span>{{ returnPickMode === 'SKU' ? `已选择 ${selectedReturnSkus.length} 个 SKU` : 'SKU 库存' }}</span><el-pagination v-model:current-page="returnSkuPage" v-model:page-size="returnSkuPageSize" :page-sizes="[5, 10, 20, 50]" :total="filteredReturnStocks.length" layout="total, sizes, prev, pager, next" @size-change="returnSkuPage = 1" /></div>
           </section>
           <section class="return-list-card">
diff --git a/src/modules/overseas-warehouse/relabelRework.test.ts b/src/modules/overseas-warehouse/relabelRework.test.ts
new file mode 100644
index 00000000..8ebbc132
--- /dev/null
+++ b/src/modules/overseas-warehouse/relabelRework.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { reworkRelabelApplications } from './relabelRework'
+
+describe('tail-order relabel rework candidates', () => {
+  it('uses each return relabel application instead of the aggregate completed status', () => {
+    const applications = [
+      { relabelNo: 'RL-1', status: 'CUSTOMER_CONFIRM_PENDING', quantity: 1, createdAt: '', statusLabel: '' },
+      { relabelNo: 'RL-2', status: 'COMPLETED', quantity: 1, createdAt: '', statusLabel: '' },
+      { relabelNo: 'RL-3', status: 'PROCESSING', quantity: 1, createdAt: '', statusLabel: '' },
+    ]
+    expect(reworkRelabelApplications({ relabelOrderNo: '', relabelApplications: applications, relabelStatusCode: 'COMPLETED' }).map(item => item.relabelNo)).toEqual(['RL-1', 'RL-3'])
+  })
+  it('preserves the existing single-application entry and excludes confirmed orders', () => {
+    expect(reworkRelabelApplications({ relabelOrderNo: 'RL-1', relabelStatusCode: 'CUSTOMER_CONFIRM_PENDING' })).toHaveLength(1)
+    expect(reworkRelabelApplications({ relabelOrderNo: 'RL-1', relabelStatusCode: 'READY_FOR_OUTBOUND' })).toEqual([])
+    expect(reworkRelabelApplications({ relabelOrderNo: '', relabelStatusCode: 'PROCESSING' })).toEqual([])
+  })
+})
diff --git a/src/modules/overseas-warehouse/relabelRework.ts b/src/modules/overseas-warehouse/relabelRework.ts
new file mode 100644
index 00000000..c9bf896c
--- /dev/null
+++ b/src/modules/overseas-warehouse/relabelRework.ts
@@ -0,0 +1,8 @@
+import type { LastMileOrderListItem } from './types'
+
+export function reworkRelabelApplications(row: Pick<LastMileOrderListItem, 'relabelApplications' | 'relabelOrderNo' | 'relabelStatusCode'>) {
+  const applications = row.relabelApplications?.length
+    ? row.relabelApplications
+    : row.relabelOrderNo ? [{ relabelNo: row.relabelOrderNo, status: row.relabelStatusCode }] : []
+  return applications.filter(application => ['CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(application.status))
+}

From 3df3f874dba57e9ce0d23fe3186ba53eafe92bea Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 17:36:32 +0800
Subject: [PATCH 07/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 output/appointment-gray-release/admin-pr.json |   1 +
 .../admin-release-commit.txt                  |   1 +
 .../appointment-gray-release/backend-pr.json  |   1 +
 .../backend-release-commit.txt                |   1 +
 .../gray-calendar.png                         | Bin 0 -> 107648 bytes
 .../http-postdeploy.json                      |  30 +++++++
 output/appointment-gray-release/jobs.json     |   1 +
 .../appointment-gray-release/preflight.json   |  12 ++-
 .../sql-postcheck.txt                         |   5 ++
 .../overseas-business/PROTOTYPE_MATRIX.md     |   2 +
 .../pages/OverseasBusinessViews.test.ts       |  26 ++++++
 .../pages/TransportOrderFormView.vue          |   6 +-
 .../pages/TransportOrdersView.vue             |  19 ++++-
 src/modules/overseas-master-data/AGENTS.md    |   2 +
 .../overseas-master-data/PROTOTYPE_MATRIX.md  |  16 ++++
 .../components/TransportRouteDialog.test.ts   |  67 +++++++++++++++
 .../components/TransportRouteDialog.vue       |  80 ++++++++++++++++++
 src/modules/overseas-master-data/index.ts     |   2 +
 .../routeLocations.test.ts                    |  42 +++++++++
 .../overseas-master-data/routeLocations.ts    |  45 ++++++++++
 src/modules/overseas-warehouse/AGENTS.md      |   2 +
 .../overseas-warehouse/PROTOTYPE_MATRIX.md    |   6 ++
 .../pages/DispatchesView.test.ts              |  53 +++++++++++-
 .../pages/DispatchesView.vue                  |  22 ++++-
 src/styles/adminDensity.test.ts               |   1 +
 25 files changed, 431 insertions(+), 12 deletions(-)
 create mode 100644 output/appointment-gray-release/admin-pr.json
 create mode 100644 output/appointment-gray-release/admin-release-commit.txt
 create mode 100644 output/appointment-gray-release/backend-pr.json
 create mode 100644 output/appointment-gray-release/backend-release-commit.txt
 create mode 100644 output/appointment-gray-release/gray-calendar.png
 create mode 100644 output/appointment-gray-release/http-postdeploy.json
 create mode 100644 output/appointment-gray-release/jobs.json
 create mode 100644 output/appointment-gray-release/sql-postcheck.txt
 create mode 100644 src/modules/overseas-master-data/components/TransportRouteDialog.test.ts
 create mode 100644 src/modules/overseas-master-data/components/TransportRouteDialog.vue
 create mode 100644 src/modules/overseas-master-data/routeLocations.test.ts
 create mode 100644 src/modules/overseas-master-data/routeLocations.ts

diff --git a/output/appointment-gray-release/admin-pr.json b/output/appointment-gray-release/admin-pr.json
new file mode 100644
index 00000000..92c49306
--- /dev/null
+++ b/output/appointment-gray-release/admin-pr.json
@@ -0,0 +1 @@
+{"repo": "html/admin-web", "number": 18, "url": "http://8.163.30.128:10082/html/admin-web/pulls/18", "head": "73c29f5264e46f648713c58b469a8c7bd335cd9c", "branch": "release/appointment-gray-20261009"}
\ No newline at end of file
diff --git a/output/appointment-gray-release/admin-release-commit.txt b/output/appointment-gray-release/admin-release-commit.txt
new file mode 100644
index 00000000..02920573
--- /dev/null
+++ b/output/appointment-gray-release/admin-release-commit.txt
@@ -0,0 +1 @@
+f9dd30b8b9c6b756c4502e4efc33df4ddb59e566
\ No newline at end of file
diff --git a/output/appointment-gray-release/backend-pr.json b/output/appointment-gray-release/backend-pr.json
new file mode 100644
index 00000000..18404ce1
--- /dev/null
+++ b/output/appointment-gray-release/backend-pr.json
@@ -0,0 +1 @@
+{"repo": "java-project/baiyue-firstleg", "number": 25, "url": "http://8.163.30.128:10082/java-project/baiyue-firstleg/pulls/25", "head": "7fd7699f6e83e77e487aceff914d160cf42376a0", "branch": "release/appointment-gray-20261009"}
\ No newline at end of file
diff --git a/output/appointment-gray-release/backend-release-commit.txt b/output/appointment-gray-release/backend-release-commit.txt
new file mode 100644
index 00000000..7c24582c
--- /dev/null
+++ b/output/appointment-gray-release/backend-release-commit.txt
@@ -0,0 +1 @@
+f60f44793f289f7612b561f1c470e093f67f4e32
\ No newline at end of file
diff --git a/output/appointment-gray-release/gray-calendar.png b/output/appointment-gray-release/gray-calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..63752c1809cd80c31bb4111e793678989cc66bbc
GIT binary patch
literal 107648
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
DB*z%D

literal 0
HcmV?d00001

diff --git a/output/appointment-gray-release/http-postdeploy.json b/output/appointment-gray-release/http-postdeploy.json
new file mode 100644
index 00000000..c9f4e022
--- /dev/null
+++ b/output/appointment-gray-release/http-postdeploy.json
@@ -0,0 +1,30 @@
+[
+  {
+    "name": "permissions",
+    "http": 200,
+    "code": "200",
+    "count": 358,
+    "elapsedMs": 115
+  },
+  {
+    "name": "arrivals",
+    "http": 200,
+    "code": "200",
+    "count": 10,
+    "elapsedMs": 297
+  },
+  {
+    "name": "appointments",
+    "http": 200,
+    "code": "200",
+    "count": 0,
+    "elapsedMs": 287
+  },
+  {
+    "name": "inboundCandidates",
+    "http": 200,
+    "code": "200",
+    "count": 10,
+    "elapsedMs": 221
+  }
+]
\ No newline at end of file
diff --git a/output/appointment-gray-release/jobs.json b/output/appointment-gray-release/jobs.json
new file mode 100644
index 00000000..d3dd7ef0
--- /dev/null
+++ b/output/appointment-gray-release/jobs.json
@@ -0,0 +1 @@
+[{"job": "baiyue-firstleg-prod-lastleg-service", "queue": "https://jenkins.buggoglobal.com/queue/item/7294/", "number": 13, "_class": "org.jenkinsci.plugins.workflow.job.WorkflowRun", "building": false, "result": "SUCCESS"}, {"job": "baiyue-firstleg-prod-firstleg", "queue": "https://jenkins.buggoglobal.com/queue/item/7295/", "number": 14, "_class": "org.jenkinsci.plugins.workflow.job.WorkflowRun", "building": false, "result": "SUCCESS"}, {"job": "admin-web-prod", "queue": "https://jenkins.buggoglobal.com/queue/item/7300/", "number": 26, "_class": "org.jenkinsci.plugins.workflow.job.WorkflowRun", "building": false, "result": "SUCCESS"}]
\ No newline at end of file
diff --git a/output/appointment-gray-release/preflight.json b/output/appointment-gray-release/preflight.json
index 84c1d023..7db61862 100644
--- a/output/appointment-gray-release/preflight.json
+++ b/output/appointment-gray-release/preflight.json
@@ -20,7 +20,13 @@
     "backendMergeTreeMatchesTestedSource": true,
     "adminMergeTreeMatchesTestedSource": true
   },
-  "sqlExecuted": false,
-  "deployed": false,
-  "pending": "explicit approval for two isolated remote release branches required by repository instructions; main rejects direct pushes"
+  "sqlExecuted": true,
+  "deployed": true,
+  "pending": null,
+  "releaseBranchesDeleted": [
+    "backend",
+    "admin"
+  ],
+  "browserVerified": true,
+  "grayWriteCrudRetested": false
 }
\ No newline at end of file
diff --git a/output/appointment-gray-release/sql-postcheck.txt b/output/appointment-gray-release/sql-postcheck.txt
new file mode 100644
index 00000000..08238f7c
--- /dev/null
+++ b/output/appointment-gray-release/sql-postcheck.txt
@@ -0,0 +1,5 @@
+ll_inbound_fba_appointment	13
+ll_inbound_fba_appointment_item	9
+platform:appointment:list
+platform:appointment:delete
+2
diff --git a/src/modules/overseas-business/PROTOTYPE_MATRIX.md b/src/modules/overseas-business/PROTOTYPE_MATRIX.md
index 72d42afc..65687119 100644
--- a/src/modules/overseas-business/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-business/PROTOTYPE_MATRIX.md
@@ -1,5 +1,7 @@
 # 海外业务原型核对矩阵
 
+本土散板列表、本土卡车新增/编辑共用`../overseas-master-data/index.ts`公开的`TransportRouteDialog`。字段来源、原型证据和缺值处理唯一见[运输路线地图](../overseas-master-data/PROTOTYPE_MATRIX.md#运输路线地图)。按已有起终点规划，不写订单、不使用固定演示、不采集GPS。
+
 ## 池来源本土订单承运安排
 
 依据：[内部拼车需求池首版开发契约](../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md) 第7节及本轮用户授权。
diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index c069cb03..38939f20 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -67,6 +67,32 @@ describe('overseas business mounted pages', () => {
   })
 
 
+  it.each(['查看路线'])('opens the shared route map from looseboard %s without requerying orders', async label => {
+    const wrapper = mountPage(TransportOrdersView, { domain: 'looseboard' })
+    await flushPromises()
+    expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('modelValue')).toBe(false)
+    const requests = vi.mocked(listLocalLooseboardOrders).mock.calls.length
+    await wrapper.findAll('button').find(button => button.text() === label)!.trigger('click')
+    await flushPromises()
+    expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('modelValue')).toBe(true)
+    expect(document.body.textContent).toContain('LA → ONT')
+    expect(listLocalLooseboardOrders).toHaveBeenCalledTimes(requests)
+  })
+
+  it.each([false, true])('opens truck route map on create/edit without saving (%s)', async editing => {
+    if (editing) { routing.route.params = { orderId: truck.id }; routing.route.query = { customerId: truck.customerId } }
+    const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' })
+    await flushPromises()
+    await wrapper.findAll('button').find(button => button.text() === '查看路线')!.trigger('click')
+    await flushPromises()
+    expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('modelValue')).toBe(true)
+    expect(createUsTruckOrder).not.toHaveBeenCalled()
+    expect(updateUsTruckOrder).not.toHaveBeenCalled()
+    const dialog = wrapper.findComponent({ name: 'TransportRouteDialog' })
+    expect(dialog.props('origin')).toEqual({ kind: 'address', label: editing ? 'Long Beach' : '', address: editing ? 'Long Beach Pier A' : '' })
+    expect(dialog.props('destinations')).toEqual([{ kind: 'address', label: editing ? 'Ontario' : '', address: editing ? 'Ontario Warehouse B' : '' }])
+  })
+
   it('opens the associated commercial order using a server-side order number filter', async () => {
     routing.route.query = { orderNo: 'LB-LINKED' }
     const wrapper = mount(TransportOrdersView, { props: { domain: 'looseboard' }, global: { plugins: [ElementPlus] } })
diff --git a/src/modules/overseas-business/pages/TransportOrderFormView.vue b/src/modules/overseas-business/pages/TransportOrderFormView.vue
index 482764f8..86f81f26 100644
--- a/src/modules/overseas-business/pages/TransportOrderFormView.vue
+++ b/src/modules/overseas-business/pages/TransportOrderFormView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { TransportRouteDialog, routeLocation } from '@/modules/overseas-master-data'
 import '../overseasBusinessDensity.css'
 import { computed, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -22,6 +23,7 @@ import type { FleetArrangement } from '../fleetArrangement'
 import type { CreateLocalLooseboardOrderRequest, CreateLocalTransportOrderRequest, LocalLooseboardStatus, LocalTransportStatus, LocalTransportType, LooseboardTransportMode, PalletRequired, UpdateLocalLooseboardOrderRequest, UpdateLocalTransportOrderRequest } from '../types'
 
 const props = defineProps<{ domain: 'truck' | 'looseboard' }>()
+const routeOpen = ref(false)
 const route = useRoute(); const router = useRouter(); const formRef = ref<FormInstance>()
 const orderId = computed(() => typeof route.params.orderId === 'string' ? route.params.orderId : '')
 const routeCustomerId = computed(() => typeof route.query.customerId === 'string' ? route.query.customerId : '')
@@ -124,8 +126,8 @@ watch([orderId, routeCustomerId, isLooseboard], () => { void load(); void loadCu
       <FormSection class="density-form-section" title="运输信息"><el-form-item label="运输类型" prop="transportType"><el-radio-group v-model="form.transportType"><el-radio-button v-for="item in transportTypes" :key="item.value" :value="item.value">{{ item.label }}</el-radio-button></el-radio-group></el-form-item><div class="form-grid two"><el-form-item label="起运地" prop="origin"><el-input v-model="form.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item><el-form-item label="目的地" prop="destination"><el-input v-model="form.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item><el-form-item label="详细地址"><el-input v-model="form.originAddress" maxlength="500" placeholder="街道 / 门牌" /></el-form-item><el-form-item label="详细地址 / 码头 / 仓号"><el-input v-model="form.destinationAddress" maxlength="500" placeholder="地址 / 码头 / 仓号" /></el-form-item><el-form-item label="联系人" prop="contactName"><el-input v-model="form.contactName" maxlength="128" placeholder="请输入联系人姓名" /></el-form-item><el-form-item label="联系方式" prop="contactInfo"><el-input v-model="form.contactInfo" maxlength="128" placeholder="请输入联系方式" /></el-form-item></div></FormSection>
       <FormSection class="density-form-section" title="📦 货物信息"><div class="form-grid" :class="isLooseboard ? 'four' : 'five'"><el-form-item label="柜型"><el-select v-model="form.containerType"><el-option v-for="item in CONTAINER_SPECIFICATIONS" :key="item.type" :label="item.type" :value="item.type" /></el-select></el-form-item><el-form-item v-if="!isLooseboard" label="托数" prop="palletCount"><el-input-number v-model="form.palletCount" :min="1" controls-position="right" placeholder="请输入托盘数" /></el-form-item><el-form-item label="件数" prop="packageCount"><el-input-number v-model="form.packageCount" :min="0" controls-position="right" placeholder="请输入件数" /></el-form-item><el-form-item label="总重量 (kg)" prop="totalWeightKg"><el-input v-model="form.totalWeightKg" inputmode="decimal" placeholder="请输入总重量" /></el-form-item><el-form-item label="总体积 (m³)" prop="totalVolumeCbm"><el-input v-model="form.totalVolumeCbm" inputmode="decimal" placeholder="请输入总体积" /></el-form-item></div></FormSection>
       <FormSection class="density-form-section" title="费用与时效"><div class="form-grid two"><el-form-item label="预算总价" prop="budgetAmount"><el-input v-model="form.budgetAmount" inputmode="decimal" placeholder="请输入预算金额" ><template #append>{{ form.currency }}</template></el-input></el-form-item><el-form-item label="要求时间" prop="requestedDate"><el-date-picker v-model="form.requestedDate" type="date" value-format="YYYY-MM-DD" clearable /></el-form-item><el-form-item v-if="editing" label="状态"><el-input :model-value="statusLabel" disabled /></el-form-item><el-form-item class="span-2" label="备注"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="请输入备注（选填）" /></el-form-item></div></FormSection>
-    </el-form><footer class="form-actions"><el-button @click="back">取消</el-button><el-button type="primary" :loading="saving" :disabled="!editableStatus" @click="save"><Save :size="16" />{{ editing ? '保存修改' : '提交订单' }}</el-button></footer></section>
-  </DetailPageLayout></AdminPage>
+    </el-form><FormSection v-if="!isLooseboard" class="density-form-section" title="车辆与派车"><el-button @click="routeOpen = true">查看路线</el-button></FormSection><footer class="form-actions"><el-button @click="back">取消</el-button><el-button type="primary" :loading="saving" :disabled="!editableStatus" @click="save"><Save :size="16" />{{ editing ? '保存修改' : '提交订单' }}</el-button></footer></section>
+  </DetailPageLayout><TransportRouteDialog v-model="routeOpen" :origin="routeLocation(form.origin, form.originAddress)" :destinations="[routeLocation(form.destination, form.destinationAddress)]" /></AdminPage>
 </template>
 
 <style scoped>
diff --git a/src/modules/overseas-business/pages/TransportOrdersView.vue b/src/modules/overseas-business/pages/TransportOrdersView.vue
index 71eed679..3f3d9c02 100644
--- a/src/modules/overseas-business/pages/TransportOrdersView.vue
+++ b/src/modules/overseas-business/pages/TransportOrdersView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
 import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Plus } from '@lucide/vue'
@@ -19,6 +20,13 @@ import { overseasBusinessPermissions } from '../permissions'
 import type { LocalLooseboardOrder, LocalLooseboardQuery, LocalLooseboardStatus, LocalTransportOrder, LocalTransportQuery, LocalTransportStatus, LocalTransportType, LooseboardTransportMode } from '../types'
 
 const props = defineProps<{ domain: 'truck' | 'looseboard' }>()
+const routeOpen = ref(false)
+const routeOrigin = ref<RouteLocation>(routeLocation('')), routeDestinations = ref<RouteLocation[]>([])
+function openRoute(row: LocalTransportOrder | LocalLooseboardOrder) {
+  routeOrigin.value = routeLocation(row.origin)
+  routeDestinations.value = [routeLocation(row.destination)]
+  routeOpen.value = true
+}
 const route = useRoute(); const router = useRouter(); const access = useAccessPreviewStore()
 const isLooseboard = computed(() => props.domain === 'looseboard'); const domainLabel = computed(() => isLooseboard.value ? '本土散板' : '本土卡车')
 const queryPreferenceKey = computed(() => isLooseboard.value ? 'overseas-business-looseboard-query' : 'overseas-business-truck-query')
@@ -59,7 +67,13 @@ const looseboardColumns: DataTableColumn[] = [
   { key: 'requestedDate', prop: 'requestedDate', label: '要求时间', width: 120 }, { key: 'status', label: '状态', width: 105, formatter: (row: LocalLooseboardOrder) => looseboardStatusLabels[row.status] },
   { key: 'createdAt', prop: 'createdAt', label: '创建时间', minWidth: 165, formatter: (row: LocalLooseboardOrder) => formatDateTime(row.createdAt) },
 ]
-const columns = computed(() => isLooseboard.value ? looseboardColumns : truckColumns)
+const columns = computed(() => {
+  if (!isLooseboard.value) return truckColumns
+  const visible = [...looseboardColumns]
+  visible.splice(visible.findIndex(column => column.key === 'status'), 0,
+    { key: 'routeMap', label: '路线地图', width: 120, slotName: 'routeMap' })
+  return visible
+})
 function formatDateTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 16) : '—' }
 async function load() {
   rows.value = []; total.value = 0; loadError.value = null; loading.value = true
@@ -93,8 +107,9 @@ watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route
       <template #toolbar-actions><el-button v-if="access.can(createPermission)" type="primary" @click="openCreate"><Plus :size="16" />新增订单</el-button></template>
       <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button v-if="row.fleetArrangement" class="density-action" @click="showArrangement(row as LocalTransportOrder | LocalLooseboardOrder)">承运安排</el-button><el-tooltip v-if="!row.fleetArrangement && access.can(editPermission)" :disabled="canEdit(row as LocalTransportOrder | LocalLooseboardOrder)" content="当前状态不可编辑"><span><el-button class="density-action" data-tone="neutral" size="small" :disabled="!canEdit(row as LocalTransportOrder | LocalLooseboardOrder)" @click="openEdit(row as LocalTransportOrder | LocalLooseboardOrder)">编辑</el-button></span></el-tooltip></div></template>
       <template #pagination-left>共 {{ total }} 条{{ domainLabel }}订单</template>
+      <template #routeMap="{ row }"><el-button v-if="row.orderNo" link type="primary" @click="openRoute(row as LocalLooseboardOrder)">查看路线</el-button></template>
     </DataTable></section>
-  </ListPageLayout><AppDialog v-model="arrangementOpen" class="admin-density-dialog" title="承运安排" width="1080px" :show-confirm="false" cancel-text="关闭"><FleetArrangementSummary v-if="arrangement" :arrangement="arrangement" /></AppDialog></AdminPage>
+  </ListPageLayout><AppDialog v-model="arrangementOpen" class="admin-density-dialog" title="承运安排" width="1080px" :show-confirm="false" cancel-text="关闭"><FleetArrangementSummary v-if="arrangement" :arrangement="arrangement" /></AppDialog><TransportRouteDialog v-model="routeOpen" :origin="routeOrigin" :destinations="routeDestinations" /></AdminPage>
 </template>
 
 <style scoped>.table-panel { overflow:hidden; }</style>
diff --git a/src/modules/overseas-master-data/AGENTS.md b/src/modules/overseas-master-data/AGENTS.md
index f61dd646..d9c3756a 100644
--- a/src/modules/overseas-master-data/AGENTS.md
+++ b/src/modules/overseas-master-data/AGENTS.md
@@ -1,5 +1,7 @@
 # 海外通用资料与车辆管理
 
+- 运输路线地图：`components/TransportRouteDialog.vue`经`index.ts`公开导出，排车装车后、本土散板列表、本土卡车表单共用；来源字段、缺值规则和原型映射唯一见`PROTOTYPE_MATRIX.md`“运输路线地图”。仓库引用经`routeLocations.ts`复用Warehouse列表/详情解析完整地址（warehouse:list）；解析失败不加载地图。仅规划路线，不接GPS、不用固定样例，不在车辆主档顶部重复放入口。
+
 - 内部拼车需求池：`pages/CapacityOffersView.vue`、`pages/CapacityOfferDetailView.vue`、`api/capacityOffers.ts`，车次详情显式打开 `components/CapacityOfferSettingsDialog.vue` 发布余位；独立 `capacity-offer:list/manage/inquiry-*` 权限，销售只操作本人意向。流程与交互唯一契约见 `../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md`，服务端沿 `fleet-capacity-offers-v1.yaml`；首版所有货到我仓上车，未确认意向不占位，列表不逐行请求详情。
 
 - 外接预订可选销售报价：`TripBookingPanel.vue`沿车次作用域`/bookings/quote-candidates`读取候选，不由浏览器推城市或有效日期；来源报价版本与实际成交价分别显示。引用要求quote:list，手填成交价不新增该权限门禁；改变客户/卸货站/币种/计价方式后清除不再匹配的引用，迟到候选不覆盖新表单。确认承运由后端复验版本和有效性，实收调价保留来源快照。
diff --git a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
index 303a7d2a..b1d504c3 100644
--- a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
@@ -1,5 +1,21 @@
 # 海外通用资料原型核对矩阵
 
+## 运输路线地图
+
+本轮最新要求：使用已有起点、目的地展示规划路线，后续另接GPS。唯一组件为`components/TransportRouteDialog.vue`，经`index.ts`公开导出；无固定样例、无定位采集、不产生业务记录。
+
+| 页面 | 操作 | 原型证据 | 当前承载与结论 |
+| --- | --- | --- | --- |
+| 排车列表 | 查看路线 | 用户提供`C:/Users/BY-OY/Desktop/新版.html:18627`，轨迹列在车辆状态前 | 装车后车辆信息分区增加路线地图列；起运仓按排车响应warehouseId查询详情；目的仓由服务端route字段拆分后精确查FBA仓码再读详情，多目的仓显式选择 |
+| 本土散板列表 | 查看路线 | 同原型27221、27248行 | 在状态前放路线地图列，使用本行origin/destination，FBA仓码先解析为仓库完整地址；当前没有装车/返程分栏，不新增状态、不提供伪造返程轨迹 |
+| 本土卡车新增/编辑 | 查看路线 | 同原型7373、7474行，车辆与派车分区 | 表单末尾车辆与派车区域打开，起终点分别组合地点与详细地址，FBA仓码改查主档地址，不要求先保存订单、不补造装箱日期字段 |
+
+统一1100px居中、58vh地图。`routeLocations.ts`区分明确地址与仓库引用，复用Warehouse的列表/详情接口（`platform:warehouse:list`），不变更服务端权限或API。仓码查询限定FBA并做精确匹配；仓库ID直读详情；只采用唯一运营地址（无运营地址时也必须唯一），必须有街道、城市、国家，再拼州、邮编等字段。缺失、不唯一、码与详情不符及接口错误均不发地图请求，不回退仓码或名称查询地图。弹框明确展示解析后的地址及错误诊断，重试重新查询。
+
+仅显式打开/选择目的仓时解析地址，同次打开缓存已查询地点；关闭/换记录丢弃缓存并忽略旧响应，加载时移除旧地图。内嵌与外部打开使用同一完整地址，列表不逐行请求主档。非仓码的用户填写地点文本保持订单语义，不新增地理编码或GPS服务。
+
+原型中的轨迹名称按最新用户要求改为路线，撤销车辆主档顶部临时演示入口。新增/编辑/审核/上传/删除行为不变。1920×1080、100%缩放视觉待人工截图确认；真实地图联网效果待人工确认。
+
 ## 内部拼车需求池首版
 
 依据：用户授权按现有车次样式整合；唯一范围为 [内部拼车需求池首版开发契约](../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md) 第7、9节，没有另引入外部原型。
diff --git a/src/modules/overseas-master-data/components/TransportRouteDialog.test.ts b/src/modules/overseas-master-data/components/TransportRouteDialog.test.ts
new file mode 100644
index 00000000..9a19274e
--- /dev/null
+++ b/src/modules/overseas-master-data/components/TransportRouteDialog.test.ts
@@ -0,0 +1,67 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import TransportRouteDialog from './TransportRouteDialog.vue'
+import { resolveRouteLocation, routeLocation, RouteAddressError, type RouteLocation } from '../routeLocations'
+vi.mock('../routeLocations', async importOriginal => ({ ...await importOriginal<object>(), resolveRouteLocation: vi.fn() }))
+const global = { stubs: {
+  AppDialog: { template: '<div><slot /></div>' }, ElButton: { template: '<button><slot /></button>' }, ElLink: { template: '<a><slot /></a>' },
+  LoadErrorState: { props: ['message'], template: '<p role="alert">{{ message }}</p>' }, ApiErrorMeta: true,
+  ElSelect: { props: ['modelValue'], emits: ['update:modelValue'], template: '<select :value="modelValue" @change="$emit(\'update:modelValue\', Number($event.target.value))"><slot /></select>' },
+  ElOption: { props: ['label', 'value'], template: '<option :value="value">{{ label }}</option>' },
+} }
+const endpoints = { origin: { kind: 'warehouse', label: '洛杉矶仓', warehouseId: '123' } as RouteLocation, destinations: [routeLocation('ABE3'), routeLocation('ONT8')] }
+const addresses: Record<string, string> = { '洛杉矶仓': '100 Example Street, Los Angeles, CA, US', ABE3: '200 Example Road, Example City, PA, 18000, US', ONT8: '300 Example Avenue, Ontario, CA, US' }
+beforeEach(() => { vi.mocked(resolveRouteLocation).mockReset().mockImplementation(async location => location.kind === 'address' ? location.address : addresses[location.label]!) })
+describe('transport route address resolution', () => {
+  it('does not query until opened and sends full addresses to both map URLs', async () => {
+    const wrapper = mount(TransportRouteDialog, { props: { ...endpoints, modelValue: false }, global })
+    expect(resolveRouteLocation).not.toHaveBeenCalled()
+    await wrapper.setProps({ modelValue: true }); await flushPromises()
+    const embedded = new URL(wrapper.get('iframe').attributes('src')!)
+    const external = new URL(wrapper.get('a').attributes('href')!)
+    expect(embedded.searchParams.get('saddr')).toBe(addresses['洛杉矶仓'])
+    expect(embedded.searchParams.get('daddr')).toBe(addresses.ABE3)
+    expect(external.searchParams.get('destination')).toBe(addresses.ABE3)
+    expect(wrapper.text()).toContain('目的地地址：' + addresses.ABE3)
+    expect(resolveRouteLocation).toHaveBeenCalledTimes(2)
+    const iframe = wrapper.get('iframe').element
+    await wrapper.get('button').trigger('click')
+    expect(wrapper.get('iframe').element).not.toBe(iframe)
+    expect(resolveRouteLocation).toHaveBeenCalledTimes(2)
+    await wrapper.setProps({ modelValue: false })
+    expect(wrapper.find('iframe').exists()).toBe(false)
+    wrapper.unmount()
+  })
+  it('resolves only the selected warehouse and reuses the origin for another destination', async () => {
+    const wrapper = mount(TransportRouteDialog, { props: { ...endpoints, modelValue: true }, global }); await flushPromises()
+    await wrapper.get('select').setValue('1'); await flushPromises()
+    expect(new URL(wrapper.get('iframe').attributes('src')!).searchParams.get('daddr')).toBe(addresses.ONT8)
+    expect(resolveRouteLocation).toHaveBeenCalledTimes(3)
+    wrapper.unmount()
+  })
+  it('never leaves the previous map visible while resolving a new destination, and ignores late results', async () => {
+    let finish!: (value: string) => void
+    vi.mocked(resolveRouteLocation).mockImplementation(location => location.label === 'ABE3' ? new Promise(resolve => { finish = resolve }) : Promise.resolve(addresses[location.label]!))
+    const wrapper = mount(TransportRouteDialog, { props: { ...endpoints, modelValue: true }, global })
+    expect(wrapper.find('iframe').exists()).toBe(false)
+    await wrapper.get('select').setValue('1'); await flushPromises()
+    finish('stale address'); await flushPromises()
+    expect(new URL(wrapper.get('iframe').attributes('src')!).searchParams.get('daddr')).toBe(addresses.ONT8)
+    await wrapper.setProps({ modelValue: false }); await flushPromises()
+    expect(wrapper.find('iframe').exists()).toBe(false)
+    wrapper.unmount()
+  })
+  it('shows missing address errors instead of falling back to a warehouse code', async () => {
+    vi.mocked(resolveRouteLocation).mockRejectedValue(new RouteAddressError('ABE3缺少完整仓库地址'))
+    const wrapper = mount(TransportRouteDialog, { props: { ...endpoints, modelValue: true }, global }); await flushPromises()
+    expect(wrapper.text()).toContain('ABE3缺少完整仓库地址')
+    expect(wrapper.find('iframe').exists()).toBe(false); expect(wrapper.find('a').exists()).toBe(false)
+    wrapper.unmount()
+  })
+  it('does not request missing endpoints', async () => {
+    const wrapper = mount(TransportRouteDialog, { props: { origin: routeLocation(''), destinations: [], modelValue: true }, global }); await flushPromises()
+    expect(resolveRouteLocation).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain('缺少起点或目的地')
+    wrapper.unmount()
+  })
+})
diff --git a/src/modules/overseas-master-data/components/TransportRouteDialog.vue b/src/modules/overseas-master-data/components/TransportRouteDialog.vue
new file mode 100644
index 00000000..ce68ba47
--- /dev/null
+++ b/src/modules/overseas-master-data/components/TransportRouteDialog.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { resolveRouteLocation, RouteAddressError, type RouteLocation } from '../routeLocations'
+
+const open = defineModel<boolean>({ default: false })
+const props = defineProps<{ origin: RouteLocation; destinations: RouteLocation[] }>()
+const mapRevision = ref(0)
+const destinationIndex = ref(0)
+const selected = computed(() => props.destinations[destinationIndex.value])
+const origin = ref(''), destination = ref(''), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+let generation = 0
+let cache = new Map<string, Promise<string>>()
+function resolve(location: RouteLocation) {
+  const key = JSON.stringify(location)
+  if (!cache.has(key)) cache.set(key, resolveRouteLocation(location))
+  return cache.get(key)!
+}
+async function load() {
+  const current = ++generation
+  origin.value = ''; destination.value = ''; error.value = null; loading.value = false
+  if (!open.value) return
+  const valid = (location?: RouteLocation) => location && !['', '—', '-', '仓库名称待补充'].includes(location.label.trim())
+  if (!valid(props.origin) || !valid(selected.value)) {
+    error.value = { message: '缺少起点或目的地，请先补充地点或详细地址' }; return
+  }
+  loading.value = true
+  try {
+    const [start, end] = await Promise.all([resolve(props.origin), resolve(selected.value!)])
+    if (current === generation && open.value) { origin.value = start; destination.value = end; mapRevision.value++ }
+  } catch (cause) {
+    if (current === generation) error.value = cause instanceof RouteAddressError ? { message: cause.message } : getApiErrorDetails(cause, '仓库地址查询失败，请确认具有仓库查看权限后重试')
+  } finally { if (current === generation) loading.value = false }
+}
+function retry() { cache = new Map(); void load() }
+watch([open, () => props.origin, () => props.destinations], () => {
+  destinationIndex.value = 0; cache = new Map(); void load()
+}, { immediate: true })
+watch(destinationIndex, load)
+onBeforeUnmount(() => { generation++ })
+const ready = computed(() => !loading.value && !error.value && Boolean(origin.value && destination.value))
+const mapUrl = computed(() => `https://maps.google.com/maps?${new URLSearchParams({ saddr: origin.value, daddr: destination.value, dirflg: 'd', output: 'embed' })}`)
+const externalUrl = computed(() => `https://www.google.com/maps/dir/?${new URLSearchParams({ api: '1', origin: origin.value, destination: destination.value, travelmode: 'driving' })}`)
+const tooLong = computed(() => mapUrl.value.length > 2048 || externalUrl.value.length > 2048)
+</script>
+
+<template>
+  <AppDialog v-model="open" class="admin-density-dialog" title="查看路线"
+    width="min(1100px, 96vw)" align-center :show-confirm="false" cancel-text="关闭">
+    <section v-if="open" class="route-map" aria-label="起点至目的地路线">
+      <strong>{{ props.origin.label || '起点未填写' }} → {{ selected?.label || '目的地未填写' }}</strong>
+      <el-select v-if="props.destinations.length > 1" v-model="destinationIndex" aria-label="选择目的仓">
+        <el-option v-for="(item, index) in props.destinations" :key="index" :label="item.label" :value="index" />
+      </el-select>
+      <p class="route-note">根据起点与目的地地址规划驾车路线，尚未接入 GPS，不显示车辆实时位置或实际行驶轨迹。</p>
+      <p v-if="loading" role="status">正在查询仓库详细地址…</p>
+      <LoadErrorState v-else-if="error" title="无法加载路线" :message="error.message" @retry="retry"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <p v-else-if="tooLong" role="status">地点信息过长，请核对起点和目的地地址后重试。</p>
+      <template v-else-if="ready"><div class="route-addresses"><div>起点地址：{{ origin }}</div><div>目的地地址：{{ destination }}</div></div>
+      <iframe :key="mapRevision" :src="mapUrl" :title="`${props.origin.label}至${selected?.label}路线地图`"
+        referrerpolicy="no-referrer" />
+      </template>
+      <div v-if="ready && !tooLong" class="route-help">
+        <span>地图需联网加载。如未显示，可重新加载或在新窗口打开。</span>
+        <el-button @click="mapRevision++">重新加载地图</el-button>
+        <el-link :href="externalUrl" target="_blank" rel="noopener noreferrer" type="primary">在新窗口打开地图</el-link>
+      </div>
+    </section>
+  </AppDialog>
+</template>
+
+<style scoped>
+.route-map { display: grid; gap: var(--admin-space-3); }
+.route-note { margin: 0; color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.route-map iframe { width: 100%; height: 58vh; min-height: 320px; border: 1px solid var(--cc-border); border-radius: var(--admin-radius); }
+.route-help { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); color: var(--cc-muted); }
+</style>
diff --git a/src/modules/overseas-master-data/index.ts b/src/modules/overseas-master-data/index.ts
index 2f9deabc..5e9055e0 100644
--- a/src/modules/overseas-master-data/index.ts
+++ b/src/modules/overseas-master-data/index.ts
@@ -1,3 +1,5 @@
 export { overseasMasterDataRoutes } from './routes'
 export { overseasMasterDataPermissions } from './permissions'
 export type * from './types'
+export { default as TransportRouteDialog } from './components/TransportRouteDialog.vue'
+export { routeLocation, type RouteLocation } from './routeLocations'
diff --git a/src/modules/overseas-master-data/routeLocations.test.ts b/src/modules/overseas-master-data/routeLocations.test.ts
new file mode 100644
index 00000000..2a058e44
--- /dev/null
+++ b/src/modules/overseas-master-data/routeLocations.test.ts
@@ -0,0 +1,42 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { getPlatformWarehouse, listAllPlatformWarehouses, type PlatformWarehouseDetailResource } from '@/modules/warehouses'
+import { resolveRouteLocation, routeLocation } from './routeLocations'
+vi.mock('@/modules/warehouses', () => ({ getPlatformWarehouse: vi.fn(), listAllPlatformWarehouses: vi.fn() }))
+const detail = {
+  warehouse: { id: '900', warehouseCode: 'ABE3', warehouseName: 'ABE3', warehouseType: 'FBA' },
+  addresses: [{ addressType: 'OPERATING', addressLine1: '200 Example Road', addressLine2: null, district: null, city: 'Example City', stateProvince: 'PA', postalCode: '18000', countryCode: 'US' }], capabilities: [],
+} as unknown as PlatformWarehouseDetailResource
+beforeEach(() => {
+  vi.mocked(listAllPlatformWarehouses).mockReset().mockResolvedValue([detail.warehouse])
+  vi.mocked(getPlatformWarehouse).mockReset().mockResolvedValue(detail)
+})
+describe('route warehouse address resolver', () => {
+  it('looks up ABE3 by exact FBA code then reads its detail, never sending the code as an address', async () => {
+    expect(await resolveRouteLocation(routeLocation('ABE3'))).toBe('200 Example Road, Example City, PA, 18000, US')
+    expect(listAllPlatformWarehouses).toHaveBeenCalledExactlyOnceWith({ keyword: 'ABE3', warehouseType: 'FBA' })
+    expect(getPlatformWarehouse).toHaveBeenCalledExactlyOnceWith('900')
+  })
+  it('uses the origin warehouse ID instead of searching its name', async () => {
+    await resolveRouteLocation({ kind: 'warehouse', label: '起运仓', warehouseId: '900' })
+    expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+  })
+  it('rejects partial code matches and duplicates', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([{ ...detail.warehouse, warehouseCode: 'ABE30' }])
+    await expect(resolveRouteLocation(routeLocation('ABE3'))).rejects.toThrow('未找到')
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([detail.warehouse, detail.warehouse])
+    await expect(resolveRouteLocation(routeLocation('ABE3'))).rejects.toThrow('多个仓库')
+    expect(getPlatformWarehouse).not.toHaveBeenCalled()
+  })
+  it('rejects missing street addresses, multiple operating addresses and detail/code mismatch', async () => {
+    vi.mocked(getPlatformWarehouse).mockResolvedValue({ ...detail, addresses: [{ ...detail.addresses[0]!, addressLine1: '' }] })
+    await expect(resolveRouteLocation(routeLocation('ABE3'))).rejects.toThrow('完整仓库地址')
+    vi.mocked(getPlatformWarehouse).mockResolvedValue({ ...detail, addresses: [detail.addresses[0]!, detail.addresses[0]!] })
+    await expect(resolveRouteLocation(routeLocation('ABE3'))).rejects.toThrow('不唯一')
+    vi.mocked(getPlatformWarehouse).mockResolvedValue({ ...detail, warehouse: { ...detail.warehouse, warehouseCode: 'ONT8' } })
+    await expect(resolveRouteLocation(routeLocation('ABE3'))).rejects.toThrow('不一致')
+  })
+  it('preserves explicit order addresses without a directory request', async () => {
+    expect(await resolveRouteLocation(routeLocation('Ontario', '100 Example Street'))).toBe('Ontario 100 Example Street')
+    expect(getPlatformWarehouse).not.toHaveBeenCalled(); expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/modules/overseas-master-data/routeLocations.ts b/src/modules/overseas-master-data/routeLocations.ts
new file mode 100644
index 00000000..acb4d52e
--- /dev/null
+++ b/src/modules/overseas-master-data/routeLocations.ts
@@ -0,0 +1,45 @@
+import { getPlatformWarehouse, listAllPlatformWarehouses, type PlatformWarehouseAddressResource } from '@/modules/warehouses'
+
+export type RouteLocation =
+  | { kind: 'address'; label: string; address: string }
+  | { kind: 'warehouse'; label: string; warehouseId?: string; warehouseCode?: string }
+
+export class RouteAddressError extends Error {}
+
+export function routeLocation(place: string, address?: string | null): RouteLocation {
+  const label = place.trim()
+  // FBA codes in free-text order fields also require authoritative address resolution.
+  if (/^[A-Z]{3}\d{1,2}$/i.test(label)) return { kind: 'warehouse', label, warehouseCode: label.toUpperCase() }
+  return { kind: 'address', label, address: [label, address?.trim()].filter(Boolean).join(' ') }
+}
+
+function formatAddress(address: PlatformWarehouseAddressResource | undefined, label: string) {
+  if (!address?.addressLine1?.trim() || !address.city?.trim() || !address.countryCode?.trim()) {
+    throw new RouteAddressError(`${label}缺少完整仓库地址，请在仓库资料中补充街道、城市和国家`)
+  }
+  return [address.addressLine1, address.addressLine2, address.district, address.city, address.stateProvince, address.postalCode, address.countryCode]
+    .map(value => value?.trim()).filter(Boolean).join(', ')
+}
+
+export async function resolveRouteLocation(location: RouteLocation): Promise<string> {
+  if (location.kind === 'address') return location.address.trim()
+  let warehouseId = location.warehouseId
+  if (!warehouseId) {
+    const keyword = location.warehouseCode?.trim() || location.label.trim()
+    if (!keyword || ['—', '-', '仓库名称待补充'].includes(keyword)) throw new RouteAddressError('缺少仓库标识，请核对仓库资料')
+    const warehouses = await listAllPlatformWarehouses({ keyword, ...(location.warehouseCode ? { warehouseType: 'FBA' as const } : {}) })
+    const matches = warehouses.filter(warehouse => location.warehouseCode
+      ? warehouse.warehouseCode.toUpperCase() === keyword.toUpperCase()
+      : warehouse.warehouseName === keyword)
+    if (matches.length !== 1) throw new RouteAddressError(matches.length ? `${location.label}匹配到多个仓库，请核对仓库资料` : `未找到${location.label}的仓库资料`)
+    warehouseId = String(matches[0]!.id)
+  }
+  const detail = await getPlatformWarehouse(warehouseId)
+  if (location.warehouseCode && (detail.warehouse.warehouseType !== 'FBA' || detail.warehouse.warehouseCode.toUpperCase() !== location.warehouseCode.toUpperCase())) {
+    throw new RouteAddressError(`${location.label}与查询到的仓库资料不一致，请重新查询`)
+  }
+  const operating = detail.addresses.filter(address => address.addressType === 'OPERATING')
+  const addresses = operating.length ? operating : detail.addresses
+  if (addresses.length !== 1) throw new RouteAddressError(`${location.label}的运营地址不唯一或尚未维护，请核对仓库资料`)
+  return formatAddress(addresses[0], location.label)
+}
diff --git a/src/modules/overseas-warehouse/AGENTS.md b/src/modules/overseas-warehouse/AGENTS.md
index d6fe2e4e..9ce3f5d0 100644
--- a/src/modules/overseas-warehouse/AGENTS.md
+++ b/src/modules/overseas-warehouse/AGENTS.md
@@ -1,5 +1,7 @@
 # Admin 海外仓模块指引
 
+- 排车装车后车辆信息分区的路线地图，通过`../overseas-master-data/index.ts`公开组件按起运仓ID和目的仓精确仓码查询完整地址后展示规划路线；多目的仓独立选择，不推配送顺序。原型及字段边界见`../overseas-master-data/PROTOTYPE_MATRIX.md`“运输路线地图”。
+
 ## 样式入口
 
 - 导航“海外仓”的 10 个菜单及关联详情/弹框采用公共密度样式，逐操作范围见 [海外仓样式核对记录](../../../../../docs/Admin海外仓样式核对记录.md)。不要扩展到客户服务、海外业务或未注册产品/箱号页面。
diff --git a/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md b/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
index a1d0e400..1f4ebeaf 100644
--- a/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
@@ -8,6 +8,12 @@
 | 尾程详情 | 查看关联单据 | 本轮用户截图2及已确认方案 | 保留独立详情、基本信息页签；增加紧凑关联单据区 | 待人工截图确认 |
 | 本土散板/卡车列表 | 来源商业单跳转 | 本轮已确认方案、现有承运安排入口 | 有列表权限才跳转既有列表，携带商业单号筛选；池来源保留1080px承运安排弹框 | 自动检查与人工确认分别报告 |
 
+| 页面 | 操作 | 依据 | 当前实现与结论 | 验收 |
+|---|---|---|---|---|
+| 排车列表 | 阶段切换与审核页签 | 本轮用户截图 Image #1 与“只有装车前”显示审核的明确要求 | 原先各阶段均显示审核页签；调整为仅装车前显示调度审核、理货员审核，其他阶段仅车辆信息，离开装车前自动回到车辆信息；沿用现有页签布局和车次详情跳转 | 阶段切换与审核跳转自动回归；1920×1080、100% 缩放待人工截图确认 |
+
+排车装车后车辆信息分区增加路线地图列，使用公开`TransportRouteDialog`。原型、字段来源和多目的仓选择见[运输路线地图](../overseas-master-data/PROTOTYPE_MATRIX.md#运输路线地图)。其他阶段不新增路线列，不逐行请求地图。
+
 ### F33 已有库存转运履约接入（2026-10-04）
 
 | 页面 | 操作 | 依据 | 承载方式与本轮结论 | 验收 |
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
index cfa8371a..d2ec2336 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
@@ -9,6 +9,10 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { cancelDispatch, getDispatchBolPdf, getDispatchExternalFreight, getDispatchFeeCoverage, listDispatches, removeDispatchItem, transferDispatchToDelivery, updateDispatch } from '../api/dispatches'
 import DeliveryFeeCoveragePanel from '../components/DeliveryFeeCoveragePanel.vue'
 import DispatchesView from './DispatchesView.vue'
+vi.mock('@/modules/warehouses', () => ({
+  listAllPlatformWarehouses: vi.fn(async (query: { keyword: string }) => [{ id: query.keyword, warehouseCode: query.keyword, warehouseType: 'FBA' }]),
+  getPlatformWarehouse: vi.fn(async (id: string) => ({ warehouse: { warehouseCode: id, warehouseType: id === '321' ? 'OVERSEAS' : 'FBA' }, addresses: [{ addressType: 'OPERATING', addressLine1: '100 Example Street', city: 'City', stateProvince: 'CA', countryCode: 'US' }], capabilities: [] })),
+}))
 
 const push = vi.hoisted(() => vi.fn())
 vi.mock('vue-router', () => ({ useRouter: () => ({ push }) }))
@@ -44,8 +48,8 @@ describe('DispatchesView', () => {
     vi.mocked(listDispatches).mockReset().mockResolvedValue({
       records: [{
         id: '190000000000000099', dispatchNo: 'PC-1', vehiclePlate: 'CA-100', driverName: '张师傅',
-        driverPhone: '555-0100', carrierName: 'Carrier A', orderNos: 'LM-1,LM-2', route: 'LAX -> ONT8',
-        overseasWarehouseName: '洛杉矶仓', departAt: '2026-08-20T09:00:00', fbaAppointmentNo: 'FBA-1',
+        driverPhone: '555-0100', carrierName: 'Carrier A', orderNos: 'LM-1,LM-2', route: 'ONT8,LAX9',
+        overseasWarehouseId: '321', overseasWarehouseName: '洛杉矶仓', departAt: '2026-08-20T09:00:00', fbaAppointmentNo: 'FBA-1',
         fbaAppointmentStatus: 'CONFIRMED', vehicleAppointmentStatus: 'BOOKED', estimatedArrivalAt: '2026-08-20T18:00:00',
         status: 'PENDING_DEPARTURE', palletCount: 12, packageCount: 80, createdAt: '2026-08-19T16:00:00',
       }],
@@ -78,6 +82,25 @@ describe('DispatchesView', () => {
     expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ stage: 'AFTER_LOADING', page: 1 }))
   })
 
+  it('shows the shared route map only in the after-loading vehicle section without another query', async () => {
+    const wrapper = mount(DispatchesView, { attachTo: document.body, global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.text()).not.toContain('查看路线')
+    await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[3]!.trigger('click')
+    await flushPromises()
+    const requests = vi.mocked(listDispatches).mock.calls.length
+    await wrapper.findAll('button').find(button => button.text() === '查看路线')!.trigger('click')
+    await flushPromises()
+    expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('modelValue')).toBe(true)
+    expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('origin')).toEqual({ kind: 'warehouse', label: '洛杉矶仓', warehouseId: '321' })
+    expect(wrapper.findComponent({ name: 'TransportRouteDialog' }).props('destinations')).toEqual(['ONT8', 'LAX9'].map(code => ({ kind: 'warehouse', label: code, warehouseCode: code })))
+    expect(listDispatches).toHaveBeenCalledTimes(requests)
+    await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[1]!.trigger('click')
+    await flushPromises()
+    await wrapper.get('[aria-label="排车业务分区"]').findAll('button')[1]!.trigger('click')
+    expect(wrapper.findAll('button').some(button => button.text() === '查看路线')).toBe(false)
+  })
+
   it('shows review facts and opens the matching trip section with read permission', async () => {
     const result = await listDispatches({ page: 1, size: 10 })
     result.records[0]!.workflow = { tripNo: 'TR-A', dispatchReview: { status: 'REJECTED', reason: '请核对货量', reviewedAt: null }, loadingReview: { status: 'PENDING', reason: null, reviewedAt: null } }
@@ -86,6 +109,9 @@ describe('DispatchesView', () => {
     const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
     const sections = wrapper.get('[aria-label="排车业务分区"]')
+    expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息'])
+    await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[1]!.trigger('click')
+    await flushPromises()
     expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息', '调度审核', '理货员审核'])
     expect(wrapper.findAll('[role="tablist"]')).toHaveLength(2)
     expect(wrapper.text()).not.toContain('请核对货量')
@@ -103,7 +129,28 @@ describe('DispatchesView', () => {
     await links[0]!.trigger('click')
     expect(push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-A' }, query: { tab: 'loading' } })
     expect(wrapper.text()).not.toContain('前往审核')
-    expect(listDispatches).toHaveBeenCalledTimes(1)
+    expect(listDispatches).toHaveBeenCalledTimes(2)
+  })
+
+  it.each([0, 2, 3, 4].flatMap(stageIndex => [1, 2].map(sectionIndex => [stageIndex, sectionIndex])))('leaving a review section for stage %s resets section %s to vehicle information', async (stageIndex, sectionIndex) => {
+    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    const stages = wrapper.get('[aria-label="排车执行阶段"]').findAll('button')
+    const sections = wrapper.get('[aria-label="排车业务分区"]')
+    await stages[1]!.trigger('click')
+    await flushPromises()
+    await sections.findAll('button')[sectionIndex]!.trigger('click')
+    expect(wrapper.findAll('button').some(button => button.text() === '打印BOL')).toBe(false)
+    await stages[stageIndex]!.trigger('click')
+    await flushPromises()
+    expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息'])
+    expect(sections.get('button').attributes('aria-selected')).toBe('true')
+    expect(wrapper.findAll('button').some(button => button.text() === '打印BOL')).toBe(true)
+    expect(wrapper.findAll('button').some(button => ['前往审核', '查看审核'].includes(button.text()))).toBe(false)
+    await stages[1]!.trigger('click')
+    await flushPromises()
+    expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息', '调度审核', '理货员审核'])
+    expect(sections.get('button').attributes('aria-selected')).toBe('true')
   })
 
   it.each([
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.vue b/src/modules/overseas-warehouse/pages/DispatchesView.vue
index f9c57702..f62a8941 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
 import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
@@ -24,6 +25,14 @@ import { overseasWarehousePermissions as permission } from '../permissions'
 import { dispatchVehicleSizeOptions } from '../dispatchVehicleSpecs'
 
 const router = useRouter()
+const routeOpen = ref(false)
+const routeOrigin = ref<RouteLocation>(routeLocation('')), routeDestinations = ref<RouteLocation[]>([])
+function openRoute(row: DispatchListItem) {
+  routeOrigin.value = { kind: 'warehouse', label: row.overseasWarehouse, warehouseId: dispatchSnapshots.get(row.dispatchNo)?.overseasWarehouseId || undefined }
+  // The service's route field is a comma-separated set of destination warehouse codes, not a stop sequence.
+  routeDestinations.value = [...new Set(row.route.split(',').map(code => code.trim()).filter(Boolean))].map(code => ({ kind: 'warehouse', label: code, warehouseCode: code }))
+  routeOpen.value = true
+}
 const access = useAccessPreviewStore()
 const rows = ref<DispatchListItem[]>([])
 const loading = ref(false)
@@ -43,11 +52,13 @@ const sections = [
   { value: 'dispatchReview', label: '调度审核' },
   { value: 'loadingReview', label: '理货员审核' },
 ] as const
+const visibleSections = computed(() => stage.value === 'BEFORE_LOADING' ? sections : sections.filter(item => item.value === 'vehicle'))
 const reviewLabels = { PENDING: '待审核', APPROVED: '已通过', REJECTED: '已打回' }
 let loadSequence = 0
 function switchStage(value: typeof stage.value) {
   if (stage.value === value) return
   stage.value = value
+  if (value !== 'BEFORE_LOADING') section.value = 'vehicle'
   filters.value.status = ''
   page.value = 1
   void load()
@@ -257,7 +268,12 @@ const columns: DataTableColumn[] = [
 ]
 
 const visibleColumns = computed(() => {
-  if (section.value === 'vehicle') return columns.filter(column => !['dispatchReview', 'loadingReview'].includes(String(column.key)))
+  if (section.value === 'vehicle') {
+    const visible = columns.filter(column => !['dispatchReview', 'loadingReview'].includes(String(column.key)))
+    if (stage.value === 'AFTER_LOADING') visible.splice(visible.findIndex(column => column.key === 'status'), 0,
+      { key: 'routeMap', label: '路线地图', width: 120, slotName: 'routeMap' })
+    return visible
+  }
   const keys = ['actions', 'dispatchNo', 'workflow', section.value, 'vehiclePlate', 'driverName', 'route', 'palletCount', 'packageCount', 'status']
   return keys.map(key => columns.find(column => column.key === key)!)
 })
@@ -644,7 +660,7 @@ onMounted(load)
           <button v-for="item in stages" :key="item.value" role="tab" :aria-selected="stage === item.value" :class="{ 'is-active': stage === item.value }" @click="switchStage(item.value)">{{ item.label }}</button>
         </div>
         <div class="density-status-tabs" role="tablist" aria-label="排车业务分区">
-          <button v-for="item in sections" :key="item.value" role="tab" :aria-selected="section === item.value" :class="{ 'is-active': section === item.value }" @click="section = item.value">{{ item.label }}</button>
+          <button v-for="item in visibleSections" :key="item.value" role="tab" :aria-selected="section === item.value" :class="{ 'is-active': section === item.value }" @click="section = item.value">{{ item.label }}</button>
         </div>
         <QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="排车列表筛选" preference-key="overseas-dispatches-query" :search-on-reset="false" @search="search" @reset="reset" /></div></template>
       <template v-if="loadError" #state><LoadErrorState title="排车列表加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
@@ -662,8 +678,10 @@ onMounted(load)
         <span v-else>未关联车次</span>
       </template>
       <template #status="{ row }"><StatusBadge :status="String((row as DispatchListItem).status || '—')" /></template>
+      <template #routeMap="{ row }"><el-button v-if="row.dispatchNo" link type="primary" @click="openRoute(row as DispatchListItem)">查看路线</el-button></template>
       <template #pagination-left>共 {{ total }} 条排车记录</template>
     </DataTable>
+    <TransportRouteDialog v-model="routeOpen" :origin="routeOrigin" :destinations="routeDestinations" />
   </ListPageLayout></AdminPage><AppDialog class="admin-density-dialog" v-model="transferOpen" title="转派送" width="min(1120px, calc(100vw - 28px))" confirm-text="确认提交" :confirm-loading="transferSaving" :confirm-disabled="freightLoading || !externalFreight" @confirm="submitTransfer"><el-form class="density-form" label-position="top"><h3>派送信息</h3><div class="transfer-grid"><el-form-item label="排车单号"><el-input :model-value="transferRow?.dispatchNo" readonly /></el-form-item><el-form-item label="预计派送时间" required><el-date-picker v-model="transferForm.plannedDeliveryAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计派送时间" /></el-form-item><el-form-item label="派送方式" required><el-select v-model="transferForm.deliveryMethod" placeholder="请选择"><el-option v-for="option in deliveryMethodOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="快递/车队"><el-input v-model="transferForm.carrierName" placeholder="请输入快递或车队名称" /></el-form-item><el-form-item label="运单号"><el-input v-model="transferForm.waybillNo" placeholder="请输入运单号" /></el-form-item><el-form-item label="提货方式" required><el-select v-model="transferForm.pickupMethod" placeholder="请选择"><el-option v-for="option in pickupMethodOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="装车类型" required><el-select v-model="transferForm.loadingType" placeholder="请选择"><el-option v-for="option in loadingTypeOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="司机/车队名称"><el-input v-model="transferForm.driverName" placeholder="请输入司机或车队名称" /></el-form-item><el-form-item label="联系电话"><el-input v-model="transferForm.driverPhone" placeholder="请输入联系电话" /></el-form-item><el-form-item label="车牌号"><el-input v-model="transferForm.vehiclePlate" placeholder="请输入车牌号" /></el-form-item><el-form-item label="车辆类型"><el-select v-model="transferForm.vehicleType" clearable placeholder="请选择"><el-option v-for="option in vehicleTypeOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="车辆大小"><el-select v-model="transferForm.vehicleSize" clearable placeholder="请选择"><el-option v-for="option in vehicleSizeOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="预约账号"><el-select v-model="transferForm.appointmentAccount" clearable placeholder="请选择"><el-option v-for="option in appointmentAccountOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item v-if="isBuyAppointment" label="卖家姓名" required><el-input v-model="transferForm.sellerName" placeholder="请输入卖家姓名" /></el-form-item></div><DeliveryFeeCoveragePanel v-model="coverageSelection" :preview="coveragePreview" :loading="freightLoading" :disabled="transferSaving || freightLoading" /><p v-if="coveredServices.length">本次全部货物已覆盖：{{ coveredServices.map(service => coveredServiceLabels[service]).join('、') }}，无需重复登记对应应收。</p><h3>本次新增费用</h3><p v-if="freightLoading">正在读取约定运费…</p><p v-for="quote in externalFreight?.quotes || []" :key="quote.bookingNo">{{ quote.bookingNo }} · {{ quote.incomingNo }}：{{ quote.quantity }} {{ quote.quantityUnit }} × {{ quote.currency }} {{ quote.unitPrice }} = {{ quote.currency }} {{ quote.amount }}（外接约定运费）</p><div class="transfer-grid"><el-form-item v-if="requiresDeliveryFee" :label="externalFreight?.quotes.length || coverageSelection.length ? '派送费（未覆盖部分，USD）' : '派送费用（USD）'" required><el-input-number v-model="transferForm.deliveryFee" :min="0" :precision="2" controls-position="right" placeholder="请输入派送费用" /></el-form-item><el-form-item v-if="requiresLoadingFee" label="装车费（USD）" required><el-input-number v-model="transferForm.loadingFee" :min="0" :precision="2" controls-position="right" placeholder="请输入装车费" /></el-form-item><el-form-item v-if="requiresAppointmentFee" label="买约费用（USD）" required><el-input-number v-model="transferForm.appointmentFee" :min="0" :precision="2" controls-position="right" placeholder="请输入买约费用" /></el-form-item></div><el-form-item label="备注"><el-input v-model="transferForm.remark" type="textarea" :rows="3" placeholder="请输入派送备注（选填）" /></el-form-item><el-alert title="原运费仅按上方确认的服务范围引用；外接运费按实收约定带入。下方只登记未覆盖货物或服务的新增应收。" type="info" :closable="false" /></el-form></AppDialog>
   <AppDialog class="admin-density-dialog" v-model="editOpen" title="编辑排车" width="min(900px, calc(100vw - 48px))" confirm-text="保存" :confirm-loading="editSaving" @confirm="submitEdit"><el-alert :title="`当前状态：${editRow?.status || '—'}；普通编辑不会修改排车状态；未生成出库单前可移除托盘。`" type="info" :closable="false" /><el-form class="density-form" label-position="top"><div class="edit-grid"><el-form-item label="车牌号"><el-input v-model="editForm.vehiclePlate" placeholder="请输入车牌号" /></el-form-item><el-form-item label="司机"><el-input v-model="editForm.driverName" placeholder="请输入司机姓名" /></el-form-item><el-form-item label="联系电话"><el-input v-model="editForm.driverPhone" placeholder="请输入联系电话" /></el-form-item><el-form-item label="拖车公司名称"><el-input v-model="editForm.carrierName" placeholder="请输入拖车公司名称" /></el-form-item><el-form-item label="路线"><el-input v-model="editForm.route" readonly placeholder="按已排托盘自动汇总 FBA 仓" /></el-form-item><el-form-item label="发车时间"><el-date-picker v-model="editForm.departAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="预计到达时间"><el-date-picker v-model="editForm.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="FBA预约号"><el-input v-model="editForm.fbaAppointmentNo" placeholder="请输入 FBA 预约号" /></el-form-item><el-form-item label="FBA预约状态"><el-select v-model="editForm.fbaAppointmentStatus" clearable><el-option label="待预约" value="PENDING" /><el-option label="已预约" value="BOOKED" /><el-option label="已确认" value="CONFIRMED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item><el-form-item label="车辆预约状态"><el-select v-model="editForm.vehicleAppointmentStatus" clearable><el-option label="待预约" value="PENDING" /><el-option label="已预约" value="BOOKED" /><el-option label="已确认" value="CONFIRMED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item></div></el-form><h3>已排车托盘</h3><el-table :data="editItems" border max-height="280" empty-text="暂无托盘"><el-table-column label="操作" width="90" fixed="left"><template #default="{ row }"><el-button class="density-action" data-tone="danger" :loading="removingItemId === String(row.id)" :disabled="Boolean(removingItemId)" @click="removePallet(row)">移除</el-button></template></el-table-column><el-table-column prop="palletNo" label="托盘号" min-width="160" /><el-table-column prop="orderNo" label="订单号" min-width="160" /><el-table-column prop="inboundCode" label="入仓码" min-width="140" /><el-table-column prop="packageCount" label="箱数" width="80" align="right" /></el-table></AppDialog>
 </template>
diff --git a/src/styles/adminDensity.test.ts b/src/styles/adminDensity.test.ts
index 6f1fca0b..5a6ed6bb 100644
--- a/src/styles/adminDensity.test.ts
+++ b/src/styles/adminDensity.test.ts
@@ -62,6 +62,7 @@ const generalCatalogConsumers = [
   'overseas-master-data/pages/OverseasQuotesView.vue',
   'overseas-master-data/pages/VehiclesView.vue',
   'overseas-master-data/pages/VehicleDetailView.vue',
+  'overseas-master-data/components/TransportRouteDialog.vue',
   'overseas-master-data/pages/DriversView.vue',
   'overseas-master-data/pages/TripsView.vue',
   'overseas-master-data/pages/CapacityOffersView.vue',

From ebaa265993da89b85141021ce8a9b7b0e710eef8 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 9 Oct 2026 18:03:34 +0800
Subject: [PATCH 08/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overseas-warehouse/api/relabelOrders.ts   |  2 +-
 .../pages/LastMileOrdersView.behavior.test.ts |  8 +--
 .../pages/LastMileOrdersView.vue              | 39 +++++---------
 .../pages/RelabelOrdersView.test.ts           |  9 ++--
 .../pages/RelabelOrdersView.vue               | 52 +++----------------
 .../ReturnInventoryManagementView.test.ts     | 12 +++++
 .../pages/ReturnInventoryManagementView.vue   | 20 +++++--
 7 files changed, 56 insertions(+), 86 deletions(-)

diff --git a/src/modules/overseas-warehouse/api/relabelOrders.ts b/src/modules/overseas-warehouse/api/relabelOrders.ts
index 0b7b24ab..a93e0cf0 100644
--- a/src/modules/overseas-warehouse/api/relabelOrders.ts
+++ b/src/modules/overseas-warehouse/api/relabelOrders.ts
@@ -137,7 +137,7 @@ export interface ReturnPackingPlanBox {
 
 export interface ReturnPackingPlanPayload {
   returnNos: string[]
-  mode: 'BOX' | 'SKU' | 'CUSTOMER_INSTRUCTION' | 'WAREHOUSE_RECOMMENDATION'
+  mode: 'BOX' | 'SKU'
   boxes: ReturnPackingPlanBox[]
   remark?: string
   idempotencyKey: string
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
index 94db1bc1..2cd7ef0d 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
@@ -30,7 +30,8 @@ import LastMileOrdersView from './LastMileOrdersView.vue'
 const canAccess = vi.hoisted(() => vi.fn<(permissionCode: string) => boolean>(() => true))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canAccess }) }))
 vi.mock('@/shared/downloadCsv', () => ({ saveCsv: vi.fn() }))
-vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+const routerPush = vi.hoisted(() => vi.fn())
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: routerPush }) }))
 vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
 vi.mock('../api/lastMileOrders', () => ({
   listLastMileOrders: vi.fn(), listContainerPlanProgress: vi.fn(), getContainerPlanProgress: vi.fn(),
@@ -1179,13 +1180,12 @@ describe('LastMileOrdersView pending order and container conversion', () => {
 
   it('keeps the return packing entry and excludes return orders from manual inbound generation', async () => {
     const wrapper = await mountView()
-    await selectRows(wrapper, [selectedRow({ orderTypeCode: 'RETURN_RELABEL', currentStatusCode: 'IN_WAREHOUSE', sourceOrderNo: 'RETURN-1' })])
+    await selectRows(wrapper, [selectedRow({ orderTypeCode: 'RETURN_RELABEL', currentStatusCode: 'INBOUND_COMPLETED', sourceOrderNo: 'RETURN-1' })])
     const actions = wrapper.get('.data-table__business-actions')
     expect(actions.text()).not.toContain('生成入库计划')
     const packing = actions.findAll('button').find(action => action.text().includes('创建退货合箱计划（1）'))!
     await packing.trigger('click')
     await flushPromises()
-    const dialog = wrapper.findAllComponents(AppDialog).find(candidate => candidate.props('title') === '退货合箱计划')!
-    expect(dialog.props('modelValue')).toBe(true)
+    expect(routerPush).toHaveBeenCalledWith({ name: 'overseas-return-inventory', query: expect.objectContaining({ packing: '1', returnNos: 'RETURN-1' }) })
   })
 })
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
index 0f1231e6..f73473c0 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
@@ -21,7 +21,7 @@ import { businessOrderLink } from '../businessOrderLink'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { reviewCargoDiscard } from '../api/lastMileOrders'
 import WarehouseTransferReviewDialog from '../components/WarehouseTransferReviewDialog.vue'
-import { confirmRelabelCompletion, createReturnPackingPlan, getRelabelReviewTask, returnRelabelForRework, type ReturnPackingPlanBox } from '../api/relabelOrders'
+import { confirmRelabelCompletion, getRelabelReviewTask, returnRelabelForRework } from '../api/relabelOrders'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { lastMileStatusLabel, packageDifferenceText, toLastMileOrderListItem } from '../lastMilePresentation'
@@ -49,34 +49,20 @@ const containerDetail = ref<ContainerPlanProgressDetailDto | null>(null)
 const transferReviewOpen = ref(false)
 const transferReviewTarget = ref<LastMileOrderListItem | null>(null)
 const selectedRows = ref<LastMileOrderListItem[]>([])
-const packingPlanOpen = ref(false)
-const packingPlanLoading = ref(false)
-const packingPlanMode = ref<'CUSTOMER_INSTRUCTION' | 'WAREHOUSE_RECOMMENDATION'>('CUSTOMER_INSTRUCTION')
-const packingPlanRemark = ref('')
-const packingPlanBoxes = ref<ReturnPackingPlanBox[]>([])
-const selectedReturnRows = computed(() => selectedRows.value.filter((row) => row.orderTypeCode === 'RETURN_RELABEL' && ['COMPLETED', 'RECEIVED', 'IN_WAREHOUSE', '已完成入库'].includes(String(row.currentStatusCode || row.status || ''))))
+const selectedReturnRows = computed(() => selectedRows.value.filter((row) => row.orderTypeCode === 'RETURN_RELABEL' && ['INBOUND_COMPLETED', 'COMPLETED', 'RECEIVED', 'IN_WAREHOUSE', '已完成入库'].includes(String(row.currentStatusCode || row.status || ''))))
 function openReturnPackingPlan() {
-  if (!selectedReturnRows.value.length) { ElMessage.warning('请勾选已入库的退货订单'); return }
-  packingPlanMode.value = 'CUSTOMER_INSTRUCTION'; packingPlanRemark.value = ''
-  packingPlanBoxes.value = [{ boxNo: 1, items: [{ skuCode: '', quantity: 0 }] }]
-  packingPlanOpen.value = true
+  const selected = selectedReturnRows.value
+  if (!selected.length) { ElMessage.warning('请勾选已入库的退货订单'); return }
+  if (new Set(selected.map(row => row.customerId)).size !== 1 || new Set(selected.map(row => row.overseasWarehouseId)).size !== 1) {
+    ElMessage.warning('合箱请选择同一客户、同一海外仓的退货订单'); return
+  }
+  void router.push({ name: 'overseas-return-inventory', query: {
+    packing: '1', customerId: selected[0]!.customerId, overseasWarehouseId: selected[0]!.overseasWarehouseId,
+    returnNos: selected.map(row => row.sourceOrderNo || row.orderNo).join(','),
+  } })
 }
-function addReturnPackingBox() { packingPlanBoxes.value.push({ boxNo: packingPlanBoxes.value.length + 1, items: [{ skuCode: '', quantity: 0 }] }) }
-function removeReturnPackingBox(index: number) { if (packingPlanBoxes.value.length > 1) packingPlanBoxes.value.splice(index, 1) }
-function addReturnPackingItem(box: ReturnPackingPlanBox) { box.items.push({ skuCode: '', quantity: 0 }) }
-function removeReturnPackingItem(box: ReturnPackingPlanBox, index: number) { if (box.items.length > 1) box.items.splice(index, 1) }
-async function submitReturnPackingPlan() {
-  const boxes = packingPlanBoxes.value.map((box) => ({ ...box, items: box.items.filter((item) => item.skuCode.trim() && Number(item.quantity) > 0) })).filter((box) => box.items.length)
-  if (!boxes.length) { ElMessage.warning('至少配置一个目标箱'); return }
-  packingPlanLoading.value = true
-  try {
-    const result = await createReturnPackingPlan({ returnNos: selectedReturnRows.value.map((row) => String(row.sourceOrderNo || row.orderNo)).filter(Boolean), mode: packingPlanMode.value, boxes, remark: packingPlanRemark.value.trim() || undefined, idempotencyKey: globalThis.crypto?.randomUUID?.() || `return-packing-${Date.now()}` })
-    ElMessage.success(`合箱计划 ${result.planNo} 已推送 PDA`); packingPlanOpen.value = false; selectedRows.value = []
-  } catch (error) { ElMessage.error(getApiErrorDetails(error, '合箱计划推送失败，请重试').message) }
-  finally { packingPlanLoading.value = false }
-}
-const actionLoading = ref(false)
 const exportLoading = ref(false)
+const actionLoading = ref(false)
 async function exportOrders() { exportLoading.value = true; try { await submitExport('LAST_MILE_ORDER_LIST', '尾程订单', orderQuery()) } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '尾程订单导出失败，请重试').message) } finally { exportLoading.value = false } }
 const actionError = ref<ApiErrorDetails | null>(null)
 const actionTarget = ref<LastMileOrderListItem | null>(null)
@@ -1132,7 +1118,6 @@ onMounted(() => { void load() })
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable>
   </ListPageLayout></AdminPage>
-  <AppDialog class="admin-density-dialog" v-model="packingPlanOpen" title="退货合箱计划" width="min(980px, calc(100vw - 28px))" confirm-text="推送 PDA" :confirm-loading="packingPlanLoading" @confirm="submitReturnPackingPlan"><el-radio-group v-model="packingPlanMode"><el-radio-button label="CUSTOMER_INSTRUCTION">客户合箱指令</el-radio-button><el-radio-button label="WAREHOUSE_RECOMMENDATION">仓库自主合箱</el-radio-button></el-radio-group><div v-for="(box, index) in packingPlanBoxes" :key="index" class="packing-box"><div class="packing-box-head"><strong>第 {{ index + 1 }} 箱</strong><el-button text type="danger" @click="removeReturnPackingBox(index)">删除箱</el-button></div><div v-for="(item, itemIndex) in box.items" :key="itemIndex" class="packing-item"><el-input v-model="item.skuCode" placeholder="SKU" /><el-input-number v-model="item.quantity" :min="0" :precision="0" placeholder="数量" /><el-button text type="danger" @click="removeReturnPackingItem(box, itemIndex)">移除</el-button></div><el-button text type="primary" @click="addReturnPackingItem(box)">+ 添加 SKU</el-button></div><el-button plain type="primary" @click="addReturnPackingBox">+ 添加箱</el-button><el-input v-model="packingPlanRemark" type="textarea" :rows="2" placeholder="合箱备注（选填）" /></AppDialog>
   <WarehouseTransferReviewDialog v-if="transferReviewTarget" v-model="transferReviewOpen" :customer-id="transferReviewTarget.customerId" :customer-name="transferReviewTarget.owner" :transfer-no="transferReviewTarget.orderNo" @reviewed="load()" />
   <AppDialog class="admin-density-dialog" v-model="transferOpen" title="转仓" confirm-text="确认转仓" :loading="transferWarehouseLoading" :confirm-loading="actionLoading" :confirm-disabled="!transferForm.warehouseId || Boolean(transferWarehouseError)" @confirm="submitTransfer">
     <LoadErrorState v-if="transferWarehouseError" title="FBA 仓候选加载失败" :message="transferWarehouseError.message" compact @retry="loadTransferWarehouseOptions">
diff --git a/src/modules/overseas-warehouse/pages/RelabelOrdersView.test.ts b/src/modules/overseas-warehouse/pages/RelabelOrdersView.test.ts
index 125962cd..74a225ac 100644
--- a/src/modules/overseas-warehouse/pages/RelabelOrdersView.test.ts
+++ b/src/modules/overseas-warehouse/pages/RelabelOrdersView.test.ts
@@ -11,7 +11,8 @@ import {
 } from '../api/relabelOrders'
 import RelabelOrdersView from './RelabelOrdersView.vue'
 
-vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+const routerPush = vi.hoisted(() => vi.fn())
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: routerPush }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
 vi.mock('../api/relabelOrders', () => ({
@@ -145,7 +146,7 @@ describe('RelabelOrdersView', () => {
     }))
   })
 
-  it('keeps multi-selection connected to the packing-plan dialog in the integrated list', async () => {
+  it('opens the inventory source selector instead of treating relabel package counts as SKU quantities', async () => {
     vi.mocked(listRelabelOrders).mockResolvedValueOnce({
       records: [{ id: '1', relabelNo: 'RL-1', customerOrderNo: 'RETURN-1', skuCodes: 'SKU-TEST', totalPackageCount: 2, status: 'PENDING_PROCESSING' }],
       page: 1, size: 10, total: 1, pages: 1,
@@ -158,8 +159,6 @@ describe('RelabelOrdersView', () => {
     const createPlan = wrapper.get('.data-table__business-actions').findAll('button').find(button => button.text().includes('创建合箱计划（1）'))!
     await createPlan.trigger('click')
     await flushPromises()
-    const dialog = wrapper.findAllComponents(AppDialog).find(candidate => candidate.props('title') === '配置退货合箱计划')!
-    expect(dialog.props('modelValue')).toBe(true)
-    expect(dialog.findAllComponents({ name: 'ElInput' }).some(input => input.props('modelValue') === 'SKU-TEST')).toBe(true)
+    expect(routerPush).toHaveBeenCalledWith({ name: 'overseas-return-inventory', query: { packing: '1' } })
   })
 })
diff --git a/src/modules/overseas-warehouse/pages/RelabelOrdersView.vue b/src/modules/overseas-warehouse/pages/RelabelOrdersView.vue
index 6f7a247b..845f4d8c 100644
--- a/src/modules/overseas-warehouse/pages/RelabelOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/RelabelOrdersView.vue
@@ -14,7 +14,7 @@ import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
-import { changeRelabelOrderStatus, createRelabelOrder, createReturnPackingPlan, listRelabelOrders, listRelabelWarehouseOptions, type RelabelWarehouseOptionDto, type ReturnPackingPlanBox } from '../api/relabelOrders'
+import { changeRelabelOrderStatus, createRelabelOrder, listRelabelOrders, listRelabelWarehouseOptions, type RelabelWarehouseOptionDto } from '../api/relabelOrders'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { formatOverseasDateTime, relabelBusinessStatusLabel } from '../lastMilePresentation'
 import type { RelabelOrderListItem } from '../types'
@@ -59,11 +59,6 @@ const editSourceStatus = ref('')
 const form = reactive({ orderNo: '', customerId: '', relatedOrderNo: '', sku: '', productName: '', cartons: undefined as number | undefined, budgetTotal: undefined as number | undefined, status: 'PENDING_PROCESSING', labelRequirement: '', relabelCost: undefined as number | undefined, remark: '', warehouseId: '', labelDeadline: '', contactName: '', contactPhone: '', shipmentNo: '', newSkuCode: '' })
 const createIdempotencyKey = ref('')
 const selectedRows = ref<RelabelOrderListItem[]>([])
-const packingDialogOpen = ref(false)
-const packingSubmitting = ref(false)
-const packingMode = ref<'CUSTOMER_INSTRUCTION' | 'WAREHOUSE_RECOMMENDATION'>('CUSTOMER_INSTRUCTION')
-const packingRemark = ref('')
-const packingBoxes = ref<ReturnPackingPlanBox[]>([])
 const allowedStatusOptions = computed(() => {
   if (editSourceStatus.value === 'PENDING_REVIEW') return ['PENDING_PROCESSING', 'REJECTED']
   if (editSourceStatus.value === 'PENDING_PROCESSING') return ['PROCESSING', 'REJECTED', 'CANCELLED']
@@ -72,38 +67,11 @@ const allowedStatusOptions = computed(() => {
 })
 
 function optionalNumber(value: unknown) { const number = Number(value); return value === '' || value == null || !Number.isFinite(number) ? undefined : number }
-function selectedSkus() {
-  const values = new Map<string, number>()
-  for (const row of selectedRows.value) {
-    const skus = String(row.sku || '').split(',').map((value) => value.trim()).filter(Boolean)
-    for (const sku of skus.length ? skus : ['未维护 SKU']) values.set(sku, (values.get(sku) || 0) + Math.max(0, Number(row.cartons || 0)))
-  }
-  return [...values.entries()].map(([skuCode, quantity]) => ({ skuCode, quantity }))
-}
 function openPackingPlan() {
-  if (!selectedRows.value.length) { ElMessage.warning('请先勾选已入库退货订单'); return }
-  packingMode.value = 'CUSTOMER_INSTRUCTION'
-  packingRemark.value = ''
-  packingBoxes.value = selectedSkus().map((item, index) => ({ boxNo: index + 1, items: [{ ...item }] }))
-  packingDialogOpen.value = true
-}
-function addPackingBox() { packingBoxes.value.push({ boxNo: packingBoxes.value.length + 1, items: [{ skuCode: '', quantity: 0 }] }) }
-function removePackingBox(index: number) { if (packingBoxes.value.length > 1) packingBoxes.value.splice(index, 1) }
-function addBoxItem(box: ReturnPackingPlanBox) { box.items.push({ skuCode: '', quantity: 0 }) }
-function removeBoxItem(box: ReturnPackingPlanBox, index: number) { if (box.items.length > 1) box.items.splice(index, 1) }
-async function submitPackingPlan() {
-  if (packingSubmitting.value) return
-  const boxes = packingBoxes.value.map((box, index) => ({ ...box, boxNo: index + 1, items: box.items.filter((item) => item.skuCode.trim() && Number(item.quantity) > 0).map((item) => ({ skuCode: item.skuCode.trim(), quantity: Number(item.quantity) })) })).filter((box) => box.items.length)
-  if (!boxes.length) { ElMessage.warning('至少配置一个箱和一条 SKU 数量'); return }
-  packingSubmitting.value = true
-  try {
-    const result = await createReturnPackingPlan({ returnNos: selectedRows.value.map((row) => row.relatedOrderNo).filter((value) => value && value !== '—'), mode: packingMode.value, boxes, remark: packingRemark.value.trim() || undefined, idempotencyKey: globalThis.crypto?.randomUUID?.() || `packing-${Date.now()}` })
-    ElMessage.success(`合箱计划 ${result.planNo} 已推送 PDA`)
-    packingDialogOpen.value = false
-    selectedRows.value = []
-    await load()
-  } catch (error) { ElMessage.error(getApiErrorDetails(error, '合箱计划推送失败，请重试').message) }
-  finally { packingSubmitting.value = false }
+  if (!selectedRows.value.length) { ElMessage.warning('请先勾选订单'); return }
+  const customerIds = [...new Set(selectedRows.value.map(row => row.customerId).filter(Boolean))]
+  if (customerIds.length > 1) { ElMessage.warning('合箱请选择同一客户的退货库存'); return }
+  void router.push({ name: 'overseas-return-inventory', query: { packing: '1', ...(customerIds[0] ? { customerId: customerIds[0] } : {}) } })
 }
 function openForm(mode: 'create' | 'edit', source?: object) {
   const row = source as RelabelOrderListItem | undefined
@@ -243,15 +211,7 @@ watch(dialogOpen, (open) => { if (!open) createIdempotencyKey.value = '' })
       <template #pagination-left>共 {{ total }} 条换标单</template>
     </DataTable></section>
   </ListPageLayout>
-  <AppDialog class="admin-density-dialog" v-model="packingDialogOpen" title="配置退货合箱计划" width="min(980px, calc(100vw - 28px))" confirm-text="推送 PDA 合箱计划" :confirm-loading="packingSubmitting" @confirm="submitPackingPlan">
-    <div class="packing-plan-dialog">
-      <div class="packing-plan-summary"><span>已选订单：{{ selectedRows.length }} 个</span><span>SKU：{{ selectedSkus().length }} 种</span><span>默认：单 SKU 一箱，可调整为混箱</span></div>
-      <el-radio-group v-model="packingMode" class="packing-mode"><el-radio-button label="CUSTOMER_INSTRUCTION">客户合箱指令</el-radio-button><el-radio-button label="WAREHOUSE_RECOMMENDATION">仓库自主合箱</el-radio-button></el-radio-group>
-      <div v-for="(box, boxIndex) in packingBoxes" :key="boxIndex" class="packing-box"><div class="packing-box-head"><strong>第 {{ boxIndex + 1 }} 箱</strong><el-button text type="danger" :disabled="packingBoxes.length <= 1" @click="removePackingBox(boxIndex)">删除箱</el-button></div><div v-for="(item, itemIndex) in box.items" :key="itemIndex" class="packing-item"><el-input v-model="item.skuCode" placeholder="SKU" /><el-input-number v-model="item.quantity" :min="0" :precision="0" controls-position="right" placeholder="数量" /><el-button text type="danger" :disabled="box.items.length <= 1" @click="removeBoxItem(box, itemIndex)">移除</el-button></div><el-button text type="primary" @click="addBoxItem(box)">+ 添加 SKU</el-button><div class="packing-dimensions"><el-input-number v-model="box.length" :min="0" :precision="2" placeholder="长 cm" /><el-input-number v-model="box.width" :min="0" :precision="2" placeholder="宽 cm" /><el-input-number v-model="box.height" :min="0" :precision="2" placeholder="高 cm" /><el-input-number v-model="box.weight" :min="0" :precision="2" placeholder="重量 kg" /></div></div>
-      <el-button plain type="primary" @click="addPackingBox">+ 添加箱</el-button>
-      <el-input v-model="packingRemark" type="textarea" :rows="2" maxlength="500" show-word-limit placeholder="合箱备注（选填）" />
-    </div>
-  </AppDialog>
+
   <AppDialog class="admin-density-dialog" v-model="dialogOpen" :title="dialogMode === 'create' ? '新增换标单' : '审核换标单'" width="min(760px, calc(100vw - 28px))" :confirm-text="dialogMode === 'create' ? '保存换标单' : '提交审核'" :confirm-loading="submitting" @confirm="submitForm">
     <el-form class="density-form" label-position="top"><h3>订单信息</h3><el-row :gutter="16">
       <el-col :span="12"><el-form-item label="换标单号"><el-input :model-value="dialogMode === 'create' ? '系统自动生成' : form.orderNo || '—'" readonly /></el-form-item></el-col>
diff --git a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts
index d317cca9..ccb7ddd6 100644
--- a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts
+++ b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts
@@ -8,6 +8,8 @@ import { getReturnCarton, listReturnCartons, listReturnInventoryMovements, listR
 import { listReturnPackingPlans } from '../api/relabelOrders'
 import ReturnInventoryManagementView from './ReturnInventoryManagementView.vue'
 import { listPlatformTenants } from '@/modules/iam'
+const routeQuery = vi.hoisted(() => ({} as Record<string, string>))
+vi.mock('vue-router', () => ({ useRoute: () => ({ name: 'overseas-return-inventory', query: routeQuery }) }))
 
 vi.mock('@/modules/iam', () => ({
   listPlatformTenants: vi.fn().mockResolvedValue({ records: [{ id: 'customer-1', tenantName: '测试客户', status: 'ACTIVE' }], page: 1, size: 200, total: 1, pages: 1 }),
@@ -36,6 +38,7 @@ async function mountView(mode: 'inventory' | 'cartons') {
 }
 beforeEach(() => {
   vi.clearAllMocks()
+  Object.keys(routeQuery).forEach(key => delete routeQuery[key])
   localStorage.clear()
   vi.mocked(listReturnStock).mockResolvedValue({ records: [stock], page: 1, size: 20, total: 45, pages: 3 })
   vi.mocked(listReturnCartons).mockResolvedValue({ records: [carton], page: 1, size: 20, total: 1, pages: 1 })
@@ -53,6 +56,15 @@ afterEach(() => {
 })
 
 describe('ReturnInventoryManagementView shared list', () => {
+  it('prefills the selected return orders after loading sources from the tail-order entry', async () => {
+    Object.assign(routeQuery, { packing: '1', customerId: 'customer-1', overseasWarehouseId: 'warehouse-1', returnNos: 'RETURN-1' })
+    vi.mocked(listReturnPackingSources).mockResolvedValue({ records: [{ ...carton, sourceReturnNo: 'RETURN-1', sourceUnitType: 'BOX', items: [{ skuCode: 'SKU-TEST', quantity: 8, availableQuantity: 8 }] }], page: 1, size: 200, total: 1, pages: 1 })
+    const wrapper = await mountView('inventory')
+    expect(listReturnPackingSources).toHaveBeenCalledWith(expect.objectContaining({ customerId: 'customer-1', overseasWarehouseId: 'warehouse-1' }))
+    const form = wrapper.findAllComponents({ name: 'ElForm' }).find(form => form.classes().includes('packing-form'))!
+    expect(form.findAllComponents({ name: 'ElInput' }).some(input => input.props('modelValue') === 'RETURN-1')).toBe(true)
+    expect(document.body.textContent).toContain('RETURN-BOX-1')
+  })
   it('includes customers from later server pages in the packing customer selector', async () => {
     vi.mocked(listPlatformTenants)
       .mockResolvedValueOnce({ records: [{ id: 'customer-1', tenantName: '柏悦物流demo2', status: 'ACTIVE' }], page: 1, size: 200, total: 201, pages: 2 } as Awaited<ReturnType<typeof listPlatformTenants>>)
diff --git a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
index 861b35a8..75969f9b 100644
--- a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
+++ b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue
@@ -2,6 +2,7 @@
 import "@/styles/adminDensity.css";
 import { computed, onMounted, reactive, ref, watch } from "vue";
 import dayjs from "dayjs";
+import { useRoute } from "vue-router";
 import { Search, Plus } from "@lucide/vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import {
@@ -35,6 +36,7 @@ import {
   type ReturnPackingPlanDto,
 } from "../api/relabelOrders";
 const props = defineProps<{ mode: "inventory" | "cartons" }>();
+const route = useRoute();
 const loading = ref(false),
   total = ref(0),
   detailOpen = ref(false);
@@ -385,10 +387,22 @@ watch(() => packingForm.returnNosInput, (value) => {
   packingForm.returnNos = [...new Set(value.split(",").map(item => item.trim()).filter(Boolean))];
 });
 watch(() => packingForm.returnNos, () => { packingForm.sourceCartonMarks = []; packingForm.skuQuantities = {}; updatePackingScope(); }, { deep: true });
-onMounted(() => {
+watch(() => [route.name, route.query.packing, route.query.customerId, route.query.overseasWarehouseId, route.query.returnNos], async () => {
+  if (!['overseas-return-inventory', 'overseas-return-cartons'].includes(String(route.name))) return;
+  const value = (key: string) => typeof route.query[key] === 'string' ? String(route.query[key]) : '';
+  query.customerId = value('customerId');
+  query.overseasWarehouseId = value('overseasWarehouseId');
   void load();
-  void loadOptions();
-});
+  if (value('packing') === '1') {
+    packingForm.customerId = query.customerId;
+    packingForm.overseasWarehouseId = query.overseasWarehouseId;
+    packingForm.mode = 'BOX';
+    packingDialogOpen.value = true;
+    await loadPackingSources();
+    packingForm.returnNosInput = value('returnNos');
+  }
+}, { immediate: true });
+onMounted(() => { void loadOptions(); });
 const stockColumns: DataTableColumn[] = [
   { key: "stock-0", label: "客户", minWidth: 180, slotName: "stock-0" },
   { key: "stock-1", label: "海外仓", minWidth: 180, slotName: "stock-1" },

From f047dce10c78c905bf514c4aaccbcb21cb3f95e6 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 9 Oct 2026 20:39:29 +0800
Subject: [PATCH 09/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overseas-warehouse/api/outbounds.ts       |  2 +-
 .../pages/OutboundsView.returnSku.test.ts     | 91 +++++++++++++++++++
 .../pages/OutboundsView.vue                   | 39 +++++---
 3 files changed, 120 insertions(+), 12 deletions(-)
 create mode 100644 src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts

diff --git a/src/modules/overseas-warehouse/api/outbounds.ts b/src/modules/overseas-warehouse/api/outbounds.ts
index d7f4b87c..187b7c49 100644
--- a/src/modules/overseas-warehouse/api/outbounds.ts
+++ b/src/modules/overseas-warehouse/api/outbounds.ts
@@ -52,7 +52,7 @@ export async function listReturnOutboundCandidates(customerId: string, warehouse
   const response = await http.get<ApiEnvelope<ReturnOutboundCandidate[]>, ApiEnvelope<ReturnOutboundCandidate[]>>('/platform/v1/last-leg/outbound-orders/return/candidates', { params: { customerId, warehouseId } })
   return unwrapApiResponse(response)
 }
-export async function createReturnOutbound(customerId: string, payload: { recipient: string; overseasWarehouseId: string; returnNo: string; cartonMarks: string[]; skuCode?: string; unitType?: 'BOX' | 'PALLET'; remark?: string; idempotencyKey: string }) {
+export async function createReturnOutbound(customerId: string, payload: { recipient: string; overseasWarehouseId: string; returnNo: string; cartonMarks: string[]; skuCode?: string; quantity?: number; unitType?: 'BOX' | 'PALLET'; remark?: string; idempotencyKey: string }) {
   const response = await http.post<ApiEnvelope<OutboundRow>, ApiEnvelope<OutboundRow>>('/platform/v1/last-leg/outbound-orders/return', payload, { params: { customerId } })
   return unwrapApiResponse(response)
 }
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
new file mode 100644
index 00000000..84a31009
--- /dev/null
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
@@ -0,0 +1,91 @@
+import ElementPlus, { ElCheckbox, ElInputNumber, ElSelect } from 'element-plus'
+import { mount, flushPromises, type VueWrapper } from '@vue/test-utils'
+import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
+import OutboundsView from './OutboundsView.vue'
+const api = vi.hoisted(() => ({ create: vi.fn(), stock: vi.fn(), cartons: vi.fn(), detail: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn().mockResolvedValue({ records: [{ id: 'C1', tenantName: '客户一' }], total: 1, pages: 1 }) }))
+vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn().mockResolvedValue({ records: [{ id: 'W1', warehouseName: '洛杉矶仓', warehouseCode: 'US-LAX-01', warehouseType: 'OVERSEAS', status: 'ACTIVE' }] }) }))
+vi.mock('../api/outbounds', () => ({ listOutbounds: vi.fn().mockResolvedValue({ records: [], total: 0 }), listOneClickOutboundCandidates: vi.fn().mockResolvedValue([]), listReturnOutboundCandidates: vi.fn().mockResolvedValue([]), createReturnOutbound: api.create }))
+vi.mock('../api/returnInventory', () => ({ listReturnStock: api.stock, listReturnCartons: api.cartons, getReturnCarton: api.detail }))
+const sources = [
+  { cartonMark: 'BOX-A', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
+  { cartonMark: 'BOX-B', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
+  { cartonMark: 'PARCEL', sourceUnitType: 'PARCEL', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-B', quantity: 6, availableQuantity: 6 }] },
+  { cartonMark: 'MIXED', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 3 }, { skuCode: 'SKU-B', quantity: 2 }] },
+  { cartonMark: 'OTHER-ORDER', sourceUnitType: 'BOX', sourceReturnNo: 'RT-2', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 100 }] },
+]
+let wrapper: VueWrapper
+beforeEach(() => {
+  vi.clearAllMocks()
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+  vi.stubGlobal('localStorage', { getItem: () => null, setItem: () => undefined, removeItem: () => undefined })
+  api.stock.mockResolvedValue({ records: [{ skuCode: 'SKU-A', availableQuantity: 113 }, { skuCode: 'SKU-B', availableQuantity: 8 }], total: 2 })
+  api.cartons.mockResolvedValue({ records: sources, total: sources.length })
+  api.detail.mockImplementation(async mark => sources.find(row => row.cartonMark === mark))
+  api.create.mockResolvedValue({})
+})
+afterEach(() => { wrapper?.unmount(); vi.unstubAllGlobals() })
+async function open(sku: string) {
+  wrapper = mount(OutboundsView, { global: { plugins: [ElementPlus], stubs: { AppDialog: { props: ['modelValue'], emits: ['confirm'], template: '<section v-if="modelValue"><slot /><button data-test="submit" @click="$emit(\'confirm\')">提交</button></section>' } } } })
+  await flushPromises()
+  await wrapper.findAll('button').find(button => button.text().includes('新建出库单'))!.trigger('click'); await flushPromises()
+  const type = wrapper.findComponent({ name: 'ElRadioGroup' }); type.vm.$emit('update:modelValue', 'RETURN_OUTBOUND'); type.vm.$emit('change', 'RETURN_OUTBOUND'); await flushPromises()
+  const customer = wrapper.findAllComponents(ElSelect).find(select => select.props('placeholder') === '请选择客户')!
+  customer.vm.$emit('update:modelValue', 'C1'); customer.vm.$emit('change', 'C1'); await flushPromises()
+  const order = wrapper.findAllComponents(ElSelect).find(select => select.props('placeholder') === '选择已签收入库的退货单')!
+  order.vm.$emit('update:modelValue', 'RT-1'); order.vm.$emit('change', 'RT-1'); await flushPromises()
+  await wrapper.get('input[placeholder="请输入收件人、电话和地址"]').setValue('本地测试收件信息')
+  const mode = wrapper.findAllComponents({ name: 'ElRadioGroup' }).find(group => group.text().includes('单 SKU'))!
+  mode.vm.$emit('update:modelValue', 'SKU'); mode.vm.$emit('change', 'SKU'); await flushPromises()
+  const left = wrapper.findAllComponents({ name: 'ElTable' }).filter(table => table.classes().includes('return-result-table'))[0]!
+  left.findAllComponents(ElCheckbox).find(check => check.element.closest('tr')?.textContent?.includes(sku))!.vm.$emit('change', true); await flushPromises()
+}
+function right() { return wrapper.findAllComponents({ name: 'ElTable' }).filter(table => table.classes().includes('return-result-table'))[1]! }
+async function selectMarks(marks: string[]) {
+  for (const mark of marks) right().findAllComponents(ElCheckbox).find(check => check.element.closest('tr')?.textContent?.includes(mark === 'PARCEL' ? '包裹散件（按 SKU 拣货）' : mark))!.vm.$emit('change', true)
+  await flushPromises()
+}
+describe('single SKU outbound source and piece quantity', () => {
+  it('selects packed single-SKU boxes, scopes quantities to the return order and excludes mixed boxes', async () => {
+    await open('SKU-A')
+    expect(right().props('data').map((row: { cartonMark: string }) => row.cartonMark)).toEqual(['BOX-A', 'BOX-B'])
+    expect(wrapper.text()).not.toContain('OTHER-ORDER')
+    await selectMarks(['BOX-A', 'BOX-B'])
+    expect(wrapper.findComponent(ElInputNumber).props('modelValue')).toBe(10)
+    await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ skuCode: 'SKU-A', quantity: 10, cartonMarks: ['BOX-A', 'BOX-B'] }))
+  })
+  it('submits six pieces from two five-piece boxes', async () => {
+    await open('SKU-A'); await selectMarks(['BOX-A', 'BOX-B'])
+    wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', 6); await flushPromises()
+    await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ quantity: 6 }))
+  })
+  it('allows loose PARCEL sources even when the box/pallet candidate endpoint excludes them', async () => {
+    await open('SKU-B'); expect(right().props('data').map((row: { cartonMark: string }) => row.cartonMark)).toEqual(['PARCEL'])
+    await selectMarks(['PARCEL']); wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', 2); await flushPromises()
+    await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ skuCode: 'SKU-B', quantity: 2, cartonMarks: ['PARCEL'] }))
+  })
+  it('never offers a parcel as a physical box in box/pallet mode', async () => {
+    await open('SKU-B')
+    const mode = wrapper.findAllComponents({ name: 'ElRadioGroup' }).find(group => group.text().includes('单 SKU'))!
+    mode.vm.$emit('update:modelValue', 'BOX'); mode.vm.$emit('change', 'BOX'); await flushPromises()
+    expect(right().props('data').some((row: { sourceUnitType: string }) => row.sourceUnitType === 'PARCEL')).toBe(false)
+    expect(right().text()).not.toContain('包裹散件')
+  })
+  it.each([[0,1],[11,10]])('clamps input %s to the allowed bound %s', async (quantity, expected) => {
+    await open('SKU-A'); await selectMarks(['BOX-A', 'BOX-B'])
+    wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', quantity); await flushPromises()
+    await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({quantity: expected}))
+  })
+  it.each([1.5])('blocks invalid quantity %s before creating an order', async quantity => {
+    await open('SKU-A'); await selectMarks(['BOX-A', 'BOX-B'])
+    wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', quantity); await flushPromises()
+    await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
+    expect(api.create).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.vue b/src/modules/overseas-warehouse/pages/OutboundsView.vue
index 3f087d6b..2985199d 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.vue
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { Plus, Search } from '@lucide/vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
@@ -38,6 +38,7 @@ const returnStockRows = ref<ReturnStockRow[]>([])
 const returnCartonRows = ref<ReturnCartonRow[]>([])
 const selectedReturnSkus = ref<string[]>([])
 const returnPickMode = ref<'BOX' | 'SKU'>('BOX')
+const returnQuantity = ref<number | undefined>()
 const returnSkuQueryInput = ref(''); const returnSkuQuery = ref('')
 const returnCartonQueryInput = ref(''); const returnCartonQuery = ref('')
 const returnSkuPage = ref(1); const returnCartonPage = ref(1); const returnUnitType = ref<'BOX' | 'PALLET'>('BOX')
@@ -64,7 +65,15 @@ function transferCustomerName(row: WarehouseTransferOutboundCandidate) {
   const customer = tenantOptions.value.find(item => String(item.id) === String(row.customerId))
   return customer?.legalName?.trim() || customer?.tenantName?.trim() || `客户 ${row.customerId}`
 }
-const selectedReturnStock = computed(() => returnStockRows.value.filter((item) => Number(returnPickMode.value === 'SKU' ? item.looseAvailableQuantity || 0 : item.availableQuantity || 0) > 0))
+const selectedReturnStock = computed(() => returnStockRows.value.map((item) => {
+  if (returnPickMode.value !== 'SKU') return item
+  const quantity = selectedReturnCartons.value.reduce((sum, carton) => {
+    if (selectedReturnNo.value && !(carton.sourceReturnNo || '').split(',').includes(selectedReturnNo.value)) return sum
+    const items = returnCartonDetails.value[carton.cartonMark]?.items
+    return items?.length === 1 && items[0]?.skuCode === item.skuCode ? sum + Number(items[0].availableQuantity ?? items[0].quantity) : sum
+  }, 0)
+  return { ...item, availableQuantity: quantity }
+}).filter(item => Number(item.availableQuantity || 0) > 0))
 const selectedReturnCartons = computed(() => returnCartonRows.value.filter((item) => item.status === 'AVAILABLE'))
 const returnOrderOptions = computed(() => [...new Set([
   ...returnCandidates.value.flatMap(item => (item.returnNo || '').split(',')),
@@ -76,11 +85,11 @@ const queryTokens = (value: string) => value.split(/[,，\n]+/).map((item) => it
 const matchesAnyToken = (value: string, query: string) => { const tokens = queryTokens(query); const normalized = value.replace(/\s+/g, '').toLowerCase(); return !tokens.length || tokens.some((token) => normalized.includes(token)) }
 const filteredReturnStocks = computed(() => selectedReturnStock.value.filter((item) => matchesAnyToken(`${item.skuCode},${item.productNameZh || ''}`, returnSkuQuery.value)))
 const filteredReturnCartons = computed(() => selectedReturnCartons.value.filter((item) => {
+  if (returnPickMode.value === 'BOX' && item.sourceUnitType === 'PARCEL') return false
   if (selectedReturnNo.value && !(item.sourceReturnNo || returnCandidateByMark.value[item.cartonMark]?.returnNo || '').split(',').includes(selectedReturnNo.value)) return false
   if (returnPickMode.value === 'SKU') {
     const detail = returnCartonDetails.value[item.cartonMark]
-    if (!selectedReturnSkus.value.length || item.sourceUnitType !== 'PARCEL' || !returnCandidateByMark.value[item.cartonMark]
-      || detail?.items?.length !== 1 || detail.items[0]?.skuCode !== selectedReturnSkus.value[0]) return false
+    if (!selectedReturnSkus.value.length || detail?.items?.length !== 1 || detail.items[0]?.skuCode !== selectedReturnSkus.value[0]) return false
   }
   const detailSkus = returnCartonDetails.value[item.cartonMark]?.items?.map((detail) => detail.skuCode).join(',') || ''
   return matchesAnyToken(`${item.cartonMark},${item.fbaCartonMark || ''},${detailSkus}`, returnCartonQuery.value)
@@ -88,6 +97,11 @@ const filteredReturnCartons = computed(() => selectedReturnCartons.value.filter(
 const pagedReturnStocks = computed(() => filteredReturnStocks.value.slice((returnSkuPage.value - 1) * returnSkuPageSize.value, returnSkuPage.value * returnSkuPageSize.value))
 const pagedReturnCartons = computed(() => filteredReturnCartons.value.slice((returnCartonPage.value - 1) * returnCartonPageSize.value, returnCartonPage.value * returnCartonPageSize.value))
 const effectiveReturnMarks = computed(() => [...new Set(selectedReturnMarks.value)].filter(Boolean) as string[])
+const selectedReturnQuantity = computed(() => effectiveReturnMarks.value.reduce((sum, mark) => {
+  const line = returnCartonDetails.value[mark]?.items.find(item => item.skuCode === selectedReturnSkus.value[0])
+  return sum + Number(line?.availableQuantity ?? line?.quantity ?? 0)
+}, 0))
+watch(selectedReturnQuantity, quantity => { returnQuantity.value = quantity || undefined })
 const returnMarksModel = computed({ get: () => selectedReturnMarks.value, set: (value: string[]) => { selectedReturnMarks.value = value } })
 const filteredDropshipCandidates = computed(() => dropshipCandidates.value.filter(item => !dropshipQuery.value.trim() || [item.orderNo, item.inboundCode, item.customerName, item.palletNo, item.skuCode, item.productName].join(' ').toLowerCase().includes(dropshipQuery.value.trim().toLowerCase())))
 const pagedDropshipCandidates = computed(() => filteredDropshipCandidates.value.slice((dropshipPage.value - 1) * dropshipPageSize.value, dropshipPage.value * dropshipPageSize.value))
@@ -203,13 +217,16 @@ async function submit() {
       if (!recipient.value.trim()) { ElMessage.warning('请填写收件信息'); return }
       if (!selectedReturnNo.value) { ElMessage.warning('请选择退货单'); return }
       if (returnPickMode.value === 'SKU' && selectedReturnSkus.value.length !== 1) { ElMessage.warning('请选择一个 SKU'); return }
+      if (returnPickMode.value === 'SKU' && (!Number.isSafeInteger(returnQuantity.value) || Number(returnQuantity.value) <= 0 || Number(returnQuantity.value) > selectedReturnQuantity.value)) {
+        ElMessage.warning(`请填写 1-${selectedReturnQuantity.value} 件的出库数量`); return
+      }
       if (!selectedReturnMarks.value.length) {
         ElMessage.warning(returnPickMode.value === 'SKU'
-          ? filteredReturnCartons.value.length ? '请在右侧选择该 SKU 的散件来源记录' : '该退货单没有此 SKU 可出库的散件库存；已装箱货物请切换箱／托出库'
+          ? filteredReturnCartons.value.length ? '请在右侧选择该 SKU 的来源箱或散件记录' : '该退货单没有此 SKU 的可用单 SKU 箱或散件库存；混合箱请先拆箱'
           : '请选择出库箱号或托盘')
         return
       }
-      await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, skuCode: returnPickMode.value === 'SKU' ? selectedReturnSkus.value[0] : undefined, unitType: returnPickMode.value === 'SKU' ? 'BOX' : returnUnitType.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` })
+      await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, skuCode: returnPickMode.value === 'SKU' ? selectedReturnSkus.value[0] : undefined, quantity: returnPickMode.value === 'SKU' ? returnQuantity.value : undefined, unitType: returnPickMode.value === 'SKU' ? 'BOX' : returnUnitType.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` })
       ElMessage.success('退货出库单和待派送单已创建，作业已推送 PDA')
     } else {
       const selected = dropshipCandidates.value.filter(item => selectedDropshipIds.value.includes(dropshipCandidateKey(item)))
@@ -329,21 +346,21 @@ onMounted(load)
         <el-form-item label="收件信息" required><el-input v-model="recipient" placeholder="请输入收件人、电话和地址" /></el-form-item>
         <el-form-item label="海外仓" required><el-select v-model="selectedWarehouseId" :disabled="!selectedCustomerId" filterable placeholder="请选择海外仓" @change="loadReturnCandidates"><el-option v-for="item in warehouseOptions" :key="item.value" :value="item.value" :label="item.label" /></el-select></el-form-item>
         <el-form-item label="退货单" required><el-select v-model="selectedReturnNo" filterable placeholder="选择已签收入库的退货单" @change="selectedReturnMarks = []"><el-option v-for="no in returnOrderOptions" :key="no" :label="no" :value="no" /></el-select></el-form-item>
-        <el-form-item label="出库维度"><el-radio-group v-model="returnPickMode" @change="changeReturnPickMode"><el-radio-button value="BOX">箱 / 托</el-radio-button><el-radio-button value="SKU">单 SKU</el-radio-button></el-radio-group></el-form-item>
+        <p v-if="returnPickMode === 'SKU'" class="candidate-hint">单 SKU 模式可填写全部或部分件数；已装箱货物由 PDA 扫箱唛按计划件数拣货，剩余数量保留在原箱。</p><el-form-item v-if="returnPickMode === 'SKU'" label="出库数量（件）" required><el-input-number v-model="returnQuantity" :min="1" :max="selectedReturnQuantity || 1" :precision="0" placeholder="选择来源后填写件数" /><span class="candidate-hint">所选来源可用 {{ selectedReturnQuantity }} 件；按来源箱号顺序分配</span></el-form-item><el-form-item label="出库维度"><el-radio-group v-model="returnPickMode" @change="changeReturnPickMode"><el-radio-button value="BOX">箱 / 托</el-radio-button><el-radio-button value="SKU">单 SKU</el-radio-button></el-radio-group></el-form-item>
         <el-form-item v-if="returnPickMode === 'BOX'" label="箱托方式"><el-radio-group v-model="returnUnitType" @change="changeReturnUnitType"><el-radio-button value="BOX">按箱号出库</el-radio-button><el-radio-button value="PALLET">按托盘出库</el-radio-button></el-radio-group></el-form-item>
         <el-form-item v-if="returnPickMode === 'BOX' && returnUnitType === 'PALLET' && returnPallets.length" label="整托选择"><div class="return-pallet-options"><el-checkbox v-for="code in returnPallets" :key="code" :model-value="returnCandidates.filter(item => item.palletCode === code && item.cartonMark).every(item => selectedReturnMarks.includes(item.cartonMark!))" @change="toggleReturnPallet(code, $event)">{{ code }}</el-checkbox></div></el-form-item>
         <div class="return-lists">
           <section class="return-list-card">
             <div class="list-title"><span>SKU库存</span><small>按 SKU 查询</small></div>
             <div class="candidate-query"><el-input v-model="returnSkuQueryInput" clearable placeholder="如：SKU001,SKU002" /><el-button type="primary" @click="searchReturnSkus">查询</el-button></div>
-            <el-table :data="pagedReturnStocks" border stripe class="return-result-table" max-height="400"><el-table-column v-if="returnPickMode === 'SKU'" label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnSkus.includes(row.skuCode)" @change="toggleReturnSku(row.skuCode, $event)" /></template></el-table-column><el-table-column prop="skuCode" label="SKU" min-width="150" show-overflow-tooltip /><el-table-column prop="productNameZh" label="品名" min-width="150" show-overflow-tooltip /><el-table-column :label="returnPickMode === 'SKU' ? '散件可用数量' : '可用数量'" width="110" align="right"><template #default="{ row }">{{ returnPickMode === 'SKU' ? row.looseAvailableQuantity : row.availableQuantity }}</template></el-table-column></el-table>
+            <el-table :data="pagedReturnStocks" border stripe class="return-result-table" max-height="400"><el-table-column v-if="returnPickMode === 'SKU'" label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnSkus.includes(row.skuCode)" @change="toggleReturnSku(row.skuCode, $event)" /></template></el-table-column><el-table-column prop="skuCode" label="SKU" min-width="150" show-overflow-tooltip /><el-table-column prop="productNameZh" label="品名" min-width="150" show-overflow-tooltip /><el-table-column label="可用数量" width="110" align="right"><template #default="{ row }">{{ row.availableQuantity }}</template></el-table-column></el-table>
             <div class="return-pagination"><span>{{ returnPickMode === 'SKU' ? `已选择 ${selectedReturnSkus.length} 个 SKU` : 'SKU 库存' }}</span><el-pagination v-model:current-page="returnSkuPage" v-model:page-size="returnSkuPageSize" :page-sizes="[5, 10, 20, 50]" :total="filteredReturnStocks.length" layout="total, sizes, prev, pager, next" @size-change="returnSkuPage = 1" /></div>
           </section>
           <section class="return-list-card">
-            <div class="list-title"><span>箱号列表</span><small>支持多个箱号或 SKU，用英文逗号分隔</small></div>
+            <div class="list-title"><span>{{ returnPickMode === 'SKU' ? 'SKU 来源明细' : '箱号列表' }}</span><small>支持多个箱号或 SKU，用英文逗号分隔</small></div>
             <div class="candidate-query"><el-input v-model="returnCartonQueryInput" clearable placeholder="如：RC001,RC002 或 SKU001,SKU002" /><el-button type="primary" @click="searchReturnCartons">查询</el-button></div>
-            <el-table :data="pagedReturnCartons" border stripe class="return-result-table" max-height="400"><el-table-column label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnMarks.includes(row.cartonMark)" @change="toggleReturnCarton(row.cartonMark, $event)" /></template></el-table-column><el-table-column prop="cartonMark" label="箱号" min-width="190" show-overflow-tooltip /><el-table-column label="托盘" min-width="150"><template #default="{ row }">{{ returnCandidateByMark[row.cartonMark]?.palletCode || '散箱' }}</template></el-table-column><el-table-column label="箱内SKU及数量" min-width="230"><template #default="{ row }">{{ returnCartonDetails[row.cartonMark]?.items?.map((item) => `${item.skuCode} × ${item.quantity}`).join('，') || '加载中' }}</template></el-table-column></el-table>
-            <div class="return-pagination"><span>已选择 {{ selectedReturnMarks.length }} 个箱号</span><el-pagination v-model:current-page="returnCartonPage" v-model:page-size="returnCartonPageSize" :page-sizes="[5, 10, 20, 50]" :total="filteredReturnCartons.length" layout="total, sizes, prev, pager, next" @size-change="returnCartonPage = 1" /></div>
+            <el-table :data="pagedReturnCartons" border stripe class="return-result-table" max-height="400"><el-table-column label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnMarks.includes(row.cartonMark)" @change="toggleReturnCarton(row.cartonMark, $event)" /></template></el-table-column><el-table-column :label="returnPickMode === 'SKU' ? '库存来源' : '箱号'" min-width="190" show-overflow-tooltip><template #default="{ row }">{{ row.sourceUnitType === 'PARCEL' ? '包裹散件（按 SKU 拣货）' : row.cartonMark }}</template></el-table-column><el-table-column label="托盘" min-width="150"><template #default="{ row }">{{ row.sourceUnitType === 'PARCEL' ? '无需托盘' : returnCandidateByMark[row.cartonMark]?.palletCode || '散箱' }}</template></el-table-column><el-table-column label="箱内SKU及数量" min-width="230"><template #default="{ row }">{{ returnCartonDetails[row.cartonMark]?.items?.map((item) => `${item.skuCode} × ${item.quantity}`).join('，') || '加载中' }}</template></el-table-column></el-table>
+            <div class="return-pagination"><span>已选择 {{ selectedReturnMarks.length }} 个{{ returnPickMode === 'SKU' ? '来源' : '箱号' }}</span><el-pagination v-model:current-page="returnCartonPage" v-model:page-size="returnCartonPageSize" :page-sizes="[5, 10, 20, 50]" :total="filteredReturnCartons.length" layout="total, sizes, prev, pager, next" @size-change="returnCartonPage = 1" /></div>
           </section>
         </div>
       </template>

From e1457a8e570150c8b7d50435a9930d0a75994f86 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 9 Oct 2026 22:05:51 +0800
Subject: [PATCH 10/47] feat(admin): streamline appointments and fleet intake

---
 src/core/navigation/adminNavigation.test.ts   |   2 +-
 src/core/navigation/adminNavigation.ts        |   2 +-
 .../AppointmentCalendarPanel.test.ts          |  14 ++
 .../AppointmentCalendarPanel.vue              |  14 +-
 .../AppointmentCalendarView.test.ts           | 138 +++++++++++++--
 .../AppointmentCalendarView.vue               | 162 +++++++++++++++---
 .../AppointmentCargoPanel.test.ts             |  44 +++++
 .../AppointmentCargoPanel.vue                 |  90 ++++++++++
 .../AppointmentFollowupDialog.test.ts         |  51 ++++++
 .../AppointmentFollowupDialog.vue             | 101 +++++++++++
 .../AppointmentInboundCodes.test.ts           |  41 +++++
 .../AppointmentInboundCodes.vue               |  37 ++++
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |   9 +-
 .../appointment-calendar/planningApi.test.ts  |  14 ++
 .../appointment-calendar/planningApi.ts       |  71 ++++++++
 src/modules/overseas-master-data/AGENTS.md    |   2 +
 .../overseas-master-data/PROTOTYPE_MATRIX.md  |  14 ++
 .../api/capacityOffers.ts                     |  13 +-
 .../overseas-master-data/api/tripBookings.ts  |  20 +--
 src/modules/overseas-master-data/api/trips.ts |  10 ++
 .../capacityOfferTypes.ts                     |  11 +-
 .../components/CapacityDialogClosing.test.ts  |  13 +-
 .../components/CapacityInquiryDialog.test.ts  |   4 +-
 .../components/CapacityInquiryDialog.vue      |  48 ++++--
 .../components/CapacityInquiryFulfillment.vue |  37 ++++
 .../components/CapacityInquiryTable.vue       |  14 +-
 .../TripBookingFulfillmentDialog.test.ts      |  15 +-
 .../TripBookingFulfillmentDialog.vue          |  41 +++--
 .../components/TripDispatchSelector.vue       |  21 +++
 .../components/TripPreparationDialog.test.ts  |  41 +++++
 .../components/TripPreparationDialog.vue      |  86 ++++++++++
 src/modules/overseas-master-data/index.ts     |   4 +
 .../pages/CapacityOfferDetailView.vue         |  28 ++-
 .../pages/CapacityOffersBehavior.test.ts      |  53 ++++--
 .../pages/CapacityOffersView.vue              |  64 ++++---
 .../pages/TripDetailView.vue                  |   5 +-
 src/modules/overseas-master-data/routes.ts    |   2 +-
 .../pages/DispatchesView.test.ts              |  25 +--
 .../pages/DispatchesView.vue                  |  19 +-
 39 files changed, 1215 insertions(+), 165 deletions(-)
 create mode 100644 src/modules/appointment-calendar/AppointmentCargoPanel.test.ts
 create mode 100644 src/modules/appointment-calendar/AppointmentCargoPanel.vue
 create mode 100644 src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
 create mode 100644 src/modules/appointment-calendar/AppointmentFollowupDialog.vue
 create mode 100644 src/modules/appointment-calendar/AppointmentInboundCodes.test.ts
 create mode 100644 src/modules/appointment-calendar/AppointmentInboundCodes.vue
 create mode 100644 src/modules/appointment-calendar/planningApi.test.ts
 create mode 100644 src/modules/appointment-calendar/planningApi.ts
 create mode 100644 src/modules/overseas-master-data/components/CapacityInquiryFulfillment.vue
 create mode 100644 src/modules/overseas-master-data/components/TripDispatchSelector.vue
 create mode 100644 src/modules/overseas-master-data/components/TripPreparationDialog.test.ts
 create mode 100644 src/modules/overseas-master-data/components/TripPreparationDialog.vue

diff --git a/src/core/navigation/adminNavigation.test.ts b/src/core/navigation/adminNavigation.test.ts
index b1dbf3b6..12c2c7e8 100644
--- a/src/core/navigation/adminNavigation.test.ts
+++ b/src/core/navigation/adminNavigation.test.ts
@@ -23,7 +23,7 @@ describe('adminNavigation', () => {
       { title: '货柜管理', children: ['订舱列表', '拖车列表', '货柜列表', '装柜清单', '预装清单'] },
        { title: '海外尾程', children: ['尾程订单', '入库单', '废弃单', '出库单', '换标单', '派送单', '托盘管理', '库位管理', '库存管理', '退货库存管理', '退货箱号管理'] },
       { title: '预约管理', children: ['预约列表'] },
-      { title: '车辆管理', children: ['排车列表', '车辆列表', '司机管理', '车次管理', '拼车需求池', '出车记录'] },
+      { title: '车辆管理', children: ['排车列表', '车辆列表', '司机管理', '车次管理', '拼车接货', '出车记录'] },
       { title: '海外业务', children: ['采购订单', '本土卡车', '本土散板'] },
       { title: '客户服务', children: ['异常订单'] },
       { title: '财务管理', children: ['客户账户', '客户应收应付', '应收款统计表', '客户对账单', '结算单应收', '结算单应付'] },
diff --git a/src/core/navigation/adminNavigation.ts b/src/core/navigation/adminNavigation.ts
index 4fd3b351..571b3797 100644
--- a/src/core/navigation/adminNavigation.ts
+++ b/src/core/navigation/adminNavigation.ts
@@ -135,7 +135,7 @@ export const adminNavigation: AdminNavigationNode[] = [
       { key: 'vehicle-list', title: '车辆列表', icon: Truck, path: '/overseas-master-data/vehicles', permission: 'platform:overseas-master-data:vehicle:list' },
       { key: 'driver-management', title: '司机管理', icon: ContactRound, path: '/overseas-master-data/drivers', permission: 'platform:overseas-master-data:driver:list' },
       { key: 'fleet-trips', title: '车次管理', icon: Truck, path: '/overseas-master-data/trips', permission: 'platform:fleet:trip:list' },
-      { key: 'fleet-capacity-offers', title: '拼车需求池', icon: Truck, path: '/overseas-master-data/capacity-offers', permission: 'platform:fleet:capacity-offer:list', permissionAnyOf: ['platform:fleet:capacity-offer:manage'] },
+      { key: 'fleet-capacity-offers', title: '拼车接货', icon: Truck, path: '/overseas-master-data/capacity-offers', permission: 'platform:fleet:capacity-offer:list', permissionAnyOf: ['platform:fleet:capacity-offer:manage'] },
       { key: 'fleet-operations', title: '出车记录', icon: Truck, path: '/overseas-master-data/trip-operations', permission: 'platform:fleet:operations:list' },
     ],
   },
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
index 141ca57d..8cfe2150 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
@@ -50,4 +50,18 @@ describe('appointment calendar interactions', () => {
     expect(wrapper.emitted('edit')?.[0]?.[0]).toMatchObject({ key: 'a' })
     expect(wrapper.emitted('delete')?.[0]?.[0]).toMatchObject({ key: 'a' })
   })
+
+  it('renders many inbound codes outside the two-column fields with only three previews', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: [{
+      key: 'many', type: 'delivery', date: '2026-09-24', time: '09:00', title: 'ONT8 预约送仓',
+      fields: [{ label: '货物信息', value: '20 票 / 12 个客户' }],
+      inboundCodes: Array.from({ length: 20 }, (_, index) => `WT-INBOUND-${index}`), canEdit: true,
+    }] })
+    const card = wrapper.get('.detail-event')
+    expect(card.get('dl').text()).not.toContain('WT-INBOUND')
+    expect(card.findAll('.inbound-codes li')).toHaveLength(3)
+    expect(card.get('.inbound-codes').text()).toContain('20 个')
+    expect(card.get('footer').text()).toContain('编辑')
+  })
 })
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index ad532175..dd418631 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
 import { computed, ref } from 'vue'
+import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
 import { addDays, calendarDates, calendarRange, dateKey, moveCalendar, type CalendarMode } from './calendar'
 
 export interface CalendarEvent {
@@ -11,6 +12,7 @@ export interface CalendarEvent {
   title: string
   subtitle?: string
   fields: Array<{ label: string; value?: string | null }>
+  inboundCodes?: Array<string | null | undefined>
   canEdit?: boolean
   canDelete?: boolean
 }
@@ -18,9 +20,10 @@ export interface CalendarEvent {
 const props = withDefaults(defineProps<{
   events: CalendarEvent[]
   loading?: boolean
+  incomplete?: boolean
   canCreate?: boolean
   initialDate?: string
-}>(), { loading: false, canCreate: false, initialDate: '' })
+}>(), { loading: false, incomplete: false, canCreate: false, initialDate: '' })
 const emit = defineEmits<{
   range: [range: { from: string; to: string }]
   create: [date: string]
@@ -84,10 +87,10 @@ defineExpose({ selectedDate, mode })
       <div v-loading="loading" class="calendar-grid" :class="{ 'week-grid': mode === 'week' }">
         <button v-for="date in dates" :key="date" type="button" class="calendar-day"
           :class="{ selected: selectedDate === date, outside: mode === 'month' && date.slice(0, 7) !== selectedDate.slice(0, 7) }"
-          :title="`${date}，共 ${(grouped.get(date) || []).length} 条安排`" :aria-label="`${date}，${(grouped.get(date) || []).length} 项安排`" :aria-pressed="selectedDate === date" @click="select(date)">
+          :title="`${date}，${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（部分来源未加载）' : ''}`" :aria-label="`${date}，${(grouped.get(date) || []).length} 项安排${incomplete ? '（部分来源未加载）' : ''}`" :aria-pressed="selectedDate === date" @click="select(date)">
           <span class="day-number">{{ mode === 'week' ? `${Number(date.slice(5, 7))}月` : '' }}{{ Number(date.slice(8)) }}</span>
           <span class="day-events">
-            <span v-for="event in (grouped.get(date) || []).slice(0, 3)" :key="event.key" class="event-chip" :class="event.type" :title="`${event.time} ${event.title} · 当天共 ${(grouped.get(date) || []).length} 条安排`">
+            <span v-for="event in (grouped.get(date) || []).slice(0, 3)" :key="event.key" class="event-chip" :class="event.type" :title="`${event.time} ${event.title} · 当天${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（部分来源未加载）' : ''}`">
               {{ event.title }}<small v-if="mode === 'week'">{{ event.time }}</small>
             </span>
             <span v-if="(grouped.get(date) || []).length > 3" class="event-more">还有 {{ (grouped.get(date) || []).length - 3 }} 条</span>
@@ -96,13 +99,14 @@ defineExpose({ selectedDate, mode })
       </div>
     </div>
     <aside class="calendar-detail" aria-label="当天安排">
-      <header><strong>{{ selectedDate }}</strong><p>当天共有 <b>{{ selectedEvents.length }}</b> 项安排</p></header>
+      <header><strong>{{ selectedDate }}</strong><p>{{ incomplete ? '当天已加载' : '当天共有' }} <b>{{ selectedEvents.length }}</b> 项安排<span v-if="incomplete">（部分来源未加载）</span></p></header>
       <div class="detail-events" aria-live="polite">
-        <p v-if="!selectedEvents.length && !loading" class="empty-day">当天暂无到港或送仓预约</p>
+        <p v-if="!selectedEvents.length && !loading" class="empty-day">{{ incomplete ? '部分来源未加载，请重试后确认当天安排' : '当天暂无到港或送仓预约' }}</p>
         <article v-for="event in selectedEvents" :key="event.key" class="detail-event">
           <div class="event-heading"><span class="event-type" :class="event.type">{{ event.type === 'arrival' ? '船舶到港' : '预约送仓' }}</span><span>{{ event.time || '—' }}</span></div>
           <h3>{{ event.title }}</h3><p v-if="event.subtitle" class="event-subtitle">{{ event.subtitle }}</p>
           <dl><div v-for="field in event.fields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value || '—' }}</dd></div></dl>
+          <AppointmentInboundCodes v-if="event.inboundCodes" :codes="event.inboundCodes" />
           <footer v-if="event.canEdit || event.canDelete" class="density-actions">
             <el-button v-if="event.canEdit" class="density-action" :disabled="loading" @click="emit('edit', event)">编辑</el-button>
             <el-button v-if="event.canDelete" class="density-action" data-tone="danger" :disabled="loading" @click="emit('delete', event)">删除</el-button>
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 60a884b4..a9e92753 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -3,14 +3,21 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCalendarView from './AppointmentCalendarView.vue'
 import { createFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
 import { listArrivalCalendar } from './api'
+import { resolvePlanningSource, saveFollowup } from './planningApi'
+const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true }))
+vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn() }))
+import { listPlatformWarehouses } from '@/modules/warehouses'
+vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
+
+vi.mock('vue-router', () => ({ useRoute: () => routing, useRouter: () => ({ push: vi.fn() }) }))
 
 vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), deleteAppointment: vi.fn() }))
 
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => permission !== 'source-read' || routing.canSourceRead }) }))
 vi.mock('@/modules/overseas-warehouse', () => ({
   createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(), listFbaAppointmentCalendar: vi.fn(),
   listInboundOrders: vi.fn(), updateFbaAppointment: vi.fn(),
-  overseasWarehousePermissions: { inboundOrderAppointment: 'write' },
+  overseasWarehousePermissions: { inboundOrderAppointment: 'write', lastMileOrderList: 'source-read' },
 }))
 vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
 
@@ -21,22 +28,25 @@ const candidates = [
 function render() {
   return mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
     AdminPage: { template: '<main><slot /></main>' },
-    AppointmentCalendarPanel: { template: '<button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button>' },
+    AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', props: ['events', 'incomplete'], template: '<button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button>' },
     AppDialog: { props: ['modelValue'], template: '<div v-if="modelValue"><slot /><button data-save @click="$emit(\'confirm\')">保存</button></div>' },
     ElForm: { template: '<form><slot /></form>' },
     ElFormItem: { template: '<label><slot /></label>' },
     ElInput: { props: ['modelValue', 'placeholder'], template: '<input :placeholder="placeholder" :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
     ElDatePicker: { props: ['modelValue'], template: '<input data-date :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
     ElButton: { template: '<button><slot /></button>' },
-    ElSelect: true, ElOption: true,
-    DataTable: { props: ['data'], template: '<div><slot name="toolbar-actions" /><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
-    LoadErrorState: true, ApiErrorMeta: true,
+    ElSelect: { name: 'ElSelect', emits: ['update:modelValue', 'change'], props: ['modelValue', 'remoteMethod'], template: '<select :value="modelValue" @change="$emit(\'update:modelValue\', $event.target.value); $emit(\'change\', $event.target.value)"><option value="">请选择</option><slot /></select>' },
+    ElOption: { props: ['value', 'label'], template: '<option :value="value">{{ label }}</option>' },
+    DataTable: { name: 'DataTable', props: ['data'], template: '<div><slot name="toolbar-actions" /><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
+    LoadErrorState: true, ApiErrorMeta: true, AppointmentFollowupDialog: true,
   } } })
 }
 
 describe('appointment calendar data integration', () => {
   beforeEach(() => {
     vi.resetAllMocks()
+    routing.query = {}; routing.canSourceRead = true
+    vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: ['ONT8', 'LAX9'].map(code => ({ id: code, tenantId: 0, warehouseCode: code, warehouseName: code, warehouseType: 'FBA' as const, status: 'ACTIVE' as const, internalCode: null, countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, remark: null })), page: 1, size: 50, pages: 1, total: 2 })
     vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([])
     vi.mocked(listArrivalCalendar).mockResolvedValue([])
     vi.mocked(listInboundOrders).mockResolvedValue({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
@@ -50,12 +60,12 @@ describe('appointment calendar data integration', () => {
     expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
     expect(listInboundOrders).not.toHaveBeenCalled()
     await wrapper.get('[data-create]').trigger('click')
-    await wrapper.get('input[placeholder="例如 ONT8"]').setValue('ONT8')
-    await wrapper.findAll('button').find(button => button.text() === '查询可预约货物')!.trigger('click')
+    await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
     await flushPromises()
     await wrapper.get('[data-select]').trigger('click')
-    await wrapper.get('input[placeholder="请输入预约编号"]').setValue('APT-AB')
-    await wrapper.findAll('[data-date]')[2]!.setValue('2026-10-09T07:00:00')
+    await wrapper.get('input[placeholder="填写仓库提供的预约编号"]').setValue('APT-AB')
+    await wrapper.findAll('[data-date]')[1]!.setValue('2026-10-09T07:00:00')
     await wrapper.get('[data-save]').trigger('click')
     await flushPromises()
     expect(createFbaAppointment).toHaveBeenCalledTimes(1)
@@ -66,4 +76,112 @@ describe('appointment calendar data integration', () => {
     expect(listInboundOrders).toHaveBeenCalledTimes(1)
     expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(2)
   })
+  it('only searches active FBA warehouses and loads cargo automatically after selection', async () => {
+    const wrapper = render()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    expect(listPlatformWarehouses).toHaveBeenCalledWith(expect.objectContaining({ warehouseType: 'FBA', status: 'ACTIVE', size: 50 }))
+    expect(wrapper.find('input[placeholder="例如 ONT8"]').exists()).toBe(false)
+    expect(wrapper.text()).not.toContain('查询可预约货物')
+    expect(wrapper.find('details').attributes('open')).toBeUndefined()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    await flushPromises()
+    expect(listInboundOrders).toHaveBeenLastCalledWith({ page: 1, size: 10, fbaWarehouseCode: 'ONT8' })
+  })
+
+  it('changing or clearing the warehouse clears prior cargo selection and blocks saving it', async () => {
+    const wrapper = render()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    await flushPromises()
+    await wrapper.get('[data-select]').trigger('click')
+    await wrapper.get('input[placeholder="填写仓库提供的预约编号"]').setValue('APT-AB')
+    await wrapper.findAll('[data-date]')[1]!.setValue('2026-10-09T07:00:00')
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('')
+    await wrapper.get('[data-save]').trigger('click')
+    expect(createFbaAppointment).not.toHaveBeenCalled()
+    expect(listInboundOrders).toHaveBeenCalledTimes(1)
+    expect(wrapper.find('[data-select]').exists()).toBe(false)
+  })
+
+  it('discards cargo responses from the previously selected warehouse', async () => {
+    let resolveOld!: (value: Awaited<ReturnType<typeof listInboundOrders>>) => void
+    vi.mocked(listInboundOrders).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
+    const wrapper = render()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    vi.mocked(listInboundOrders).mockResolvedValueOnce({ records: [], total: 0, page: 1, size: 10, pages: 0 })
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('LAX9')
+    await flushPromises()
+    resolveOld({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
+    await flushPromises()
+    expect(wrapper.findComponent({ name: 'DataTable' }).props('data')).toEqual([])
+  })
+
+  it('searches by keyword and exposes warehouse failures without accepting free text', async () => {
+    const wrapper = render()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    const select = wrapper.findAllComponents({ name: 'ElSelect' }).find(item => item.props('remoteMethod'))!
+    vi.mocked(listPlatformWarehouses).mockRejectedValueOnce(new Error('仓库暂不可用'))
+    await select.props('remoteMethod')(' LAX ')
+    await flushPromises()
+    expect(listPlatformWarehouses).toHaveBeenLastCalledWith(expect.objectContaining({ keyword: 'LAX', warehouseType: 'FBA', status: 'ACTIVE' }))
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('仓库加载失败')
+    expect(wrapper.findAll('select[aria-label="预约仓库"] option')).toHaveLength(1)
+    expect(listInboundOrders).not.toHaveBeenCalled()
+  })
+
+  it('keeps available arrivals and marks the result incomplete when appointments fail', async () => {
+    vi.mocked(listFbaAppointmentCalendar).mockRejectedValueOnce(new Error('预约暂不可用'))
+    vi.mocked(listArrivalCalendar).mockResolvedValueOnce([{ containerBookingId: '1', bookingNo: 'C-1', arrivalAt: '2026-10-09T09:00:00', arrivalType: 'ESTIMATED' }])
+    const wrapper = render()
+    await flushPromises()
+    const calendar = wrapper.findComponent({ name: 'AppointmentCalendarPanel' })
+    expect(calendar.props('incomplete')).toBe(true)
+    expect(calendar.props('events')).toHaveLength(1)
+    expect(calendar.props('events')[0].type).toBe('arrival')
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('送仓预约加载失败')
+  })
+
+  it('keeps delivery appointments when the arrival source fails', async () => {
+    vi.mocked(listArrivalCalendar).mockRejectedValueOnce(new Error('到港暂不可用'))
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValueOnce([{ version: 0, id: '1', appointmentNo: 'APT-AB', appointmentAt: '2026-10-09T09:00:00', expectedLoadingAt: '2026-10-09T07:00:00', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] }])
+    const wrapper = render()
+    await flushPromises()
+    const calendar = wrapper.findComponent({ name: 'AppointmentCalendarPanel' })
+    expect(calendar.props('incomplete')).toBe(true)
+    expect(calendar.props('events')[0].key).toBe('APT-AB')
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('船舶到港加载失败')
+  })
+
+  it('resolves an external booking deep link through the backend before opening followup', async () => {
+    routing.query = { sourceKey: 'BOOKING:B-1', customerId: 'A', destinationKey: 'FBA:ONT8' }
+    vi.mocked(resolvePlanningSource).mockResolvedValueOnce({ source: { sourceKey: 'BOOKING:B-1', customerId: 'A', orderId: null, inboundCode: null, bookingNo: 'B-1', containerNo: null, originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: null, sourceVersion: 'BOOKING:1', canFollowup: true, blockReasons: [] }, coverage: { status: 'SOURCE_NOT_MATERIALIZED', appointments: [], missingFields: ['REAL_CARGO_MATERIALS'], changeReviewRequired: false } })
+    const wrapper = render(); await flushPromises()
+    expect(resolvePlanningSource).toHaveBeenCalledWith(routing.query)
+    const dialog = wrapper.findComponent({ name: 'AppointmentFollowupDialog' })
+    expect(dialog.props('source').bookingNo).toBe('B-1')
+    expect(dialog.props('source').orderId).toBeNull()
+    expect(dialog.props('coverage').status).toBe('SOURCE_NOT_MATERIALIZED')
+    expect(createFbaAppointment).not.toHaveBeenCalled(); expect(saveFollowup).not.toHaveBeenCalled()
+  })
+
+  it('does not trust stale destination query data or open followup after a source error', async () => {
+    routing.query = { sourceKey: 'BOOKING:B-1', customerId: 'A', destinationKey: 'FBA:OLD' }
+    vi.mocked(resolvePlanningSource).mockRejectedValueOnce(new Error('目的地已变化'))
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.findComponent({ name: 'AppointmentFollowupDialog' }).exists()).toBe(false)
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('预约货源核对失败')
+  })
+
+  it('does not request deep-link cargo without the underlying source permission', async () => {
+    routing.query = { sourceKey: 'BOOKING:B-1', customerId: 'A', destinationKey: 'FBA:ONT8' }; routing.canSourceRead = false
+    const wrapper = render(); await flushPromises()
+    expect(resolvePlanningSource).not.toHaveBeenCalled()
+    expect(wrapper.findComponent({ name: 'AppointmentFollowupDialog' }).exists()).toBe(false)
+  })
+
 })
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 15a1939a..95ac5fc6 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
+import { useRoute } from 'vue-router'
+import { resolvePlanningSource, type ResolvedPlanningSource } from './planningApi'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
@@ -14,16 +17,26 @@ import {
   overseasWarehousePermissions as permission,
   type FbaAppointmentDto, type BatchFbaAppointmentPayload, type InboundOrderSummaryDto,
 } from '@/modules/overseas-warehouse'
+import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
 import AppointmentCalendarPanel, { type CalendarEvent } from './AppointmentCalendarPanel.vue'
+import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
+import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import { calendarRange, dateKey } from './calendar'
 import { deleteAppointment, listArrivalCalendar, type ArrivalCalendarEntry } from './api'
 
 const access = useAccessPreviewStore()
+const route = useRoute()
+const linkedSource = ref<ResolvedPlanningSource | null>(null)
+const linkError = ref<ApiErrorDetails | null>(null)
+const linkLoading = ref(false)
+let linkRequest = 0
+const workView = ref<'calendar' | 'cargo'>('calendar')
 const appointments = ref<FbaAppointmentDto[]>([])
 const arrivals = ref<ArrivalCalendarEntry[]>([])
 const range = ref(calendarRange(dateKey(new Date()), 'month'))
 const loading = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
+const sourceErrors = ref<Array<{ title: string; details: ApiErrorDetails }>>([])
 const errorTitle = ref('预约日历加载失败')
 const dialogError = ref<ApiErrorDetails | null>(null)
 const dialogOpen = ref(false)
@@ -32,6 +45,12 @@ const detailLoading = ref(false)
 const detailReady = ref(false)
 const editing = ref<FbaAppointmentDto | null>(null)
 const warehouse = ref('')
+const warehouseOptions = ref<PlatformWarehouseSummaryResource[]>([])
+const warehouseLoading = ref(false)
+const warehouseError = ref<ApiErrorDetails | null>(null)
+const warehouseKeyword = ref('')
+const warehouseTotal = ref(0)
+let warehouseRequest = 0
 const candidates = ref<InboundOrderSummaryDto[]>([])
 const selected = ref<InboundOrderSummaryDto[]>([])
 const candidateLoading = ref(false)
@@ -76,9 +95,9 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
     { label: '预约编号', value: appointment.appointmentNo },
     { label: '预约状态', value: statusLabels[appointment.appointmentStatus] || '—' },
     { label: '货物信息', value: `${appointment.selectedCount} 票 / ${new Set(appointment.items.map(item => item.customerId)).size} 个客户` },
-    { label: '入仓码', value: appointment.items.map(item => item.inboundCode).filter(Boolean).join('、') },
     { label: '预约备注', value: appointment.appointmentRemark },
   ],
+  inboundCodes: appointment.items.map(item => item.inboundCode),
   canEdit: access.can(permission.inboundOrderAppointment),
   canDelete: access.can('platform:appointment:delete'),
 }))])
@@ -90,21 +109,31 @@ async function load(nextRange = range.value) {
   calendarController = new AbortController()
   loading.value = true
   loadError.value = null
+  sourceErrors.value = []
   errorTitle.value = '预约日历加载失败'
   appointments.value = []
   arrivals.value = []
   try {
-    const [result, arrivalResult] = await Promise.all([
+    const [result, arrivalResult] = await Promise.allSettled([
       listFbaAppointmentCalendar(nextRange, calendarController.signal),
       listArrivalCalendar(nextRange, calendarController.signal),
     ])
-    if (request === calendarRequest) { appointments.value = result; arrivals.value = arrivalResult }
+    if (request !== calendarRequest) return
+    if (result.status === 'fulfilled') appointments.value = result.value
+    else sourceErrors.value.push({ title: '送仓预约加载失败', details: getApiErrorDetails(result.reason, '送仓预约加载失败') })
+    if (arrivalResult.status === 'fulfilled') arrivals.value = arrivalResult.value
+    else sourceErrors.value.push({ title: '船舶到港加载失败', details: getApiErrorDetails(arrivalResult.reason, '船舶到港加载失败') })
   } catch (error) {
     if (request === calendarRequest) loadError.value = getApiErrorDetails(error, '预约日历加载失败')
   } finally { if (request === calendarRequest) loading.value = false }
 }
 
 function openCreate(date: string) {
+  ++candidateRequest
+  ++detailRequest
+  detailLoading.value = false
+  candidateLoading.value = false
+  candidatePage.value = 1
   editing.value = null
   warehouse.value = ''
   searchedWarehouse.value = ''
@@ -117,6 +146,7 @@ function openCreate(date: string) {
   Object.assign(form, { appointmentEndAt: '', appointmentNo: '', appointmentAt: `${date}T09:00:00`, expectedLoadingAt: '', appointmentStatus: 'PENDING', appointmentRemark: '' })
   dialogOpen.value = true
   detailReady.value = true
+  void searchWarehouses('')
 }
 
 async function openEdit(event: CalendarEvent) {
@@ -141,14 +171,38 @@ async function openEdit(event: CalendarEvent) {
   } finally { if (request === detailRequest) detailLoading.value = false }
 }
 
-async function loadCandidates(search = false) {
-  if (search) {
-    searchedWarehouse.value = warehouse.value.trim().toUpperCase()
-    candidatePage.value = 1
-    selected.value = []
-    selectionEpoch.value++
-  }
-  if (!searchedWarehouse.value) { ElMessage.warning('请先输入目的仓编码'); return }
+async function searchWarehouses(keyword: string) {
+  warehouseKeyword.value = keyword
+  const request = ++warehouseRequest
+  warehouseLoading.value = true
+  warehouseError.value = null
+  warehouseOptions.value = []
+  warehouseTotal.value = 0
+  try {
+    const result = await listPlatformWarehouses({ page: 1, size: 50, keyword: keyword.trim() || undefined, warehouseType: 'FBA', status: 'ACTIVE' })
+    if (request !== warehouseRequest || !dialogOpen.value) return
+    warehouseOptions.value = result.records.filter(item => item.warehouseType === 'FBA' && item.status === 'ACTIVE')
+    warehouseTotal.value = result.total
+  } catch (error) {
+    if (request === warehouseRequest) warehouseError.value = getApiErrorDetails(error, '仓库搜索失败，请重试')
+  } finally { if (request === warehouseRequest) warehouseLoading.value = false }
+}
+
+function changeWarehouse(value: string) {
+  ++candidateRequest
+  candidateLoading.value = false
+  candidates.value = []
+  selected.value = []
+  candidateTotal.value = 0
+  candidateError.value = null
+  candidatePage.value = 1
+  selectionEpoch.value++
+  searchedWarehouse.value = value
+  if (value) void loadCandidates()
+}
+
+async function loadCandidates() {
+  if (!searchedWarehouse.value) return
   candidateLoading.value = true
   candidateError.value = null
   const request = ++candidateRequest
@@ -171,6 +225,8 @@ async function save() {
     ElMessage.warning('请填写预约号、预约送仓时间和预计装车时间'); return
   }
   if (!editing.value) {
+    if (!warehouse.value || warehouse.value !== searchedWarehouse.value || candidateLoading.value || candidateError.value) { ElMessage.warning('请先选择仓库并等待货物加载完成'); return }
+    if (selected.value.some(item => item.fbaWarehouseCode !== warehouse.value)) { ElMessage.warning('请重新选择当前仓库的货物'); return }
     if (!selected.value.length) { ElMessage.warning('请选择需要预约的货物'); return }
     if (new Set(selected.value.map(item => item.fbaWarehouseCode)).size !== 1) {
       ElMessage.warning('同一预约的货物必须送往同一目的仓'); return
@@ -212,41 +268,93 @@ async function remove(event: CalendarEvent) {
   } finally { loading.value = false }
 }
 
+watch(dialogOpen, open => {
+  if (!open) { ++candidateRequest; ++detailRequest; ++warehouseRequest; candidateLoading.value = false; warehouseLoading.value = false; detailLoading.value = false; detailReady.value = false }
+})
+
+async function resolveLink() {
+  const request = ++linkRequest
+  linkedSource.value = null; linkError.value = null; linkLoading.value = false
+  const { sourceKey, customerId, destinationKey } = route.query
+  if (!sourceKey && !customerId && !destinationKey) return
+  if (typeof sourceKey !== 'string' || typeof customerId !== 'string' || typeof destinationKey !== 'string') {
+    linkError.value = { message: '货物链接不完整，请返回原登记重新打开' }; return
+  }
+  if (!access.can(permission.lastMileOrderList)) { linkError.value = { message: '当前账号没有货源读取权限，请联系预约负责人处理' }; return }
+  linkLoading.value = true
+  try {
+    const result = await resolvePlanningSource({ sourceKey, customerId, destinationKey })
+    if (request === linkRequest) linkedSource.value = result
+  } catch (cause) { if (request === linkRequest) linkError.value = getApiErrorDetails(cause, '预约货源核对失败') }
+  finally { if (request === linkRequest) linkLoading.value = false }
+}
+watch(() => [route.query.sourceKey, route.query.customerId, route.query.destinationKey], resolveLink, { immediate: true })
+
 onMounted(() => load())
-onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest; calendarController?.abort() })
+onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest; ++warehouseRequest; ++linkRequest; calendarController?.abort() })
 </script>
 
 <template>
   <AdminPage class="admin-density">
+    <p v-if="linkLoading">正在核对预约货源…</p>
+    <LoadErrorState v-if="linkError" title="预约货源核对失败" :message="linkError.message" :loading="linkLoading" @retry="resolveLink" />
+    <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" @close="linkedSource = null" />
+    <div class="density-status-tabs" role="group" aria-label="预约工作视图">
+      <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">已开船 FBA 货物</button>
+    </div>
+    <AppointmentCargoPanel v-if="workView === 'cargo'" />
+    <div v-show="workView === 'calendar'">
     <LoadErrorState v-if="loadError" :title="errorTitle" :message="loadError.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
-    <AppointmentCalendarPanel :events="events" :loading="loading" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" />
-    <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" confirm-text="保存" :confirm-loading="saving" :confirm-disabled="detailLoading" @confirm="save">
+    <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
+    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" />
+    </div>
+    <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" confirm-text="保存" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
       <div v-loading="detailLoading">
         <el-form label-position="top" class="calendar-form density-form">
-          <el-form-item label="预约送仓时间" required><el-date-picker v-model="form.appointmentAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
-          <el-form-item label="预约结束时间"><el-date-picker v-model="form.appointmentEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
-          <el-form-item label="预计装车时间" required><el-date-picker v-model="form.expectedLoadingAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
-          <el-form-item label="预约仓库" required><el-input v-model="warehouse" :readonly="!!editing" placeholder="例如 ONT8" maxlength="128" /></el-form-item>
-          <el-form-item label="预约编号" required><el-input v-model="form.appointmentNo" :readonly="!!editing" maxlength="64" placeholder="请输入预约编号" /></el-form-item>
-          <el-form-item label="预约状态" required><el-select v-model="form.appointmentStatus"><el-option v-for="(label, value) in statusLabels" :key="value" :value="value" :label="label" /></el-select></el-form-item>
-          <el-form-item label="预约备注"><el-input v-model="form.appointmentRemark" maxlength="1000" placeholder="请输入预约备注（选填）" /></el-form-item>
+          <el-form-item label="预约仓库" required>
+            <el-input v-if="editing" :model-value="warehouse" readonly />
+            <el-select v-else v-model="warehouse" aria-label="预约仓库" filterable remote clearable :remote-method="searchWarehouses" :loading="warehouseLoading" placeholder="搜索仓库编码或名称" @change="changeWarehouse">
+              <el-option v-for="item in warehouseOptions" :key="String(item.id)" :value="item.warehouseCode" :label="item.warehouseName === item.warehouseCode ? item.warehouseCode : `${item.warehouseCode} · ${item.warehouseName}`" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="预约送仓时间" required><el-date-picker v-model="form.appointmentAt" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
+          <el-form-item label="预约编号" required><el-input v-model="form.appointmentNo" :readonly="!!editing" maxlength="64" placeholder="填写仓库提供的预约编号" /></el-form-item>
+          <el-form-item label="预计装车时间" required><el-date-picker v-model="form.expectedLoadingAt" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
+          <el-form-item v-if="editing" label="预约状态"><el-select v-model="form.appointmentStatus"><el-option v-for="(label, value) in statusLabels" :key="value" :value="value" :label="label" /></el-select></el-form-item>
         </el-form>
-        <template v-if="!editing">
+        <LoadErrorState v-if="!editing && warehouseError" title="仓库加载失败" :message="warehouseError.message" @retry="searchWarehouses(warehouseKeyword)" />
+        <p v-if="!editing && warehouseTotal > warehouseOptions.length && !warehouseError" class="appointment-hint">输入更完整的仓库编码或名称，缩小搜索范围。</p>
+        <details :key="editing?.appointmentNo || 'create'" class="appointment-extra">
+          <summary>补充信息（结束时间、备注{{ editing ? '' : '、状态' }}）</summary>
+          <el-form label-position="top" class="calendar-form density-form">
+            <el-form-item label="预约结束时间"><el-date-picker v-model="form.appointmentEndAt" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
+            <el-form-item v-if="!editing" label="预约状态"><el-select v-model="form.appointmentStatus"><el-option v-for="(label, value) in statusLabels" :key="value" :value="value" :label="label" /></el-select></el-form-item>
+            <el-form-item label="备注"><el-input v-model="form.appointmentRemark" maxlength="1000" placeholder="有特殊要求时填写" /></el-form-item>
+          </el-form>
+        </details>
+        <template v-if="!editing && warehouse">
           <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
-            <template #toolbar-actions><el-button type="primary" :loading="candidateLoading" @click="loadCandidates(true)">查询可预约货物</el-button></template>
             <template #notices><LoadErrorState v-if="candidateError" title="货物加载失败" :message="candidateError.message" @retry="loadCandidates()" /></template>
             <template #pagination-left>已选 {{ selected.length }} 票，可跨客户选择同一目的仓货物</template>
           </DataTable>
         </template>
-        <div v-else class="appointment-cargo">{{ editing.selectedCount }} 票货物 · 入仓码：{{ editing.items.map(item => item.inboundCode).join('、') || '—' }}</div>
+        <p v-else-if="!editing" class="appointment-hint">先选择预约仓库，即可勾选同仓货物，支持多个客户一起预约。</p>
+        <div v-else class="appointment-cargo">
+          <span>{{ editing.selectedCount }} 票货物</span>
+          <AppointmentInboundCodes :key="editing.appointmentNo" :codes="editing.items.map(item => item.inboundCode)" />
+        </div>
       </div>
     </AppDialog>
   </AdminPage>
 </template>
 
 <style scoped>
-.calendar-form { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 20px; }
-.calendar-form :deep(.el-date-editor) { width: 100%; }
+.calendar-form { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 var(--admin-space-6); }
+.calendar-form :deep(.el-select), .calendar-form :deep(.el-date-editor) { width: 100%; }
 .appointment-cargo { padding: 12px 0; line-height: 1.7; overflow-wrap: anywhere; font-size: 13px; }
+.appointment-extra { margin-bottom: var(--admin-space-5); }
+.appointment-extra summary { cursor: pointer; margin-bottom: var(--admin-space-3); font-size: var(--admin-font-body); }
+.appointment-hint { color: var(--el-text-color-secondary); font-size: var(--admin-font-body); margin: var(--admin-space-5) 0; }
 </style>
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts b/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts
new file mode 100644
index 00000000..6becc51e
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts
@@ -0,0 +1,44 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import { listPlanningCargo } from './planningApi'
+
+vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn() }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+const empty = { records: [], page: 1, size: 20, total: 0, pages: 0 }
+function render() {
+  return mount(AppointmentCargoPanel, { global: { stubs: {
+    DataTable: { name: 'DataTable', props: ['data', 'total', 'resultsVisible'], emits: ['update:page'], template: '<div><slot name="filters"/><slot name="notices"/><button data-next @click="$emit(\'update:page\',2)">下一页</button></div>' },
+    QueryToolbar: { name: 'QueryToolbar', emits: ['search'], template: '<button data-search @click="$emit(\'search\')">查询</button>' },
+    LoadErrorState: true, ApiErrorMeta: true, RowActions: true,
+  } } })
+}
+describe('appointment planning cargo query', () => {
+  beforeEach(() => { vi.resetAllMocks(); vi.mocked(listPlanningCargo).mockResolvedValue(empty) })
+  it('uses one server-page request per entry, page change and reset', async () => {
+    const wrapper = render(); await flushPromises()
+    expect(listPlanningCargo).toHaveBeenCalledTimes(1)
+    await wrapper.get('[data-next]').trigger('click'); await flushPromises()
+    expect(listPlanningCargo).toHaveBeenLastCalledWith({ page: 2, size: 20, keyword: undefined }, expect.any(AbortSignal))
+    await wrapper.get('[data-search]').trigger('click'); await flushPromises()
+    expect(listPlanningCargo).toHaveBeenCalledTimes(3)
+    expect(listPlanningCargo).toHaveBeenLastCalledWith({ page: 1, size: 20, keyword: undefined }, expect.any(AbortSignal))
+  })
+  it('shows a source failure instead of an authoritative empty list', async () => {
+    vi.mocked(listPlanningCargo).mockRejectedValueOnce(new Error('目录不可用'))
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).exists()).toBe(true)
+    expect(wrapper.findComponent({ name: 'DataTable' }).props('resultsVisible')).toBe(false)
+  })
+  it('discards a late previous page and uses the new server total', async () => {
+    let resolveOld!: (value: typeof empty) => void
+    vi.mocked(listPlanningCargo).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
+    const wrapper = render()
+    vi.mocked(listPlanningCargo).mockResolvedValueOnce({ ...empty, page: 2, total: 21, pages: 2 })
+    await wrapper.get('[data-next]').trigger('click'); await flushPromises()
+    resolveOld({ ...empty, total: 100, pages: 5 }); await flushPromises()
+    expect(wrapper.findComponent({ name: 'DataTable' }).props('total')).toBe(21)
+    expect(vi.mocked(listPlanningCargo).mock.calls[0]![1]!.aborted).toBe(true)
+  })
+})
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
new file mode 100644
index 00000000..d22a4b00
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import QueryToolbar, { type QueryModel, type QueryField } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import RowActions from '@/shared/components/RowActions.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listPlanningCargo, resolvePlanningSource, type ResolvedPlanningSource, type PlanningCargo } from './planningApi'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+
+const router = useRouter()
+const access = useAccessPreviewStore()
+const following = ref<ResolvedPlanningSource | null>(null)
+const followupError = ref<ApiErrorDetails | null>(null)
+let followupRequest = 0
+const query = ref<QueryModel>({ keyword: '' })
+const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '货物', placeholder: '入仓码、柜号、客户名称', width: 300 }]
+const page = ref(1), size = ref(20), total = ref(0)
+const rows = ref<PlanningCargo[]>([])
+const loading = ref(false)
+const error = ref<ApiErrorDetails | null>(null)
+let request = 0
+let controller: AbortController | undefined
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slot: 'actions', width: 150, fixed: 'left' },
+  { prop: 'inboundCode', label: '入仓码', minWidth: 180 },
+  { prop: 'customerName', label: '客户', minWidth: 150 },
+  { prop: 'containerNo', label: '柜号', minWidth: 150 },
+  { prop: 'originWarehouseName', label: '接仓点', minWidth: 140 },
+  { prop: 'destinationWarehouseCode', label: '目的FBA仓', width: 110 },
+  { prop: 'packages', label: '预报箱数', width: 100 },
+  { prop: 'receivedPackages', label: '实收箱数', width: 100 },
+  { prop: 'estimatedArrivalAt', label: '来源预计到港', minWidth: 170 },
+  { prop: 'estimatedWarehouseAt', label: '已保存预计到仓', minWidth: 170 },
+  { key: 'progress', label: '当前事项', slot: 'progress', minWidth: 170 },
+]
+
+async function load(reset = false) {
+  if (reset) page.value = 1
+  const current = ++request
+  controller?.abort(); controller = new AbortController()
+  loading.value = true; error.value = null
+  try {
+    const result = await listPlanningCargo({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }, controller.signal)
+    if (request !== current) return
+    rows.value = result.records; total.value = result.total
+  } catch (cause) {
+    if (request === current) { error.value = getApiErrorDetails(cause, '已开船货物加载失败'); rows.value = []; total.value = 0 }
+  } finally { if (request === current) loading.value = false }
+}
+function source(row: PlanningCargo) {
+  return router.push({ name: 'overseas-last-mile-order-detail', params: { orderId: row.orderId }, query: { customerId: row.customerId } })
+}
+async function openFollowup(row: PlanningCargo) {
+  const request = ++followupRequest
+  followupError.value = null
+  try {
+    const result = await resolvePlanningSource({ sourceKey: row.sourceKey, customerId: row.customerId, destinationKey: `FBA:${row.destinationWarehouseCode}` })
+    if (request === followupRequest) following.value = result
+  } catch (cause) { if (request === followupRequest) followupError.value = getApiErrorDetails(cause, '来源核对失败') }
+}
+onMounted(() => load())
+onBeforeUnmount(() => { ++request; ++followupRequest; controller?.abort() })
+</script>
+
+<template>
+  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="sourceKey" @update:page="load()" @update:page-size="load(true)">
+    <template #filters><QueryToolbar v-model="query" ariaLabel="在途货物查询" :fields="fields" :loading="loading" @search="load(true)" /></template>
+    <template #notices>
+      <LoadErrorState v-if="followupError" title="来源核对失败" :message="followupError.message" :show-retry="false" />
+      <LoadErrorState v-if="error" title="已开船货物加载失败" :message="error.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <p v-else class="cargo-note">来源预计时间供筹划核对，确认预约前请核对最新船期与货物备妥情况。</p>
+    </template>
+    <template #actions="{ row }"><RowActions :actions="[{ key: 'followup', label: '跟进' }, { key: 'source', label: '查看来源' }]" text-actions @action="key => key === 'followup' ? openFollowup(row as PlanningCargo) : source(row as PlanningCargo)" /></template>
+    <template #progress="{ row }">
+      <span v-if="row.detained">暂扣，待处理</span>
+      <span v-else-if="row.mixedDestinations">含多个目的地，待核对</span>
+      <span v-else-if="row.hasActiveAppointment">已有预约</span>
+      <span v-else>{{ row.hasInboundPlan ? '已建入仓计划，待安排' : '尚未建入仓计划' }}</span>
+    </template>
+  </DataTable>
+  <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" @close="following = null" />
+</template>
+
+<style scoped>
+.cargo-note { margin: var(--admin-space-3) 0; color: var(--el-text-color-secondary); font-size: var(--admin-font-caption); }
+</style>
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts b/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
new file mode 100644
index 00000000..dda264b8
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
@@ -0,0 +1,51 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import { getFollowups, saveFollowup, type PlanningSource } from './planningApi'
+
+vi.mock('./planningApi', () => ({ getFollowups: vi.fn(), saveFollowup: vi.fn() }))
+vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() } }))
+const history = { history: { records: [], page: 1, size: 10, total: 0, pages: 0 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 } }
+const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', canFollowup: true, blockReasons: [], orderId: '1', inboundCode: 'IN-1', bookingNo: null, containerNo: null, originWarehouseId: 'US-1', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: null, sourceVersion: null }
+function render(canWrite = true) {
+  return mount(AppointmentFollowupDialog, { props: { source, coverage: { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }, canWrite }, global: { stubs: {
+    AppDialog: { props: ['confirmDisabled'], template: '<div><slot/><button data-save :disabled="confirmDisabled" @click="$emit(\'confirm\')">保存</button></div>' },
+    ElForm: { template: '<form><slot/></form>' }, ElFormItem: { template: '<label><slot/></label>' },
+    ElInput: { props: ['modelValue', 'placeholder'], template: '<input :value="modelValue" :placeholder="placeholder" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
+    ElSelect: true, ElOption: true, ElDatePicker: true,
+    DataTable: true, LoadErrorState: true, ApiErrorMeta: true,
+  } } })
+}
+describe('appointment followup recovery', () => {
+  beforeEach(() => {
+    vi.resetAllMocks(); vi.mocked(getFollowups).mockResolvedValue(history)
+    vi.mocked(saveFollowup).mockResolvedValue({ stage: 'DRAYAGE_CONTACT', version: 1, contactedParty: null, result: '已联系', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' })
+  })
+  it('saves contact facts without requiring appointment, inbound plan or driver fields', async () => {
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('已联系，等待回复')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(saveFollowup).toHaveBeenCalledWith('ORDER:1', 'A', expect.objectContaining({ stage: 'DRAYAGE_CONTACT', expectedVersion: 0, result: '已联系，等待回复', followupDate: null }))
+    const body = vi.mocked(saveFollowup).mock.calls[0]![2]
+    expect(body).not.toHaveProperty('appointmentNo'); expect(body).not.toHaveProperty('driverId'); expect(body).not.toHaveProperty('operatorId')
+    expect(getFollowups).toHaveBeenCalledTimes(2)
+  })
+  it('retries an unknown outcome with the exact same body and persisted command key', async () => {
+    vi.mocked(saveFollowup).mockRejectedValueOnce(new Error('network'))
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('等待码头开放')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    const first = vi.mocked(saveFollowup).mock.calls[0]![2]
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(vi.mocked(saveFollowup).mock.calls[1]![2]).toEqual(first)
+    expect(first.idempotencyKey).toBeTruthy()
+  })
+  it('does not allow a write without write permission or a successfully loaded version', async () => {
+    const readonly = render(false); await flushPromises()
+    expect(readonly.get('[data-save]').attributes('disabled')).toBeDefined()
+    vi.mocked(getFollowups).mockRejectedValueOnce(new Error('unavailable'))
+    const failed = render(); await flushPromises()
+    expect(failed.get('[data-save]').attributes('disabled')).toBeDefined()
+    expect(saveFollowup).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
new file mode 100644
index 00000000..2593fe41
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getFollowups, saveFollowup, type PlanningSource, type AppointmentCoverage, type FollowupRecord, type FollowupStage, type SaveFollowup } from './planningApi'
+
+const props = defineProps<{ source: PlanningSource; coverage: AppointmentCoverage; canWrite: boolean }>()
+const emit = defineEmits<{ close: [] }>()
+const stages: Record<FollowupStage, string> = { DRAYAGE_CONTACT: '拖车联系', TERMINAL_APPOINTMENT: '码头约号', WAREHOUSE_RECEIVING: '接仓跟进', FBA_RECEIVING: 'FBA收货跟进' }
+const coverageNeeds: Record<string, string> = {
+  DESTINATION: '目的仓与原安排不一致，请核对。',
+  CARRIER_CONFIRMATION: '尚未确认承运，请先在原登记完成确认。',
+  REAL_CARGO_MATERIALS: '尚未关联实际货物资料，可先记录联系结果。',
+  CARGO_QUANTITY_REVIEW: '货量或重复关联需要核对。',
+  RECEIVING_APPOINTMENT: '尚未安排收货预约。',
+  UNCOVERED_CARGO: '部分货物尚未纳入收货预约。',
+  RECEIVING_CONFIRMATION: '尚未取得全部货物的收货确认。',
+  APPOINTMENT_TIMEZONE_UNVERIFIED: '原预约未记录时区，请核实收货地点当地时间。',
+  FBA_SHIPMENT_REFERENCES: 'FBA货件资料尚未齐全，请补充货件号或追踪号。',
+  SOURCE_CHANGED_REVIEW: '货源资料更新晚于预约，请核对是否需要改约。',
+}
+const form = reactive({ stage: (props.source.bookingNo ? 'FBA_RECEIVING' : 'DRAYAGE_CONTACT') as FollowupStage, contactedParty: '', result: '', nextAction: '', followupDate: '' })
+const rows = ref<FollowupRecord[]>([])
+const versions = ref<Record<FollowupStage, number>>({ DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 })
+const page = ref(1), size = ref(10), total = ref(0)
+const loading = ref(false), saving = ref(false), ready = ref(false)
+const error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails | null>(null)
+const pending = ref<SaveFollowup | null>(null)
+let generation = 0
+const columns: DataTableColumn[] = [
+  { key: 'stage', label: '事项', slot: 'stage', width: 120 },
+  { prop: 'contactedParty', label: '联系对象', minWidth: 130 },
+  { prop: 'result', label: '联系结果', minWidth: 200 },
+  { prop: 'nextAction', label: '下一步', minWidth: 150 },
+  { prop: 'followupDate', label: '下次跟进日', width: 120 },
+  { prop: 'operatorName', label: '跟进人', minWidth: 110 },
+]
+function rowKey(row: object) { const value = row as FollowupRecord; return `${value.stage}:${value.version}` }
+async function load() {
+  const request = ++generation
+  loading.value = true; error.value = null; ready.value = false
+  try {
+    const result = await getFollowups(props.source.sourceKey, props.source.customerId, page.value, size.value)
+    if (request !== generation) return
+    rows.value = result.history.records; total.value = result.history.total; versions.value = result.versions; ready.value = true
+  } catch (cause) { if (request === generation) error.value = getApiErrorDetails(cause, '跟进记录加载失败') }
+  finally { if (request === generation) loading.value = false }
+}
+async function save() {
+  if (!props.canWrite || !props.source.canFollowup || saving.value || !ready.value) return
+  if (!pending.value && (!form.result.trim() || (form.followupDate && !form.nextAction.trim()))) {
+    ElMessage.warning('请填写联系结果；设置下次跟进日时需填写下一步安排'); return
+  }
+  pending.value ||= { stage: form.stage, expectedVersion: versions.value[form.stage], idempotencyKey: crypto.randomUUID(),
+    contactedParty: form.contactedParty.trim() || undefined, result: form.result.trim(), nextAction: form.nextAction.trim() || undefined, followupDate: form.followupDate || null }
+  saving.value = true; saveError.value = null
+  try {
+    await saveFollowup(props.source.sourceKey, props.source.customerId, pending.value)
+    pending.value = null; form.result = ''; form.nextAction = ''; form.followupDate = ''; page.value = 1
+    ElMessage.success('跟进记录已保存'); await load()
+  } catch (cause) {
+    saveError.value = getApiErrorDetails(cause, '保存结果待确认，请重试本次保存')
+    if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(saveError.value.code || '')) { pending.value = null; await load() }
+  } finally { saving.value = false }
+}
+onMounted(load)
+onBeforeUnmount(() => { ++generation })
+</script>
+
+<template>
+  <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${source.inboundCode || source.bookingNo || '未关联入仓码'}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !source.canFollowup || !ready || loading" @confirm="save" @update:model-value="emit('close')">
+    <p>{{ source.containerNo || '—' }} · {{ source.originWarehouseName }} → {{ source.destinationWarehouseCode }}</p>
+    <LoadErrorState v-if="error" title="跟进记录加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <LoadErrorState v-if="saveError" title="跟进保存未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
+    <p v-for="reason in source.blockReasons" :key="reason">{{ reason }}</p>
+    <p v-if="coverage.changeReviewRequired">来源资料有变化，请核对原预约与运输安排。</p>
+    <p v-if="coverage.appointments.length">已关联预约：{{ coverage.appointments.map(item => item.appointmentNo).join('、') }}</p>
+    <p v-else>尚未关联收货预约；联系记录保存后仍需登记对方正式确认。</p>
+    <ul v-if="coverage.missingFields.length" aria-label="预约待核实事项"><li v-for="item in coverage.missingFields" :key="item">{{ coverageNeeds[item] || '存在待核实事项，请返回来源详情核对。' }}</li></ul>
+    <el-form v-if="canWrite && source.canFollowup" label-position="top" class="followup-form density-form" :disabled="saving || !!pending">
+      <el-form-item label="跟进事项"><el-select v-model="form.stage"><el-option v-for="(label,value) in stages" :key="value" :value="value" :label="label" /></el-select></el-form-item>
+      <el-form-item label="联系对象"><el-input v-model="form.contactedParty" maxlength="200" placeholder="本次联系的车队、码头或仓库" /></el-form-item>
+      <el-form-item label="下次跟进日期"><el-date-picker v-model="form.followupDate" type="date" value-format="YYYY-MM-DD" placeholder="业务地点当地日期" /></el-form-item>
+      <el-form-item label="联系结果" required class="wide"><el-input v-model="form.result" type="textarea" maxlength="1000" placeholder="记录对方反馈，不会自动确认预约" /></el-form-item>
+      <el-form-item label="下一步安排" class="wide"><el-input v-model="form.nextAction" maxlength="500" placeholder="填写待补资料或下次联系事项" /></el-form-item>
+    </el-form>
+    <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" :row-key="rowKey" @update:page="load" @update:page-size="page = 1; load()">
+      <template #stage="{ row }">{{ stages[row.stage as FollowupStage] }}</template>
+    </DataTable>
+  </AppDialog>
+</template>
+
+<style scoped>
+.followup-form { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 0 var(--admin-space-6); }
+.wide { grid-column: 1 / -1; }
+.followup-form :deep(.el-select), .followup-form :deep(.el-date-editor) { width: 100%; }
+</style>
diff --git a/src/modules/appointment-calendar/AppointmentInboundCodes.test.ts b/src/modules/appointment-calendar/AppointmentInboundCodes.test.ts
new file mode 100644
index 00000000..8aa7cedb
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentInboundCodes.test.ts
@@ -0,0 +1,41 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
+
+describe('appointment inbound code list', () => {
+  const codes = Array.from({ length: 20 }, (_, index) => `WT-LONG-INBOUND-CODE-${index + 1}`)
+
+  it('previews three codes, exposes the total and expands without losing full codes', async () => {
+    const wrapper = mount(AppointmentInboundCodes, { props: { codes } })
+    expect(wrapper.findAll('li')).toHaveLength(3)
+    expect(wrapper.text()).toContain('20 个')
+    expect(wrapper.get('button').text()).toContain('还有 17 个')
+    expect(wrapper.get('li').attributes('title')).toBe(codes[0])
+    expect(wrapper.get('button').attributes('aria-expanded')).toBe('false')
+    await wrapper.get('button').trigger('click')
+    expect(wrapper.findAll('li').map(row => row.text())).toEqual(codes)
+    expect(wrapper.get('ul').classes()).toContain('expanded')
+    expect(wrapper.get('ul').attributes('tabindex')).toBe('0')
+    expect(wrapper.get('button').attributes('aria-controls')).toBe(wrapper.get('ul').attributes('id'))
+    await wrapper.get('button').trigger('click')
+    expect(wrapper.findAll('li')).toHaveLength(3)
+  })
+
+  it('does not count missing or duplicate codes and shows no redundant toggle', () => {
+    const wrapper = mount(AppointmentInboundCodes, { props: { codes: [' A ', 'A', '', null, undefined, 'B'] } })
+    expect(wrapper.findAll('li').map(row => row.text())).toEqual(['A', 'B'])
+    expect(wrapper.text()).toContain('2 个')
+    expect(wrapper.find('button').exists()).toBe(false)
+    expect(mount(AppointmentInboundCodes, { props: { codes: [] } }).text()).toContain('—')
+  })
+
+  it('preserves expansion on equivalent data but resets when the appointment codes change', async () => {
+    const wrapper = mount(AppointmentInboundCodes, { props: { codes } })
+    await wrapper.get('button').trigger('click')
+    await wrapper.setProps({ codes: [...codes] })
+    expect(wrapper.findAll('li')).toHaveLength(20)
+    await wrapper.setProps({ codes: codes.map(code => `${code}-NEW`) })
+    expect(wrapper.findAll('li')).toHaveLength(3)
+    expect(wrapper.get('button').attributes('aria-expanded')).toBe('false')
+  })
+})
diff --git a/src/modules/appointment-calendar/AppointmentInboundCodes.vue b/src/modules/appointment-calendar/AppointmentInboundCodes.vue
new file mode 100644
index 00000000..a860aca9
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentInboundCodes.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { computed, ref, useId, watch } from 'vue'
+
+const props = defineProps<{ codes: Array<string | null | undefined> }>()
+const expanded = ref(false)
+const listId = useId()
+const codes = computed(() => [...new Set(props.codes.map(code => code?.trim()).filter((code): code is string => !!code))])
+const visibleCodes = computed(() => expanded.value ? codes.value : codes.value.slice(0, 3))
+watch(() => codes.value.join('\n'), () => { expanded.value = false })
+</script>
+
+<template>
+  <section class="inbound-codes" aria-label="关联入仓码">
+    <div class="codes-heading">
+      <span :title="`共 ${codes.length} 个入仓码`">入仓码 <span v-if="codes.length">（{{ codes.length }} 个）</span></span>
+      <button v-if="codes.length > 3" type="button" :aria-expanded="expanded" :aria-controls="listId" @click="expanded = !expanded">
+        {{ expanded ? '收起' : `查看全部（还有 ${codes.length - 3} 个）` }}
+      </button>
+    </div>
+    <ul v-if="codes.length" :id="listId" class="codes-list" :class="{ expanded }" :tabindex="expanded ? 0 : undefined" aria-label="入仓码列表">
+      <li v-for="code in visibleCodes" :key="code" :title="code">{{ code }}</li>
+    </ul>
+    <span v-else class="codes-empty">—</span>
+  </section>
+</template>
+
+<style scoped>
+.inbound-codes { min-width: 0; margin: var(--admin-space-5) 0; font-size: var(--admin-font-body); }
+.codes-heading { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: var(--admin-space-3); color: var(--el-text-color-secondary); font-size: var(--admin-font-caption); }
+.codes-heading button { border: 0; background: transparent; color: var(--el-color-primary); cursor: pointer; font: inherit; min-height: var(--admin-action-height); padding: 0; }
+.codes-list { list-style: none; padding: 0; margin: var(--admin-space-1) 0 0; line-height: 1.8; }
+.codes-list li { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.codes-list.expanded { max-height: 216px; overflow-y: auto; overscroll-behavior: contain; }
+.codes-list.expanded li { white-space: normal; overflow-wrap: anywhere; }
+.codes-heading button:focus-visible, .codes-list:focus-visible { outline: 2px solid var(--el-color-primary); outline-offset: 2px; }
+.codes-empty { display: block; margin-top: var(--admin-space-1); }
+</style>
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index c5095740..1f1093df 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -7,13 +7,18 @@
 | 页面/操作 | 原型承载与布局 | 实现约束 |
 |---|---|---|
 | 预约列表 | 左侧月/周日历，右侧选中日期详情 | 保留双栏日历；到港蓝色、送仓绿色，区分预计/实际到港 |
-| 新增预约 | 居中双列表单，原型最大宽度760px | 保留居中双列表单；为跨客户货物选择扩至1080px，在同弹框下方分页选择真实入仓货物 |
+| 新增预约 | 居中双列表单，原型最大宽度760px | 按2026-10-09用户简化要求，改用居中1080px三列表单；仓库从启用FBA主档远程搜索选择，选择后自动分页加载货物；主区保留仓库、送仓时间、预约编号、预计装车时间，结束时间/备注/新建默认预约中状态收至补充信息，在同弹框下方分页选择真实入仓货物 |
 | 编辑预约 | 复用居中表单 | 与入仓单共用记录；版本校验；真实货物归属不允许手填更改 |
 | 到港详情 | 当天安排右侧只读 | 使用货柜/船节点事实，无逐行详情请求，无模拟到港数据 |
 | 删除预约 | 二次确认 | 显式提示全部货物解除预约关联；独立删除权限，已关联有效排车拒绝删除 |
 | 月/周切换 | 顶部切换与前后按钮 | 周模式按7天移动，修正原型仍按月移动的问题 |
 | 多条安排 | 日历标签、右侧明细 | 月/周日格均最多显示3条，超出显示“还有N条”，悬停显示当天总数；日格固定高度，右侧全部展示并独立滚动 |
+| 多入仓码 | 用户2026-10-09补充截图：单预约20票导致两列详情被长字符串撑高 | 右侧卡片与编辑弹框共用独立整行入仓码列表；去空去重后显示总数，默认3条，长码悬停可读全文；超过3条可展开/收起，展开后216px内独立滚动并可键盘聚焦，不拼成长段文字 |
+| 在途货物及外接来源跟进 | 美国预约统一方案的提前联系需求 | 日历与已开船FBA列表切换；跟进在居中1080px弹框中承载，3列表单、联系结果及下一步整行，历史分页；BOOKING深链先由服务端核对，再展示原登记及真实预约缺项 |
+| 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
 
-预约结束时间未明确时允许为空；不把预计装车时间当结束时间。预约号、目的仓和货物来源遵守服务端合同。日历范围最多42天，每次范围变化查询预约与到港各一次；选择范围内日期不发送请求。候选只在用户点击查询时分页读取，跨页选择保留，重新查询清空。
+预约结束时间未明确时允许为空；不把预计装车时间当结束时间。预约号、目的仓和货物来源遵守服务端合同。日历范围最多42天，每次范围变化查询预约与到港各一次；选择范围内日期不发送请求。候选在选仓后自动分页读取，跨页选择保留；换仓立即清空旧数据/选择并丢弃旧请求响应，清空仓库后不发送货物查询。后端必填的预计装车时间保留，不自动伪造；预约编号继续填写仓库提供的业务号。仓库请求失败可重试；仅展示前50个匹配仓，超出提示缩小关键词。
+
+本轮视觉验收：待人工1920×1080截图确认。
 
 视觉验收目标为1920×1080、100%缩放。该矩阵描述设计和代码边界，不代替测试环境浏览器验收证据。
diff --git a/src/modules/appointment-calendar/planningApi.test.ts b/src/modules/appointment-calendar/planningApi.test.ts
new file mode 100644
index 00000000..f965ffa9
--- /dev/null
+++ b/src/modules/appointment-calendar/planningApi.test.ts
@@ -0,0 +1,14 @@
+import { expect, it, vi } from 'vitest'
+import { http } from '@/shared/api/http'
+import { listPlanningCargo } from './planningApi'
+vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn() }, unwrapApiResponse: <T>(value: { data: T }) => value.data }))
+
+it('uses the gateway planning route and preserves stable source IDs and null predictions', async () => {
+  vi.mocked(http.get).mockResolvedValue({ data: { records: [{ sourceKey: 'ORDER:9007199254740993', orderId: '9007199254740993', estimatedArrivalAt: null }], page: '2', size: '20', total: '21', pages: '2' } })
+  const controller = new AbortController()
+  const result = await listPlanningCargo({ page: 2, size: 20, keyword: 'IN-A' }, controller.signal)
+  expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/appointment-planning/cargo', { params: { page: 2, size: 20, keyword: 'IN-A' }, signal: controller.signal })
+  expect(result.records[0]!.orderId).toBe('9007199254740993')
+  expect(result.records[0]!.estimatedArrivalAt).toBeNull()
+  expect(result.total).toBe(21)
+})
diff --git a/src/modules/appointment-calendar/planningApi.ts b/src/modules/appointment-calendar/planningApi.ts
new file mode 100644
index 00000000..9a437ba4
--- /dev/null
+++ b/src/modules/appointment-calendar/planningApi.ts
@@ -0,0 +1,71 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+export interface PlanningCargo {
+  sourceKey: string
+  orderId: string
+  customerId: string
+  customerName: string | null
+  inboundCode: string | null
+  containerBookingId: string
+  containerNo: string | null
+  originWarehouseId: string
+  originWarehouseCode: string
+  originWarehouseName: string
+  destinationWarehouseCode: string
+  packages: number | null
+  receivedPackages: number | null
+  shippedPackages: number | null
+  sourcePalletCount: number | null
+  volumeCbm: number | null
+  estimatedArrivalAt: string | null
+  estimatedWarehouseAt: string | null
+  orderVersion: number
+  standardNode: string
+  shippingVersion: string | null
+  shippingObservedAt: string | null
+  shippingProvider: string | null
+  hasInboundPlan: boolean
+  hasActiveAppointment: boolean
+  detained: boolean
+  mixedDestinations: boolean
+}
+export interface PlanningCargoPage { records: PlanningCargo[]; page: number; size: number; total: number; pages: number }
+export async function listPlanningCargo(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const response = await http.get<ApiEnvelope<PlanningCargoPage>, ApiEnvelope<PlanningCargoPage>>(
+    '/platform/v1/last-leg/appointment-planning/cargo', { params: query, signal },
+  )
+  const page = unwrapApiResponse(response)
+  return { ...page, page: Number(page.page), size: Number(page.size), total: Number(page.total), pages: Number(page.pages) }
+}
+
+export type FollowupStage = 'DRAYAGE_CONTACT' | 'TERMINAL_APPOINTMENT' | 'WAREHOUSE_RECEIVING' | 'FBA_RECEIVING'
+export interface FollowupRecord { stage: FollowupStage; version: number; contactedParty: string | null; result: string; nextAction: string | null; followupDate: string | null; operatorName: string | null; createdAt: string }
+export interface FollowupHistory { history: { records: FollowupRecord[]; page: number; size: number; total: number; pages: number }; versions: Record<FollowupStage, number> }
+export interface SaveFollowup { stage: FollowupStage; expectedVersion: number; idempotencyKey: string; contactedParty?: string; result: string; nextAction?: string; followupDate: string | null }
+export async function getFollowups(sourceKey: string, customerId: string, page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<FollowupHistory>, ApiEnvelope<FollowupHistory>>(
+    `/platform/v1/last-leg/appointment-planning/sources/${encodeURIComponent(sourceKey)}/follow-ups`, { params: { customerId, page, size } },
+  ))
+  return { ...result, history: { ...result.history, total: Number(result.history.total) }, versions: Object.fromEntries(Object.entries(result.versions).map(([stage, version]) => [stage, Number(version)])) as Record<FollowupStage, number> }
+}
+export async function saveFollowup(sourceKey: string, customerId: string, body: SaveFollowup) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<FollowupRecord>, ApiEnvelope<FollowupRecord>>(
+    `/platform/v1/last-leg/appointment-planning/sources/${encodeURIComponent(sourceKey)}/follow-ups`, body, { params: { customerId } },
+  ))
+}
+
+export interface PlanningSource {
+  sourceKey: string; customerId: string; orderId: string | null; inboundCode: string | null; bookingNo: string | null;
+  containerNo: string | null; originWarehouseId: string; originWarehouseName: string; destinationKey: string;
+  destinationWarehouseCode: string; packages: number | null; sourceVersion: string | null; canFollowup: boolean; blockReasons: string[];
+}
+export interface AppointmentCoverage {
+  status: string; missingFields: string[]; changeReviewRequired: boolean;
+  appointments: Array<{ appointmentNo: string; confirmationNo: string | null; status: string; confirmedAt: string | null; confirmedEndAt: string | null; timezone: string | null }>;
+}
+export interface ResolvedPlanningSource { source: PlanningSource; coverage: AppointmentCoverage }
+export async function resolvePlanningSource(query: { sourceKey: string; customerId: string; destinationKey?: string }) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<ResolvedPlanningSource>, ApiEnvelope<ResolvedPlanningSource>>(
+    '/platform/v1/last-leg/appointment-planning/sources/resolve', { params: query },
+  ))
+}
diff --git a/src/modules/overseas-master-data/AGENTS.md b/src/modules/overseas-master-data/AGENTS.md
index d9c3756a..007951d4 100644
--- a/src/modules/overseas-master-data/AGENTS.md
+++ b/src/modules/overseas-master-data/AGENTS.md
@@ -37,3 +37,5 @@
 - 外接履约弹框`TripBookingFulfillmentDialog.vue`为1080px居中：登记来货、按服务器实托/receiptHash核对实收与约定价格、输入客户排车单号关联；来货详情只读。只有显式打开来货/实收弹框才查询来源，不逐行请求。关联后刷新外接列表及车次详情，更新全部排车成员和理货审核状态；预订取消不删除来货或库存。
 
 - 报价、汇率、车辆、车队报价与出车记录导出统一使用 `../downloads/` 的 `useExportTask`，按当前筛选创建 XLSX 任务；按钮要求原业务导出权限和 `platform:download:list`。出车成本可见性由 File 根据账号权限冻结，不接受页面声明。CSV 仅用于车队报价导入模板。
+
+- 拼车接货简化沿 `FleetCapacityOfferModels.Inquiry.progress` 展示缺项、是否保位、负责人及主要动作，`appointmentCoverage`只消费预约侧真实投影，不以承运成功冒充预约。`CapacityInquiryFulfillment.vue`从原登记按需读取本票履约，不授予销售整车读取权限；来货、核量、排入本车分别保持原写权限。`TripPreparationDialog.vue`和`TripDispatchSelector.vue`通过`index.ts`公开给排车/预约使用；前者提交原子`/fleet/trips/prepare`并衔接容量发布，后者只读取本仓合格候选。新版合同见`fleet-preparation-v1.yaml`及拼车唯一主契约。
diff --git a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
index b1d504c3..d68b2679 100644
--- a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
@@ -130,3 +130,17 @@
 | 外接来货与实收复核、关联发运 | 首版外接货自送起运仓、按实际货量确认费用的已确认方案 | 车次外接行操作打开1080px居中弹框；现有PDA转运实收承载现场作业 | 已接真实来源、实测差异与运费复核、版本/hash和客户排车关联；未将本地验证当作环境验收 |
 
 | 出车运营应收/实收读取 | `新版.html:8941–8987` 出车记录列表；车辆规划第4.1节及本轮明确确认的Finance权威口径 | 沿原运营列表应收/实收列，点击读取；金额来源在620px只读浮层展示，不新增菜单或财务写表单 | 单车次按需读取，未分配明确显示待分配，缺权限不请求；真实1920×1080、100%视觉及请求量待总控验收 |
+
+## 拼车接货操作简化开发矩阵（2026-10-09）
+
+依据：用户要求按最新版《拼车数据入口与操作简化评估草案》第七、八节开发，沿既有居中1080px表单和独立发布详情，不引入外部原型。
+
+| 页面 | 操作 | 承载与尺寸 | 调整及验收边界 |
+|---|---|---|---|
+| 拼车接货 | 可拼车次、我的登记、待办 | integrated列表，操作列左置 | 直接登记，销售隐藏容量计算过程，服务端返回处理进度；待1920×1080人工截图 |
+| 客户货物登记 | 新增、补充资料、只读跟进 | 1080px居中三列 | 首屏客户/目的地/已知货量；确认前必填折叠但显示缺项；始终选填独立；单站自动带入 |
+| 客户货物登记 | 确认承运、取消 | 既有居中确认框 | 展示对象及保位/商业订单影响，保存成功不冒充确认成功 |
+| 客户货物登记 | 安排来货、核量、排入本车 | 1080px居中，复用履约表单 | 原登记连续处理，按服务端资格；关联业务按权限跳转 |
+| 车次准备 | 选择合格排车、新建或加入车次、连续发布 | 1080px居中，复用车次与发布表单 | 来源带入、版本和失败续办，未授权的预约事实不由此生成 |
+
+本次无新增文件预览、删除或停用方式；未改变的操作沿既有矩阵。代码测试与真实页面验收分别报告。
diff --git a/src/modules/overseas-master-data/api/capacityOffers.ts b/src/modules/overseas-master-data/api/capacityOffers.ts
index a70a955c..35e4d83f 100644
--- a/src/modules/overseas-master-data/api/capacityOffers.ts
+++ b/src/modules/overseas-master-data/api/capacityOffers.ts
@@ -1,3 +1,4 @@
+import { normalizeBooking, normalizeIncoming, normalizeBookingResult } from './tripBookings'
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import type { CapacityOffer, CapacityInquiry, CapacityOfferDetail, CapacityLoad, OfferPage, OfferQuery, InquiryQuery, OfferWrite, OfferCommand, InquiryWrite, InquiryCommand, OfferResult, InquiryResult, OfferCustomerOption } from '../capacityOfferTypes'
 import { normalizeFleetQuotePage, normalizeFleetQuoteSource, type WireQuotePage } from './fleetQuoteCandidates'
@@ -5,7 +6,7 @@ import type { TripBookingQuoteCriteria } from './tripBookings'
 const base = '/platform/v1/last-leg/fleet/capacity-offers'
 const path = (value: string) => `${base}/${encodeURIComponent(value)}`
 const inquiryPath = (value: string) => `${base}/inquiries/${encodeURIComponent(value)}`
-const number = (value: number) => { const n = Number(value); if (value == null || !Number.isFinite(n)) throw new Error('运力数据数值无效'); return n }
+const number = (value: number | string) => { const n = Number(value); if (value == null || String(value).trim() === '' || !Number.isFinite(n)) throw new Error('运力数据数值无效'); return n }
 const nullable = (value: number | null) => value == null ? null : number(value)
 const load = (value: CapacityLoad | null) => value == null ? null : { palletSpaces: number(value.palletSpaces), weightKg: number(value.weightKg), volumeCbm: number(value.volumeCbm) }
 export function normalizeOffer(value: CapacityOffer): CapacityOffer { return { ...value, recordVersion: number(value.recordVersion), tripRecordVersion: number(value.tripRecordVersion), destinations: value.destinations.map(d => ({ ...d, deliveryIndex: number(d.deliveryIndex), remaining: load(d.remaining) })), segments: value.segments.map(s => ({ ...s, fromIndex: number(s.fromIndex), toIndex: number(s.toIndex), planned: load(s.planned), reserved: load(s.reserved), remaining: load(s.remaining) })) } }
@@ -26,3 +27,13 @@ export async function saveCapacityInquiry(offerNo: string, bookingNo: string | n
 export async function commandCapacityInquiry(bookingNo: string, action: 'confirm' | 'cancel', body: InquiryCommand) { return inquiryResult(await post<InquiryResult>(`${inquiryPath(bookingNo)}/${action}`, body)) }
 export const listOfferCustomers = (keyword?: string) => get<OfferCustomerOption[]>(`${base}/customer-options`, { keyword })
 export async function listOfferQuotes(offerNo: string, query: TripBookingQuoteCriteria) { return normalizeFleetQuotePage(await get<WireQuotePage>(`${path(offerNo)}/quote-candidates`, query)) }
+
+export async function getInquiryFulfillment(bookingNo: string) {
+  const value = await get<{ booking: import('./tripBookings').WireBooking; preview: { tripRecordVersion: number | string; recordVersion: number | string; incoming: import('./tripBookings').WireIncoming | null }; plannedDepartureAt: string }>(`${inquiryPath(bookingNo)}/fulfillment`)
+  return { booking: normalizeBooking(value.booking), plannedDepartureAt: value.plannedDepartureAt, preview: { ...value.preview, tripRecordVersion: number(value.preview.tripRecordVersion), recordVersion: number(value.preview.recordVersion), incoming: value.preview.incoming ? normalizeIncoming(value.preview.incoming) : null } }
+}
+export async function commandInquiryFulfillment(bookingNo: string, action: 'incoming' | 'receipt-confirmation' | 'arrange-dispatch', body: import('../bookingTypes').TripIncomingStart | import('../bookingTypes').TripIncomingAccept | import('../bookingTypes').TripBookingBind | import('../bookingTypes').TripBookingCommand) {
+  return normalizeBookingResult(await post<import('./tripBookings').WireResult>(`${inquiryPath(bookingNo)}/${action}`, body))
+}
+
+export async function saveAndConfirmInquiry(bookingNo: string, body: InquiryWrite) { return inquiryResult(await post<InquiryResult>(`${inquiryPath(bookingNo)}/save-and-confirm`, body)) }
diff --git a/src/modules/overseas-master-data/api/tripBookings.ts b/src/modules/overseas-master-data/api/tripBookings.ts
index 43384cf3..6e3e8050 100644
--- a/src/modules/overseas-master-data/api/tripBookings.ts
+++ b/src/modules/overseas-master-data/api/tripBookings.ts
@@ -6,16 +6,16 @@ const path = (tripNo: string) => `${base}/${encodeURIComponent(tripNo)}/bookings
 type N = number | string
 type WireCargo = Omit<TripBookingCargo, 'packageCount' | 'palletSpaces' | 'weightKg' | 'volumeCbm' | 'unitPrice'> & { packageCount: N | null; palletSpaces: N | null; weightKg: N | null; volumeCbm: N | null; unitPrice: N | null }
 export type WireBooking = Omit<TripBooking, 'recordVersion' | 'agreedAmount' | 'cargo' | 'receipt' | 'quoteSource' | 'expectedPalletCount'> & { expectedPalletCount: N | null; recordVersion: N; agreedAmount: N | null; cargo: WireCargo; receipt: WireReceipt | null; quoteSource?: WireSnapshot | null }
-type WireIncoming = Omit<TripIncomingEvidence, 'receivedPackages' | 'pallets'> & { receivedPackages: N; pallets: (Omit<TripIncomingEvidence['pallets'][number], 'packages' | 'weightKg' | 'volumeCbm'> & { packages: N; weightKg: N | null; volumeCbm: N | null })[] }
+export type WireIncoming = Omit<TripIncomingEvidence, 'receivedPackages' | 'pallets'> & { receivedPackages: N; pallets: (Omit<TripIncomingEvidence['pallets'][number], 'packages' | 'weightKg' | 'volumeCbm'> & { packages: N; weightKg: N | null; volumeCbm: N | null })[] }
 type WireReceipt = Omit<TripAcceptedReceipt, 'source' | 'pallets'> & { source: WireIncoming; pallets: { warehousePalletId: string; palletSpaces: N }[] }
-type WireResult = { tripRecordVersion: N; booking: WireBooking; replayed: boolean }
+export type WireResult = { tripRecordVersion: N; booking: WireBooking; replayed: boolean }
 const number = (value: N) => { const result = Number(value); if (value == null || String(value).trim() === '' || !Number.isFinite(result) || result < 0) throw new Error('外接预订数值无效'); return result }
 const integer = (value: N) => { const result = number(value); if (!Number.isSafeInteger(result)) throw new Error('外接预订版本或数量无效'); return result }
 const nullable = (value: N | null) => value == null ? null : number(value)
-const incoming = (value: WireIncoming): TripIncomingEvidence => ({ ...value, receivedPackages: integer(value.receivedPackages), pallets: value.pallets.map(row => ({ ...row, packages: integer(row.packages), weightKg: nullable(row.weightKg), volumeCbm: nullable(row.volumeCbm) })) })
-export const normalizeBooking = (value: WireBooking): TripBooking => ({ ...value, expectedPalletCount: value.expectedPalletCount == null ? null : integer(value.expectedPalletCount), quoteSource: value.quoteSource == null ? null : normalizeFleetQuoteSource(value.quoteSource), receipt: value.receipt == null ? null : { ...value.receipt, source: incoming(value.receipt.source), pallets: value.receipt.pallets.map(row => ({ ...row, palletSpaces: integer(row.palletSpaces) })) }, recordVersion: integer(value.recordVersion), agreedAmount: nullable(value.agreedAmount), cargo: { ...value.cargo,
+export const normalizeIncoming = (value: WireIncoming): TripIncomingEvidence => ({ ...value, receivedPackages: integer(value.receivedPackages), pallets: value.pallets.map(row => ({ ...row, packages: integer(row.packages), weightKg: nullable(row.weightKg), volumeCbm: nullable(row.volumeCbm) })) })
+export const normalizeBooking = (value: WireBooking): TripBooking => ({ ...value, expectedPalletCount: value.expectedPalletCount == null ? null : integer(value.expectedPalletCount), quoteSource: value.quoteSource == null ? null : normalizeFleetQuoteSource(value.quoteSource), receipt: value.receipt == null ? null : { ...value.receipt, source: normalizeIncoming(value.receipt.source), pallets: value.receipt.pallets.map(row => ({ ...row, palletSpaces: integer(row.palletSpaces) })) }, recordVersion: integer(value.recordVersion), agreedAmount: nullable(value.agreedAmount), cargo: { ...value.cargo,
   packageCount: value.cargo.packageCount == null ? null : integer(value.cargo.packageCount), palletSpaces: value.cargo.palletSpaces == null ? null : integer(value.cargo.palletSpaces), weightKg: nullable(value.cargo.weightKg), volumeCbm: nullable(value.cargo.volumeCbm), unitPrice: nullable(value.cargo.unitPrice) } })
-const result = (value: WireResult): TripBookingResult => ({ tripRecordVersion: integer(value.tripRecordVersion), booking: normalizeBooking(value.booking), replayed: value.replayed === true })
+export const normalizeBookingResult = (value: WireResult): TripBookingResult => ({ tripRecordVersion: integer(value.tripRecordVersion), booking: normalizeBooking(value.booking), replayed: value.replayed === true })
 export interface TripBookingQuoteCriteria { customerId: string; destinationKey: string; currency: 'CNY' | 'USD'; priceBasis: 'PALLET' | 'ORDER'; page?: number; size?: number }
 export async function listTripBookingQuoteCandidates(tripNo: string, criteria: TripBookingQuoteCriteria) {
   return normalizeFleetQuotePage(unwrapApiResponse(await http.get<ApiEnvelope<WireQuotePage>, ApiEnvelope<WireQuotePage>>(`${path(tripNo)}/quote-candidates`, { params: criteria })))
@@ -28,13 +28,13 @@ export async function listTripBookings(tripNo: string): Promise<TripBookingList>
   return { tripRecordVersion: integer(value.tripRecordVersion), records: value.records.map(normalizeBooking) }
 }
 export async function createTripBooking(tripNo: string, body: TripBookingCreate): Promise<TripBookingResult> {
-  return result(unwrapApiResponse(await http.post<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(path(tripNo), body)))
+  return normalizeBookingResult(unwrapApiResponse(await http.post<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(path(tripNo), body)))
 }
 export async function updateTripBooking(tripNo: string, bookingNo: string, body: TripBookingUpdate): Promise<TripBookingResult> {
-  return result(unwrapApiResponse(await http.put<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(`${path(tripNo)}/${encodeURIComponent(bookingNo)}`, body)))
+  return normalizeBookingResult(unwrapApiResponse(await http.put<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(`${path(tripNo)}/${encodeURIComponent(bookingNo)}`, body)))
 }
 async function command(tripNo: string, bookingNo: string, action: string, body: TripBookingCommand): Promise<TripBookingResult> {
-  return result(unwrapApiResponse(await http.post<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(`${path(tripNo)}/${encodeURIComponent(bookingNo)}/${action}`, body)))
+  return normalizeBookingResult(unwrapApiResponse(await http.post<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(`${path(tripNo)}/${encodeURIComponent(bookingNo)}/${action}`, body)))
 }
 export const confirmTripBooking = (tripNo: string, bookingNo: string, body: TripBookingCommand) => command(tripNo, bookingNo, 'confirm', body)
 export const cancelTripBooking = (tripNo: string, bookingNo: string, body: TripBookingCommand) => command(tripNo, bookingNo, 'cancel', body)
@@ -42,10 +42,10 @@ export const cancelTripBooking = (tripNo: string, bookingNo: string, body: TripB
 const bookingPath = (tripNo: string, bookingNo: string) => `${path(tripNo)}/${encodeURIComponent(bookingNo)}`
 export async function getTripIncoming(tripNo: string, bookingNo: string): Promise<TripIncomingPreview> {
   const value = unwrapApiResponse(await http.get<ApiEnvelope<{ tripRecordVersion: N; recordVersion: N; incoming: WireIncoming | null }>, ApiEnvelope<{ tripRecordVersion: N; recordVersion: N; incoming: WireIncoming | null }>>(`${bookingPath(tripNo, bookingNo)}/incoming`))
-  return { tripRecordVersion: integer(value.tripRecordVersion), recordVersion: integer(value.recordVersion), incoming: value.incoming == null ? null : incoming(value.incoming) }
+  return { tripRecordVersion: integer(value.tripRecordVersion), recordVersion: integer(value.recordVersion), incoming: value.incoming == null ? null : normalizeIncoming(value.incoming) }
 }
 async function incomingCommand(tripNo: string, bookingNo: string, action: string, body: TripIncomingStart | TripIncomingAccept | TripBookingBind): Promise<TripBookingResult> {
-  return result(unwrapApiResponse(await http.post<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(`${bookingPath(tripNo, bookingNo)}/${action}`, body)))
+  return normalizeBookingResult(unwrapApiResponse(await http.post<ApiEnvelope<WireResult>, ApiEnvelope<WireResult>>(`${bookingPath(tripNo, bookingNo)}/${action}`, body)))
 }
 export const startTripIncoming = (tripNo: string, bookingNo: string, body: TripIncomingStart) => incomingCommand(tripNo, bookingNo, 'incoming', body)
 export const acceptTripIncoming = (tripNo: string, bookingNo: string, body: TripIncomingAccept) => incomingCommand(tripNo, bookingNo, 'receipt-confirmation', body)
diff --git a/src/modules/overseas-master-data/api/trips.ts b/src/modules/overseas-master-data/api/trips.ts
index 157f7c45..346dd943 100644
--- a/src/modules/overseas-master-data/api/trips.ts
+++ b/src/modules/overseas-master-data/api/trips.ts
@@ -111,3 +111,13 @@ export async function listTripHistory(tripNo: string, currentPage = 1, size = 20
     completion: row.snapshot.completion == null ? null : { ...row.snapshot.completion, outcomes: row.snapshot.completion.outcomes.map(outcome) },
   } }))
 }
+
+export interface DispatchCandidate { dispatchNo: string; customerId: string; warehouseId: string; packageCount: number; route: string | null }
+export async function listTripDispatchCandidates(tripNo: string, keyword?: string) {
+  const value = unwrapApiResponse(await http.get<ApiEnvelope<WirePage<DispatchCandidate>>, ApiEnvelope<WirePage<DispatchCandidate>>>(`${path(tripNo)}/dispatch-candidates`, { params: { keyword, page: 1, size: 100 } }))
+  return { ...value, total: integer(value.total), records: value.records.map(row => ({ ...row, packageCount: integer(row.packageCount) })) }
+}
+export interface TripPreparation { tripNo: string | null; recordVersion: number | null; plan: TripDraft | null; vehicleId: string | null; driverId: string | null; dispatchNos: string[]; idempotencyKey: string }
+export async function prepareTrip(body: TripPreparation): Promise<TripDetail> {
+  return detail(unwrapApiResponse(await http.post<ApiEnvelope<WireDetail>, ApiEnvelope<WireDetail>>(`${base}/prepare`, body)))
+}
diff --git a/src/modules/overseas-master-data/capacityOfferTypes.ts b/src/modules/overseas-master-data/capacityOfferTypes.ts
index 055c599f..69765dbf 100644
--- a/src/modules/overseas-master-data/capacityOfferTypes.ts
+++ b/src/modules/overseas-master-data/capacityOfferTypes.ts
@@ -12,7 +12,11 @@ export interface CapacityOffer {
   destinations: OfferDestination[]; segments: OfferSegment[]; capacityKnown: boolean; canCreateInquiry: boolean; canConfirm: boolean; blockReason: string | null
   actions: { canEdit: boolean; canPublish: boolean; canPause: boolean; canResume: boolean; canClose: boolean }
 }
+export interface InquiryProgress { stage: string; label: string; reservation: string; owner: string; primaryAction: string; message: string; missingFields: string[] }
+export interface AppointmentCoverage { status: string; appointments: { appointmentNo: string; confirmationNo: string | null; status: string; confirmedAt: string | null; confirmedEndAt: string | null; timezone: string | null }[]; missingFields: string[]; sourceVersion: string | null; changeReviewRequired: boolean }
 export interface CapacityInquiry {
+  appointmentCoverage: AppointmentCoverage | null
+  progress: InquiryProgress
   bookingNo: string; offerNo: string; tripNo: string; status: 'DRAFT' | 'CONFIRMED' | 'RECEIVED' | 'BOUND' | 'CANCELLED'
   recordVersion: number; offerRecordVersion: number; tripRecordVersion: number; salesOwnerUserId: string
   customerId: string; customerCode: string; customerName: string; businessType: 'LOCAL_LOOSEBOARD' | 'US_TRUCK'
@@ -23,7 +27,7 @@ export interface CapacityInquiry {
 }
 export interface CapacityOfferDetail { offer: CapacityOffer; inquiries: OfferPage<CapacityInquiry> }
 export interface OfferQuery { scope?: 'AVAILABLE' | 'ALL'; page?: number; size?: number; keyword?: string; origin?: string; destination?: string; departureFrom?: string; departureTo?: string; status?: string; canConfirm?: boolean; tripNo?: string }
-export interface InquiryQuery { page?: number; size?: number; keyword?: string; offerNo?: string; status?: string; scope?: 'MINE' | 'ALL' }
+export interface InquiryQuery { page?: number; size?: number; keyword?: string; offerNo?: string; status?: string; scope?: 'MINE' | 'ALL' | 'TODO' }
 export interface OfferWrite { tripNo: string; tripRecordVersion: number; offerRecordVersion: number | null; cutoffAt: string; contactName: string | null; contactPhone: string | null; remark: string | null; idempotencyKey: string }
 export interface OfferCommand { tripRecordVersion: number; offerRecordVersion: number; idempotencyKey: string; reason?: string }
 export interface InquiryWrite {
@@ -36,6 +40,9 @@ export interface OfferResult { offer: CapacityOffer; replayed: boolean }
 export interface InquiryResult extends OfferResult { inquiry: CapacityInquiry }
 export interface OfferCustomerOption { id: string; code: string; name: string }
 export const offerStatusLabels = { DRAFT: '发布草稿', OPEN: '接单中', PAUSED: '已暂停', CLOSED: '已关闭' }
-export const inquiryStatusLabels = { DRAFT: '询价中', CONFIRMED: '已确认承运', RECEIVED: '已确认实收', BOUND: '已关联发运', CANCELLED: '已取消' }
+export const inquiryStatusLabels = { DRAFT: '已登记', CONFIRMED: '已确认承运', RECEIVED: '已确认实收', BOUND: '已排入本车', CANCELLED: '已取消' }
 export const offerTime = (value: string | null) => value ? new Date(value).toLocaleString('zh-CN', { hour12: false }) : '—'
 export const loadText = (value: CapacityLoad | null) => value ? `${value.palletSpaces} 托位 / ${value.weightKg} kg / ${value.volumeCbm} m³` : '待调度核对'
+
+export const appointmentCoverageLabels: Record<string, string> = { SOURCE_NOT_READY: '待确认承运后筹划', SOURCE_NOT_FOUND: '来源待核对', SOURCE_NOT_MATERIALIZED: '待形成真实货件资料', DESTINATION_MISMATCH: '目的地变化待核对', REVIEW_REQUIRED: '货量待复核', UNASSIGNED: '尚未关联收货预约', PARTIAL: '部分货物未覆盖', PENDING: '等待收货方确认', CONFIRMED: '预约记录已确认' }
+export const appointmentMissingLabels: Record<string, string> = { CARRIER_CONFIRMATION: '承运确认', REAL_CARGO_MATERIALS: '真实货件资料', DESTINATION: '目的地核对', CARGO_QUANTITY_REVIEW: '货量复核', RECEIVING_APPOINTMENT: '收货预约', UNCOVERED_CARGO: '未覆盖货物的预约', RECEIVING_CONFIRMATION: '收货方确认', APPOINTMENT_TIMEZONE_UNVERIFIED: '预约时间所属地区尚未核实', SOURCE_CHANGED_REVIEW: '货源变化后重新核对预约' }
diff --git a/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts b/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts
index be75ddee..0f7ee28b 100644
--- a/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts
+++ b/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts
@@ -40,8 +40,8 @@ it.each(['inquiry', 'settings'] as const)('keeps the real %s dialog and edited i
   const { wrapper, pinia } = mountDialog(kind)
   if (kind === 'settings') await wrapper.setProps({ modelValue: true })
   await flushPromises()
-  if (kind === 'settings') await wrapper.get('details summary').trigger('click')
-  const input = wrapper.find<HTMLInputElement>(kind === 'inquiry' ? 'input[placeholder="选填"]' : 'input[placeholder="填写公开给销售的联系人（选填）"]')
+  await wrapper.get('details summary').trigger('click')
+  const input = wrapper.find<HTMLInputElement>(kind === 'inquiry' ? 'input[placeholder="填写货物名称（确认承运前必填）"]' : 'input[placeholder="填写公开给销售的联系人（选填）"]')
   expect(input.exists()).toBe(true)
   await input.setValue('UI-未保存检查'); await flushPromises()
   const assertPreserved = () => {
@@ -81,8 +81,9 @@ it('blocks browser back with the real router, cached detail and native dialog, w
   await router.push('/pool'); await router.isReady()
   const wrapper = mount(Host, { attachTo: document.body, global: { plugins: [pinia, router, ElementPlus] } }); wrappers.push(wrapper)
   await router.push('/pool/CO-CLOSE'); await flushPromises()
-  await wrapper.findAll('button').find(button => button.text() === '登记意向')!.trigger('click'); await flushPromises()
-  const input = wrapper.get<HTMLInputElement>('input[placeholder="选填"]')
+  await wrapper.findAll('button').find(button => button.text() === '登记客户货物')!.trigger('click'); await flushPromises()
+  await wrapper.get('details summary').trigger('click')
+  const input = wrapper.get<HTMLInputElement>('input[placeholder="填写货物名称（确认承运前必填）"]')
   await input.setValue('UI-修复后保留输入'); await flushPromises()
   input.element.focus(); await input.trigger('keydown', { key: 'Escape', code: 'Escape' }); await flushPromises(); await continueEditing()
   confirms.mockClear()
@@ -99,8 +100,8 @@ it('blocks browser back with the real router, cached detail and native dialog, w
   expect(router.currentRoute.value.name).toBe('overseas-master-data-capacity-offers')
   expect(confirms).toHaveBeenCalledOnce(); expect(getCapacityOffer).toHaveBeenCalledExactlyOnceWith('CO-CLOSE')
   await new Promise(resolve => setTimeout(resolve, 50)); await router.push('/pool/CO-CLOSE'); await flushPromises()
-  await wrapper.findAll('button').find(button => button.text() === '登记意向')!.trigger('click'); await flushPromises()
-  await wrapper.get<HTMLInputElement>('input[placeholder="选填"]').setValue('另一次修改'); await flushPromises()
+  await wrapper.findAll('button').find(button => button.text() === '登记客户货物')!.trigger('click'); await flushPromises()
+  await wrapper.get<HTMLInputElement>('input[placeholder="填写货物名称（确认承运前必填）"]').setValue('另一次修改'); await flushPromises()
   confirms.mockClear(); const navigation = router.push('/outside'); await flushPromises()
   expect(confirms).toHaveBeenCalledOnce(); expect(document.body.textContent).toContain('全局离开确认')
   await continueEditing(); await navigation
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts b/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts
index a44c4d2f..78444e8d 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts
@@ -31,7 +31,7 @@ it.each(scenarios)('uses explicit offer quote queries, pagination and negotiated
   const source: FleetQuoteSourceSnapshot = { quoteNo: 'FQ-PAGE-2', recordVersion: '9007199254740993', priceItem: scenario.priceBasis === 'ORDER' ? 'FULL_DELIVERY' : 'LOOSE_DELIVERY', customerId: '19', customerName: '报价测试客户', originCity: 'LA', destinationCode: 'ONT8', distanceMiles: 35, currency: 'CNY', priceBasis: scenario.priceBasis, quotedUnitPrice: 25.5, validFrom: '2026-10-01', validTo: '2026-10-31', effectiveOn: '2026-10-20' }
   vi.mocked(listOfferQuotes).mockResolvedValueOnce({ records: Array.from({ length: 20 }, (_, index) => ({ ...source, quoteNo: `FQ-PAGE-1-${index + 1}` })), total: 21, page: 1, size: 20, pages: 2 }).mockResolvedValueOnce({ records: [source], total: 21, page: 2, size: 20, pages: 2 })
   vi.mocked(saveCapacityInquiry).mockImplementation(async (_offerNo, _bookingNo, body) => {
-    const inquiry: CapacityInquiry = { bookingNo: 'FB-QUOTE-SAVED', offerNo: offer.offerNo, tripNo: offer.tripNo, status: 'DRAFT', recordVersion: 1, offerRecordVersion: offer.recordVersion, tripRecordVersion: offer.tripRecordVersion, salesOwnerUserId: '17', customerId: body.customerId, customerCode: 'C-19', customerName: '报价测试客户', businessType: body.businessType, deliveryMode: body.deliveryMode, estimatedArrivalAt: body.estimatedArrivalAt, expectedPalletCount: body.expectedPalletCount, cargo: { ...body.cargo }, destinationLabel: 'ONT8', agreedAmount: null, quoteSource: source, businessOrderNo: null, incomingNo: null, dispatchNo: null, updatedAt: '2026-10-07T00:00:00Z', actions: { canEdit: true, canConfirm: false, canCancel: true, blockReason: null } }
+    const inquiry: CapacityInquiry = { bookingNo: 'FB-QUOTE-SAVED', offerNo: offer.offerNo, tripNo: offer.tripNo, status: 'DRAFT', recordVersion: 1, offerRecordVersion: offer.recordVersion, tripRecordVersion: offer.tripRecordVersion, salesOwnerUserId: '17', customerId: body.customerId, customerCode: 'C-19', customerName: '报价测试客户', businessType: body.businessType, deliveryMode: body.deliveryMode, estimatedArrivalAt: body.estimatedArrivalAt, expectedPalletCount: body.expectedPalletCount, cargo: { ...body.cargo }, destinationLabel: 'ONT8', agreedAmount: null, quoteSource: source, businessOrderNo: null, incomingNo: null, dispatchNo: null, updatedAt: '2026-10-07T00:00:00Z', actions: { canEdit: true, canConfirm: false, canCancel: true, blockReason: null }, appointmentCoverage: null, progress: { stage: 'NEEDS_DETAILS', label: '待补资料', reservation: '尚未保位', owner: '销售', primaryAction: 'EDIT', message: '确认前还需补充资料', missingFields: ['预计重量'] } }
     return { offer, inquiry, replayed: false }
   })
   const wrapper = mount(CapacityInquiryDialog, { attachTo: document.body, props: { modelValue: true, offer, inquiry: null, readonly: false }, global: { plugins: [createPinia(), ElementPlus] } }); wrappers.push(wrapper)
@@ -54,7 +54,7 @@ it.each(scenarios)('uses explicit offer quote queries, pagination and negotiated
   await price.get('input').setValue('21.75'); await flushPromises()
   expect(price.props('modelValue')).toBe(21.75)
   expect(quotePanel.text()).toContain('来源报价 FQ-PAGE-2 · 25.50 CNY')
-  await wrapper.findAll('.app-dialog__footer button').find(button => button.text() === '保存意向')!.trigger('click'); await flushPromises()
+  await wrapper.findAll('.app-dialog__footer button').find(button => button.text() === '保存登记')!.trigger('click'); await flushPromises()
   expect(saveCapacityInquiry).toHaveBeenCalledExactlyOnceWith(offer.offerNo, null, expect.objectContaining({ customerId: '19', offerRecordVersion: 4, tripRecordVersion: 7, recordVersion: null, quoteRef: reference, idempotencyKey: expect.any(String), cargo: expect.objectContaining({ destinationKey: 'FBA:ONT8', currency: 'CNY', priceBasis: scenario.priceBasis, unitPrice: 21.75 }) }))
   expect(listOfferQuotes).toHaveBeenCalledTimes(2)
   expect(wrapper.emitted('saved')).toHaveLength(1)
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index d6b758c3..7a491ee8 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -6,21 +6,22 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
-import { listOfferCustomers, listOfferQuotes, saveCapacityInquiry } from '../api/capacityOffers'
+import { listOfferCustomers, listOfferQuotes, saveCapacityInquiry, saveAndConfirmInquiry } from '../api/capacityOffers'
 import { fleetQuoteReference, type FleetQuoteReference, type FleetQuoteSourceSnapshot } from '../api/fleetQuoteCandidates'
+import { offerTime, appointmentCoverageLabels, appointmentMissingLabels } from '../capacityOfferTypes'
 import type { CapacityOffer, CapacityInquiry, InquiryResult, InquiryWrite, OfferCustomerOption } from '../capacityOfferTypes'
 import type { TripBookingCargo } from '../bookingTypes'
 import { useFleetDraftGuard } from '../useFleetDraftGuard'
 const open = defineModel<boolean>({ default: false })
-const props = defineProps<{ offer: CapacityOffer | null; inquiry: CapacityInquiry | null; readonly: boolean }>()
-const emit = defineEmits<{ saved: [value: InquiryResult]; refresh: [] }>()
+const props = defineProps<{ offer: CapacityOffer | null; inquiry: CapacityInquiry | null; readonly: boolean; confirmMode?: boolean }>()
+const emit = defineEmits<{ saved: [value: InquiryResult]; refresh: []; action: [key: string, row: CapacityInquiry] }>()
 const access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
 const blankCargo = (): TripBookingCargo => ({ destinationKey: '', cargoName: null, packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null, priceBasis: 'PALLET', unitPrice: null, currency: 'USD', contactName: null, contactPhone: null, remark: null })
 const form = reactive({ customerId: '', businessType: 'LOCAL_LOOSEBOARD' as CapacityInquiry['businessType'], deliveryMode: 'SELF_DELIVERY' as CapacityInquiry['deliveryMode'], estimatedArrivalAt: null as string | null, expectedPalletCount: null as number | null, cargo: blankCargo(), quoteRef: null as FleetQuoteReference | null })
 const quoteSource = ref<FleetQuoteSourceSnapshot | null>(null), customers = ref<OfferCustomerOption[]>([]), customerLoading = ref(false)
 const customerError = ref<ApiErrorDetails | null>(null), customerSearched = ref(false)
 const quoteRows = ref<FleetQuoteSourceSnapshot[]>([]), quoteLoading = ref(false), quoteError = ref<ApiErrorDetails | null>(null), quoteSearched = ref(false), quotePage = ref(1), quotePages = ref(0)
-const pending = ref<{ target: string; body: InquiryWrite } | null>(null)
+const pending = ref<{ target: string; confirm: boolean; body: InquiryWrite } | null>(null)
 const target = computed(() => props.inquiry?.bookingNo || props.offer?.offerNo || '')
 const writable = computed(() => !props.readonly && (access.can('platform:fleet:capacity-offer:manage') || access.can('platform:fleet:capacity-offer:list') && access.can(`platform:fleet:capacity-offer:inquiry-${props.inquiry ? 'edit' : 'create'}`)) && (props.inquiry ? props.inquiry.actions.canEdit : props.offer?.canCreateInquiry))
 const canQuote = computed(() => access.can('platform:fleet:quote:list'))
@@ -40,6 +41,7 @@ watch(() => [open.value, target.value], async () => {
   else {
     const row = props.inquiry
     Object.assign(form, { customerId: row?.customerId || '', businessType: row?.businessType || 'LOCAL_LOOSEBOARD', deliveryMode: row?.deliveryMode || 'SELF_DELIVERY', estimatedArrivalAt: row?.estimatedArrivalAt || null, expectedPalletCount: row?.expectedPalletCount ?? null, cargo: row ? { ...row.cargo } : blankCargo() })
+    if (!row && props.offer?.destinations.length === 1) form.cargo.destinationKey = props.offer.destinations[0]!.destinationKey
     quoteSource.value = row?.quoteSource || null; form.quoteRef = row?.quoteSource ? fleetQuoteReference(row.quoteSource) : null
   }
   await nextTick(); guard.capture()
@@ -69,30 +71,35 @@ async function save() {
   if (form.quoteRef && !canQuote.value) { ElMessage.warning('修改带报价来源的意向需要报价读取权限'); return }
   const current = generation; busy.value = true; error.value = null
   try {
-    pending.value ||= { target: target.value, body: { tripRecordVersion: props.offer.tripRecordVersion, offerRecordVersion: props.offer.recordVersion, recordVersion: props.inquiry?.recordVersion ?? null, customerId: form.customerId, businessType: form.businessType, deliveryMode: form.deliveryMode, estimatedArrivalAt: form.estimatedArrivalAt || null, expectedPalletCount: form.expectedPalletCount ?? null, cargo: { ...form.cargo, packageCount: form.cargo.packageCount ?? null, palletSpaces: form.cargo.palletSpaces ?? null, weightKg: form.cargo.weightKg ?? null, volumeCbm: form.cargo.volumeCbm ?? null, unitPrice: form.cargo.unitPrice ?? null }, quoteRef: form.quoteRef ? { ...form.quoteRef } : null, idempotencyKey: crypto.randomUUID() } }
-    const result = await saveCapacityInquiry(props.offer.offerNo, props.inquiry?.bookingNo || null, pending.value.body)
-    if (current === generation) { pending.value = null; guard.capture(); emit('saved', result); open.value = false; ElMessage.success('意向已保存，尚未占用运力') }
+    pending.value ||= { target: target.value, confirm: !!props.confirmMode, body: { tripRecordVersion: props.offer.tripRecordVersion, offerRecordVersion: props.offer.recordVersion, recordVersion: props.inquiry?.recordVersion ?? null, customerId: form.customerId, businessType: form.businessType, deliveryMode: form.deliveryMode, estimatedArrivalAt: form.estimatedArrivalAt || null, expectedPalletCount: form.expectedPalletCount ?? null, cargo: { ...form.cargo, packageCount: form.cargo.packageCount ?? null, palletSpaces: form.cargo.palletSpaces ?? null, weightKg: form.cargo.weightKg ?? null, volumeCbm: form.cargo.volumeCbm ?? null, unitPrice: form.cargo.unitPrice ?? null }, quoteRef: form.quoteRef ? { ...form.quoteRef } : null, idempotencyKey: crypto.randomUUID() } }
+    const result = pending.value.confirm && props.inquiry ? await saveAndConfirmInquiry(props.inquiry.bookingNo, pending.value.body) : await saveCapacityInquiry(props.offer.offerNo, props.inquiry?.bookingNo || null, pending.value.body)
+    if (current === generation) { pending.value = null; guard.capture(); emit('saved', result); open.value = false; ElMessage.success(result.inquiry.status === 'CONFIRMED' ? '已保留货位并关联本土订单，尚未安排来货' : '登记已保存，调度可见，尚未保留货位') }
   } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '意向保存未完成'); if (cause instanceof ApiResponseError) pending.value = null } }
   finally { if (current === generation) busy.value = false }
 }
 onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clearTimeout(timer) })
 </script>
 <template>
-  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog" destroy-on-close :title="readonly ? '拼车意向详情' : inquiry ? '编辑拼车意向' : '登记拼车意向'" width="1080px" :show-confirm="writable" :confirm-text="pending ? '重试原请求' : '保存意向'" :confirm-loading="busy" @confirm="save">
+  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog" destroy-on-close :title="readonly ? '客户货物跟进' : inquiry ? '补充客户货物资料' : '登记客户货物'" width="1080px" :show-confirm="writable" :confirm-text="pending ? '重试原请求' : confirmMode ? '确认承运并保位' : '保存登记'" :confirm-loading="busy" @confirm="save">
     <LoadErrorState v-if="error" title="意向未能保存" :message="error.message" @retry="pending ? save() : emit('refresh')"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <p v-if="confirmMode">核对本票货量、价格与交货资料后确认承运。成功将保留货位并创建关联本土订单，不自动安排仓库收货。</p>
     <p v-if="pending" role="status">上次提交结果尚未确定，请保留原内容重试或核对。</p>
     <p v-if="offer">{{ offer.offerNo }} · {{ offer.warehouseName }} · {{ offer.blockReason || '询价不占位，调度确认承运后占位。' }}</p>
+    <section v-if="inquiry" aria-label="本票处理进度"><strong>{{ inquiry.progress.label }} · {{ inquiry.progress.reservation }}</strong><p>下一步负责人：{{ inquiry.progress.owner }} · {{ inquiry.progress.message }}</p></section>
+    <p v-else>保存后调度可见，尚不保位。已知货量可先填，未知可留空，确认承运前再补齐。</p>
+    <p v-if="offer">计划发车：{{ offerTime(offer.plannedDepartureAt) }} · 最晚送仓：{{ offerTime(offer.cutoffAt) }}</p>
     <p v-if="inquiry?.actions.blockReason">{{ inquiry.actions.blockReason }}</p>
     <el-form label-position="top" class="density-form capacity-inquiry-form" :disabled="lock">
       <el-form-item label="委托客户" required><el-select v-model="form.customerId" filterable remote :remote-method="searchCustomers" :loading="customerLoading" :disabled="!!inquiry" placeholder="按客户编号或名称搜索" @focus="searchCustomers()"><el-option v-if="inquiry" :value="inquiry.customerId" :label="`${inquiry.customerCode} · ${inquiry.customerName}`" /><el-option v-for="customer in customers" :key="customer.id" :value="customer.id" :label="`${customer.code} · ${customer.name}`" /></el-select><span v-if="customerSearched && !customers.length">暂无可选客户</span></el-form-item>
       <el-form-item label="本土业务类型"><el-select v-model="form.businessType"><el-option value="LOCAL_LOOSEBOARD" label="本土散板" /><el-option value="US_TRUCK" label="本土卡车" /></el-select></el-form-item>
-      <el-form-item label="本车卸货站" required><el-select v-model="form.cargo.destinationKey" placeholder="选择本车既有卸货站"><el-option v-for="stop in offer?.destinations || []" :key="stop.destinationKey" :value="stop.destinationKey" :label="stop.name" /><el-option v-if="!offer && inquiry" :value="inquiry.cargo.destinationKey" :label="inquiry.destinationLabel" /></el-select></el-form-item>
-      <el-form-item label="货物名称"><el-input v-model="form.cargo.cargoName" placeholder="选填" /></el-form-item>
+      <el-form-item label="本车卸货站" required><el-select v-model="form.cargo.destinationKey" :disabled="offer?.destinations.length === 1" placeholder="选择本车既有卸货站"><el-option v-for="stop in offer?.destinations || []" :key="stop.destinationKey" :value="stop.destinationKey" :label="stop.name" /><el-option v-if="!offer && inquiry" :value="inquiry.cargo.destinationKey" :label="inquiry.destinationLabel" /></el-select></el-form-item>
       <el-form-item label="预计箱数"><el-input-number v-model="form.cargo.packageCount" :min="1" :precision="0" placeholder="未知可留空" /></el-form-item>
       <el-form-item label="预计实托数"><el-input-number v-model="form.expectedPalletCount" :min="1" :precision="0" placeholder="卡车确认承运前必填" /></el-form-item>
       <el-form-item label="预计标准托位"><el-input-number v-model="form.cargo.palletSpaces" :min="1" :precision="0" placeholder="确认承运前填写" /></el-form-item>
       <el-form-item label="预计重量（kg）"><el-input-number v-model="form.cargo.weightKg" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
       <el-form-item label="预计体积（m³）"><el-input-number v-model="form.cargo.volumeCbm" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
+      <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>确认承运前待补资料{{ inquiry?.progress.missingFields.length ? `（还需：${inquiry.progress.missingFields.join('、')}）` : '（货名、价格、到仓及联系信息）' }}</summary><div class="capacity-inquiry-form">
+      <el-form-item label="货物名称"><el-input v-model="form.cargo.cargoName" placeholder="填写货物名称（确认承运前必填）" /></el-form-item>
       <el-form-item label="交货方式"><el-select v-model="form.deliveryMode"><el-option value="SELF_DELIVERY" label="客户自行送至我仓" /><el-option value="MANUAL_PICKUP_TO_WAREHOUSE" label="线下安排提货回我仓" /></el-select></el-form-item>
       <el-form-item label="预计到仓"><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>
       <el-form-item label="计价方式"><el-select v-model="form.cargo.priceBasis"><el-option value="PALLET" label="按托位" /><el-option value="ORDER" label="整单" /></el-select></el-form-item>
@@ -100,14 +107,31 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
       <el-form-item label="币种"><el-select v-model="form.cargo.currency" filterable allow-create><el-option v-for="currency in ['USD', 'CNY', 'CAD', 'EUR', 'GBP']" :key="currency" :value="currency" :label="currency" /></el-select></el-form-item>
       <el-form-item label="联系人"><el-input v-model="form.cargo.contactName" placeholder="确认承运前补充" /></el-form-item>
       <el-form-item label="联系方式"><el-input v-model="form.cargo.contactPhone" placeholder="确认承运前补充" /></el-form-item>
-      <el-form-item label="交货说明与备注" class="capacity-inquiry-wide"><el-input v-model="form.cargo.remark" type="textarea" :rows="2" placeholder="线下提货安排或其他交货说明；系统收货从实际到仓开始" /></el-form-item>
+      </div></details>
+      <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>其他说明（选填）</summary>
+      <el-form-item label="交货说明与备注" class="capacity-inquiry-wide"><el-input v-model="form.cargo.remark" type="textarea" :rows="2" placeholder="线下提货安排或其他交货说明；系统收货从实际到仓开始" /></el-form-item></details>
     </el-form>
     <LoadErrorState v-if="customerError" title="客户候选读取失败" :message="customerError.message" @retry="searchCustomers()"><template #details><ApiErrorMeta :details="customerError" /></template></LoadErrorState>
-    <section aria-label="报价来源"><p v-if="quoteSource">来源报价 {{ quoteSource.quoteNo }} · {{ quoteSource.quotedUnitPrice.toFixed(2) }} {{ quoteSource.currency }}；实际约定价格单独保存。</p><p v-else>未引用报价库，可手工询价。约定运费不代表应收或实收。</p>
+    <details><summary>参考报价（可选）</summary><section aria-label="报价来源"><p v-if="quoteSource">来源报价 {{ quoteSource.quoteNo }} · {{ quoteSource.quotedUnitPrice.toFixed(2) }} {{ quoteSource.currency }}；实际约定价格单独保存。</p><p v-else>未引用报价库，可手工询价。约定运费不代表应收或实收。</p>
       <template v-if="canQuote && writable"><el-button :disabled="lock || !quoteReady" :loading="quoteLoading" @click="queryQuotes()">查询报价库</el-button><el-button v-if="form.quoteRef" :disabled="lock" @click="form.quoteRef = null; quoteSource = null">改为手工询价</el-button>
         <el-select v-if="quoteRows.length" :model-value="form.quoteRef ? sourceKey(form.quoteRef) : ''" :disabled="lock" placeholder="选择报价，可另行议价" @update:model-value="selectQuote"><el-option v-for="quote in quoteRows" :key="sourceKey(quote)" :value="sourceKey(quote)" :label="`${quote.quoteNo} · ${quote.quotedUnitPrice} ${quote.currency}`" /></el-select>
         <p v-if="quoteSearched && !quoteRows.length">暂无适用报价，可继续手工询价。</p><div v-if="quotePages > 1"><el-button :disabled="quoteLoading || quotePage <= 1" @click="queryQuotes(quotePage - 1)">上一页</el-button> {{ quotePage }} / {{ quotePages }} <el-button :disabled="quoteLoading || quotePage >= quotePages" @click="queryQuotes(quotePage + 1)">下一页</el-button></div>
       </template><p v-if="quoteError" role="alert">{{ quoteError.message }}<ApiErrorMeta :details="quoteError" /></p>
+    </section></details>
+    <section v-if="inquiry && readonly" aria-label="继续处理本票货物" class="density-actions">
+      <el-button v-if="inquiry.actions.canEdit" @click="emit('action', 'edit', inquiry)">补充资料</el-button>
+      <el-button v-if="access.can('platform:fleet:capacity-offer:manage') && (inquiry.actions.canEdit || inquiry.actions.canConfirm)" @click="emit('action', 'confirm', inquiry)">核对并确认</el-button>
+      <el-button v-if="inquiry.progress.primaryAction === 'INCOMING' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-edit')" @click="emit('action', 'incoming', inquiry)">安排来货</el-button>
+      <el-button v-if="inquiry.progress.primaryAction === 'RECEIPT' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-confirm')" @click="emit('action', 'receipt', inquiry)">核对实收与运费</el-button>
+      <el-button v-if="inquiry.progress.primaryAction === 'BIND' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-edit') && access.can('platform:fleet:trip:edit') && access.can('platform:overseas-warehouse:inbound-order:smart-dispatch')" @click="emit('action', 'bind', inquiry)">确认排入本车</el-button>
+      <el-button v-if="inquiry.incomingNo" @click="emit('action', 'fulfillment', inquiry)">查看收货进度</el-button>
+      <el-button v-if="inquiry.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')" @click="emit('action', 'dispatch', inquiry)">查看排车与审核</el-button>
+    </section>
+    <section v-if="inquiry?.appointmentCoverage" aria-label="收货预约覆盖">
+      <h3>收货预约覆盖</h3><el-button v-if="access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')" @click="emit('action', 'appointment', inquiry)">预约跟进</el-button><p>{{ appointmentCoverageLabels[inquiry.appointmentCoverage.status] || '预约结果待核对' }}。承运保位不代表收货方已接受本票货物。</p>
+      <p v-if="inquiry.appointmentCoverage.missingFields.length">待处理：{{ inquiry.appointmentCoverage.missingFields.map(key => appointmentMissingLabels[key] || '请预约人员核对来源资料').join('、') }}</p>
+      <p v-for="appointment in inquiry.appointmentCoverage.appointments" :key="appointment.appointmentNo">预约：{{ appointment.appointmentNo }} · 外部确认号：{{ appointment.confirmationNo || '尚未确认' }}</p>
+      <p v-if="inquiry.appointmentCoverage.changeReviewRequired">货源或数量发生变化，请负责预约的人员重新核对覆盖。</p>
     </section>
     <p v-if="inquiry">本土订单：{{ inquiry.businessOrderNo || '尚未成交' }} · 来货：{{ inquiry.incomingNo || '尚未登记' }} · 排车：{{ inquiry.dispatchNo || '尚未关联' }}</p>
   </AppDialog>
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryFulfillment.vue b/src/modules/overseas-master-data/components/CapacityInquiryFulfillment.vue
new file mode 100644
index 00000000..e59ec817
--- /dev/null
+++ b/src/modules/overseas-master-data/components/CapacityInquiryFulfillment.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { ref, watch, onBeforeUnmount } from 'vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getInquiryFulfillment } from '../api/capacityOffers'
+import type { CapacityInquiry } from '../capacityOfferTypes'
+import TripBookingFulfillmentDialog from './TripBookingFulfillmentDialog.vue'
+const dialog = ref<InstanceType<typeof TripBookingFulfillmentDialog> | null>(null)
+const activeMode = ref<'incoming' | 'receipt' | 'bind' | 'view'>('view')
+const open = defineModel<boolean>({ default: false })
+const props = defineProps<{ inquiry: CapacityInquiry | null; mode: 'incoming' | 'receipt' | 'bind' | 'view' }>()
+const emit = defineEmits<{ saved: [] }>()
+const loaded = ref<Awaited<ReturnType<typeof getInquiryFulfillment>> | null>(null)
+const error = ref<ApiErrorDetails | null>(null), loading = ref(false)
+let generation = 0
+async function load() {
+  if (!props.inquiry || !open.value) return
+  const current = ++generation; loading.value = true; error.value = null
+  try { const value = await getInquiryFulfillment(props.inquiry.bookingNo); if (current === generation) loaded.value = value }
+  catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '本票履约进度读取失败') }
+  finally { if (current === generation) loading.value = false }
+}
+watch(() => [open.value, props.inquiry?.bookingNo, props.mode], () => { generation++; if (!open.value || dialog.value?.hasPending) return; activeMode.value = props.mode; loaded.value = null; void load() }, { immediate: true })
+onBeforeUnmount(() => { generation++ })
+</script>
+<template>
+  <AppDialog class="admin-density-dialog" v-if="!loaded" v-model="open" title="读取本票处理进度" width="1080px" :show-confirm="false">
+    <p v-if="loading">正在读取本票真实履约资料…</p>
+    <LoadErrorState v-if="error" title="读取未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+  </AppDialog>
+  <TripBookingFulfillmentDialog v-else ref="dialog" v-model="open" pool :booking="loaded.booking" :initial-preview="loaded.preview" :mode="activeMode"
+    :arrival-at="inquiry?.estimatedArrivalAt" :instructions="inquiry?.cargo.remark"
+    :trip="{ tripNo: loaded.booking.tripNo, recordVersion: loaded.preview.tripRecordVersion, plannedDepartureAt: loaded.plannedDepartureAt }"
+    @saved="emit('saved')" />
+</template>
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
index 3d230c7d..00d78082 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
@@ -10,16 +10,20 @@ const access = useAccessPreviewStore()
 function actions(row: CapacityInquiry, busy: boolean): RowActionItem[] {
   const manage = access.can('platform:fleet:capacity-offer:manage')
   const write = (kind: string) => manage || access.can('platform:fleet:capacity-offer:list') && access.can(`platform:fleet:capacity-offer:inquiry-${kind}`)
-  return [{ key: 'view', label: '详情', priority: 10 },
-    { key: 'edit', label: '编辑', visible: row.actions.canEdit && write('edit'), disabled: busy },
-    { key: 'confirm', label: '确认承运', visible: row.actions.canConfirm && manage, disabled: busy },
+  return [{ key: 'view', label: '查看进度', priority: 10 },
+    { key: 'incoming', label: '安排来货', visible: manage && row.progress.primaryAction === 'INCOMING' && access.can('platform:fleet:trip:booking-edit'), disabled: busy },
+    { key: 'receipt', label: '查看收货并核量', visible: manage && row.progress.primaryAction === 'RECEIPT' && access.can('platform:fleet:trip:booking-confirm'), disabled: busy },
+    { key: 'bind', label: '确认排入本车', visible: manage && row.progress.primaryAction === 'BIND' && access.can('platform:fleet:trip:booking-edit') && access.can('platform:fleet:trip:edit') && access.can('platform:overseas-warehouse:inbound-order:smart-dispatch'), disabled: busy },
+    { key: 'fulfillment', label: '收货进度', visible: !!row.incomingNo, disabled: busy },
+    { key: 'edit', label: '补充资料', visible: row.actions.canEdit && write('edit'), disabled: busy },
+    { key: 'confirm', label: '核对并确认', visible: (row.actions.canConfirm || row.actions.canEdit) && manage, disabled: busy },
     { key: 'cancel', label: '取消意向', visible: row.actions.canCancel && write('cancel'), disabled: busy, tone: 'danger' }]
 }
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 230, fixed: 'left', slotName: 'actions' },
   { key: 'bookingNo', label: '意向 / 预订号', minWidth: 210 }, { key: 'customerName', label: '客户', minWidth: 155 },
   { key: 'tripNo', label: '车次号', minWidth: 210 }, { key: 'destinationLabel', label: '卸货站', minWidth: 130 },
-  { key: 'status', label: '状态', width: 125, slotName: 'status' }, { key: 'cargo', label: '预计货量', minWidth: 270, slotName: 'cargo' },
+  { key: 'status', label: '当前进度 / 下一步', minWidth: 270, slotName: 'status', singleLine: false }, { key: 'cargo', label: '预计货量', minWidth: 270, slotName: 'cargo' },
   { key: 'agreedAmount', label: '约定运费（非实收）', minWidth: 165, slotName: 'amount' }, { key: 'businessOrderNo', label: '本土订单号', minWidth: 210 },
   { key: 'updatedAt', label: '更新时间', minWidth: 180, slotName: 'time' },
 ]
@@ -29,7 +33,7 @@ const columns: DataTableColumn[] = [
   <template v-if="$slots.filters" #filters><slot name="filters" /></template>
   <template v-if="$slots.notices" #notices><slot name="notices" /></template>
   <template #actions="{ row }"><RowActions :actions="actions(row as CapacityInquiry, busy)" text-actions @action="emit('action', $event, row as CapacityInquiry)" /></template>
-  <template #status="{ row }">{{ inquiryStatusLabels[(row as CapacityInquiry).status] }}<small v-if="row.actions.blockReason" class="inquiry-reason">{{ row.actions.blockReason }}</small></template>
+  <template #status="{ row }"><strong>{{ row.progress.label }} · {{ row.progress.reservation }}</strong><div>下一步：{{ row.progress.owner }}</div><small class="inquiry-reason">{{ row.progress.message }}</small></template>
   <template #cargo="{ row }">{{ row.cargo.packageCount ?? '—' }} 箱 · {{ row.expectedPalletCount ?? '—' }} 实托 · {{ row.cargo.palletSpaces ?? '—' }} 托位 · {{ row.cargo.weightKg ?? '—' }} kg · {{ row.cargo.volumeCbm ?? '—' }} m³</template>
   <template #amount="{ row }">{{ row.agreedAmount == null ? '待报价' : `${Number(row.agreedAmount).toFixed(2)} ${row.cargo.currency || ''}` }}</template>
   <template #time="{ row }">{{ offerTime(row.updatedAt) }}</template>
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
index a650a27e..141110bc 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
@@ -1,3 +1,4 @@
+import { createPinia } from 'pinia'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
 import TripBookingFulfillmentDialog from './TripBookingFulfillmentDialog.vue'
@@ -14,7 +15,7 @@ const preview: TripIncomingPreview = { tripRecordVersion: 5, recordVersion: 2, i
 const wrappers: VueWrapper[] = []
 function mount(mode: 'incoming' | 'receipt' | 'bind' | 'view') {
   const field = { props: ['modelValue'], emits: ['update:modelValue'], template: '<input />' }
-  const wrapper = shallowMount(TripBookingFulfillmentDialog, { props: { modelValue: true, trip, booking, mode }, global: { directives: { loading: () => undefined }, stubs: {
+  const wrapper = shallowMount(TripBookingFulfillmentDialog, { props: { modelValue: true, trip, booking, mode, arrivalAt: '2026-10-03T08:00:00Z' }, global: { plugins: [createPinia()], directives: { loading: () => undefined }, stubs: {
     AppDialog: { name: 'AppDialog', props: ['modelValue', 'confirmDisabled'], emits: ['confirm'], template: '<div><slot/></div>' },
     DataTable: { props: ['data'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="spaces" :row="row"/></div></div>' },
     ElForm: { template: '<div><slot/></div>' }, ElFormItem: { template: '<div><slot/></div>' }, ElInputNumber: { ...field, name: 'ElInputNumber' }, ElDatePicker: field, ElInput: field,
@@ -43,3 +44,15 @@ it('retries the same incoming registration after an uncertain result without cre
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
   expect(api.startTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', first); expect(api.getTripIncoming).not.toHaveBeenCalled()
 })
+
+it('keeps an uncertain receipt command retryable after closing and reopening without reloading or changing its hash', async () => {
+  vi.mocked(api.acceptTripIncoming).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ tripRecordVersion: 6, booking: { ...booking, status: 'RECEIVED' }, replayed: true })
+  const wrapper=mount('receipt'); await flushPromises()
+  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+  const original=vi.mocked(api.acceptTripIncoming).mock.calls[0]![2]
+  await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
+  expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmDisabled')).toBe(false)
+  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+  expect(api.acceptTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', original)
+  expect(api.getTripIncoming).toHaveBeenCalledOnce()
+})
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
index dbaf1838..047a061b 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onBeforeUnmount, reactive, ref, watch } from 'vue'
+import { computed, nextTick, onBeforeUnmount, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -7,22 +7,26 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getTripIncoming, startTripIncoming, acceptTripIncoming, bindTripBookingDispatch } from '../api/tripBookings'
+import { getInquiryFulfillment, commandInquiryFulfillment } from '../api/capacityOffers'
+import { useFleetDraftGuard } from '../useFleetDraftGuard'
 import type { FleetTrip } from '../tripTypes'
 import type { TripBooking, TripBookingResult, TripIncomingPreview, TripIncomingStart, TripIncomingAccept, TripBookingBind } from '../bookingTypes'
 const open = defineModel<boolean>({ default: false })
-const props = defineProps<{ trip: FleetTrip; booking: TripBooking | null; mode: 'incoming' | 'receipt' | 'bind' | 'view' }>()
+const props = defineProps<{ trip: Pick<FleetTrip, 'tripNo' | 'recordVersion' | 'plannedDepartureAt'>; initialPreview?: TripIncomingPreview | null; pool?: boolean; arrivalAt?: string | null; instructions?: string | null; booking: TripBooking | null; mode: 'incoming' | 'receipt' | 'bind' | 'view' }>()
 const emit = defineEmits<{ saved: [value: TripBookingResult] }>()
 const loading = ref(false), busy = ref(false), error = ref<ApiErrorDetails | null>(null), preview = ref<TripIncomingPreview | null>(null)
 const spaces = reactive<Record<string, number>>({}), unitPrice = ref<number | null>(null), dispatchNo = ref('')
 const form = reactive({ estimatedArrivalAt: '', deliveryInstructions: '', privateAddress: '', postalCode: '', recipientName: '', recipientPhone: '' })
 const pending = ref<{ target: string; body: TripIncomingStart | TripIncomingAccept | TripBookingBind } | null>(null)
+const guard = useFleetDraftGuard('booking-fulfillment', open, reactive({ form, spaces, unitPrice, dispatchNo }), busy, computed(() => !!pending.value))
+defineExpose({ hasPending: computed(() => !!pending.value) })
 let generation = 0
 const target = computed(() => `${props.trip.tripNo}:${props.booking?.bookingNo}:${props.mode}`)
-const titles = { incoming: '登记外接来货', receipt: '核对外接实收与运费', bind: '关联外接排车单', view: '外接来货详情' }
+const titles = { incoming: '登记外接来货', receipt: '核对外接实收与运费', bind: '确认排入本车', view: '外接来货详情' }
 const ready = computed(() => preview.value?.incoming && ['WAIT_CUSTOMER_CONFIRMATION', 'READY_FOR_DISPATCH'].includes(preview.value.incoming.status))
 const totalSpaces = computed(() => Object.values(spaces).reduce((a,b) => a + (b || 0), 0))
 const amount = computed(() => unitPrice.value == null ? null : Math.round(unitPrice.value * (props.booking?.cargo.priceBasis === 'ORDER' ? 1 : totalSpaces.value) * 100) / 100)
-const statuses: Record<string,string> = { WAIT_PDA_RECEIVING: '等待仓库收货', WAIT_CUSTOMER_CONFIRMATION: '实收完成，待确认', READY_FOR_DISPATCH: '已确认实收，可安排排车', OUTBOUNDED: '已出库' }
+const statuses: Record<string,string> = { WAIT_PDA_RECEIVING: '等待仓库收货', RECEIVING: '仓库收货中', WAIT_CUSTOMER_CONFIRMATION: '实收完成，待确认', READY_FOR_DISPATCH: '已确认实收，可安排排车', OUTBOUNDED: '已出库' }
 const columns = computed<DataTableColumn[]>(() => [{ key: 'palletNo', prop: 'palletNo', label: '实收托盘', minWidth: 180 }, { key: 'packages', prop: 'packages', label: '箱数', width: 95 },
   { key: 'weightKg', prop: 'weightKg', label: '实测重量（kg）', minWidth: 150 }, { key: 'volumeCbm', prop: 'volumeCbm', label: '实测体积（m³）', minWidth: 150 },
   ...(props.mode === 'receipt' ? [{ key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 170 }] : [])])
@@ -30,29 +34,36 @@ async function load() {
   if (!props.booking) return
   const current = generation; loading.value = true; error.value = null
   try {
-    const value = await getTripIncoming(props.trip.tripNo, props.booking.bookingNo)
+    const value = props.pool ? (await getInquiryFulfillment(props.booking.bookingNo)).preview : await getTripIncoming(props.trip.tripNo, props.booking.bookingNo)
     if (current !== generation) return
     preview.value = value; Object.keys(spaces).forEach(key => delete spaces[key])
     for (const pallet of value.incoming?.pallets || []) spaces[pallet.warehousePalletId] = props.booking.receipt?.pallets.find(row => row.warehousePalletId === pallet.warehousePalletId)?.palletSpaces || 1
+    await nextTick(); guard.capture()
   } catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '来货信息读取失败') }
   finally { if (current === generation) loading.value = false }
 }
 watch(() => [open.value, target.value], () => {
   generation++; busy.value = false; error.value = null; preview.value = null
   if (!open.value || !props.booking) return
+  if (pending.value) return
   unitPrice.value = props.booking.cargo.unitPrice; dispatchNo.value = props.booking.dispatchNo || ''
-  Object.assign(form, { estimatedArrivalAt: new Date(new Date(props.trip.plannedDepartureAt).getTime() - 7200000).toISOString(), deliveryInstructions: '', privateAddress: '', postalCode: '', recipientName: '', recipientPhone: '' })
-  if (pending.value?.target !== target.value) pending.value = null
-  if (props.mode === 'receipt' || props.mode === 'view') void load()
+  Object.assign(form, { estimatedArrivalAt: props.arrivalAt || '', deliveryInstructions: props.instructions || props.booking.cargo.remark || '', privateAddress: '', postalCode: '', recipientName: '', recipientPhone: '' })
+  if (props.initialPreview && (props.mode === 'receipt' || props.mode === 'view')) {
+    preview.value = props.initialPreview; Object.keys(spaces).forEach(key => delete spaces[key])
+    for (const pallet of props.initialPreview.incoming?.pallets || []) spaces[pallet.warehousePalletId] = props.booking.receipt?.pallets.find(row => row.warehousePalletId === pallet.warehousePalletId)?.palletSpaces || 1
+    void nextTick(() => guard.capture())
+  } else if (props.mode === 'receipt' || props.mode === 'view') void load()
+  else void nextTick(() => guard.capture())
 }, { immediate: true })
 async function save() {
   if (busy.value || loading.value || props.mode === 'view' || !props.booking) return
   const current = generation, booking = props.booking, mode = props.mode
   if (!pending.value) {
     const versions = { tripRecordVersion: preview.value?.tripRecordVersion ?? props.trip.recordVersion, recordVersion: preview.value?.recordVersion ?? booking.recordVersion, idempotencyKey: crypto.randomUUID() }
+    if (mode === 'incoming' && !form.estimatedArrivalAt) { ElMessage.warning('请确认预计到仓时间'); return }
     if (mode === 'incoming') pending.value = { target: target.value, body: { ...versions, ...form, estimatedArrivalAt: form.estimatedArrivalAt || null } }
     else if (mode === 'bind') {
-      if (!dispatchNo.value.trim()) { ElMessage.warning('请输入已预排的客户排车单号'); return }
+      if (!props.pool && !dispatchNo.value.trim()) { ElMessage.warning('请输入已预排的客户排车单号'); return }
       pending.value = { target: target.value, body: { ...versions, dispatchNo: dispatchNo.value.trim() } }
     } else {
       if (!ready.value || !preview.value?.incoming?.pallets.length || unitPrice.value == null || totalSpaces.value < 1) { ElMessage.warning('请等待实际收货完成，并核对托位及约定价格'); return }
@@ -63,32 +74,32 @@ async function save() {
   busy.value = true; error.value = null
   try {
     const body = pending.value.body
-    const value = mode === 'incoming' ? await startTripIncoming(props.trip.tripNo, booking.bookingNo, body as TripIncomingStart)
+    const value = props.pool ? await commandInquiryFulfillment(booking.bookingNo, mode === 'incoming' ? 'incoming' : mode === 'receipt' ? 'receipt-confirmation' : 'arrange-dispatch', mode === 'bind' ? { tripRecordVersion: (body as TripBookingBind).tripRecordVersion, recordVersion: (body as TripBookingBind).recordVersion, idempotencyKey: (body as TripBookingBind).idempotencyKey } : body) : mode === 'incoming' ? await startTripIncoming(props.trip.tripNo, booking.bookingNo, body as TripIncomingStart)
       : mode === 'bind' ? await bindTripBookingDispatch(props.trip.tripNo, booking.bookingNo, body as TripBookingBind)
         : await acceptTripIncoming(props.trip.tripNo, booking.bookingNo, body as TripIncomingAccept)
-    if (current === generation) { emit('saved', value); pending.value = null; open.value = false; ElMessage.success('外接履约记录已更新') }
+    if (current === generation) { pending.value = null; guard.capture(); emit('saved', value); open.value = false; ElMessage.success('外接履约记录已更新') }
   } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '外接履约操作未完成'); if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pending.value = null } }
   finally { busy.value = false }
 }
 onBeforeUnmount(() => { generation++ })
 </script>
 <template>
-  <AppDialog v-model="open" class="admin-density-dialog" :title="titles[mode]" width="1080px" :show-confirm="mode !== 'view'" :confirm-text="pending ? '重试原请求' : mode === 'receipt' ? '确认实收与运费' : mode === 'bind' ? '关联排车单' : '生成来货单'" :confirm-disabled="loading || (mode === 'receipt' && !ready)" :confirm-loading="busy" @confirm="save">
+  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog" :title="titles[mode]" width="1080px" :show-confirm="mode !== 'view'" :confirm-text="pending ? '重试原请求' : mode === 'receipt' ? '确认实收与运费' : mode === 'bind' ? '确认排入本车' : '生成来货单'" :confirm-disabled="loading || (!pending && mode === 'receipt' && !ready)" :confirm-loading="busy" @confirm="save">
     <LoadErrorState v-if="error" title="操作未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <div v-if="booking" v-loading="loading">
-      <p>{{ booking.bookingNo }} · {{ booking.customerName }} · {{ booking.destinationLabel }}</p>
+      <p>{{ booking.bookingNo }} · {{ booking.customerName }} · {{ booking.destinationLabel }}</p><p v-if="pending" role="status">本票上次提交结果尚未确定，保留原内容与请求键重试；不会改为处理另一票货物。</p>
       <el-form v-if="mode === 'incoming'" label-position="top" class="density-form incoming-form" :disabled="busy || !!pending">
         <el-form-item label="预计到仓时间"><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>
         <el-form-item label="交货说明"><el-input v-model="form.deliveryInstructions" placeholder="选填，默认客户自送至本起运仓" /></el-form-item>
         <template v-if="booking.cargo.destinationKey.startsWith('PRIVATE:')"><el-form-item label="收件地址"><el-input v-model="form.privateAddress" placeholder="填写约定卸货地址" /></el-form-item><el-form-item label="邮编"><el-input v-model="form.postalCode" placeholder="填写收件邮编" /></el-form-item><el-form-item label="收件人"><el-input v-model="form.recipientName" placeholder="填写收件人" /></el-form-item><el-form-item label="收件电话"><el-input v-model="form.recipientPhone" placeholder="填写收件电话" /></el-form-item></template>
       </el-form>
       <template v-if="mode === 'receipt' || mode === 'view'">
-        <p>来货单：{{ preview?.incoming?.incomingNo || '—' }} · {{ statuses[preview?.incoming?.status || ''] || '等待读取' }}</p>
+        <el-button :loading="loading" :disabled="busy || !!pending" @click="load">刷新收货进度</el-button><p>来货单：{{ preview?.incoming?.incomingNo || '—' }} · {{ statuses[preview?.incoming?.status || ''] || '等待读取' }}</p>
         <DataTable :data="preview?.incoming?.pallets || []" :columns="columns" row-key="warehousePalletId" empty-text="仓库尚未完成实际打托"><template #spaces="{ row }"><el-input-number v-model="spaces[row.warehousePalletId]" :min="1" :precision="0" :disabled="busy || !!pending" placeholder="实际占用托位" /></template></DataTable>
         <el-form v-if="mode === 'receipt'" label-position="top" class="density-form incoming-form" :disabled="busy || !!pending"><el-form-item :label="booking.cargo.priceBasis === 'ORDER' ? '确认整单价格' : '确认每托位价格'"><el-input-number v-model="unitPrice" :min="0" :precision="2" placeholder="核对约定价格" /></el-form-item></el-form>
         <p v-if="mode === 'receipt'">原约定 {{ booking.agreedAmount?.toFixed(2) }} {{ booking.cargo.currency }}；本次实收 {{ preview?.incoming?.receivedPackages || 0 }} 箱、{{ totalSpaces }} 托位，确认金额 {{ amount?.toFixed(2) || '—' }} {{ booking.cargo.currency }}。转派送时按本次确认报价登记应收。</p>
       </template>
-      <el-form v-if="mode === 'bind'" label-position="top" class="density-form" :disabled="busy || !!pending"><p>先将来货库存预排为客户排车单，再填写排车单号。关联后重新核对整车装载并完成审核。</p><el-form-item label="排车单号"><el-input v-model="dispatchNo" placeholder="输入包含本次实收货物的排车单号" /></el-form-item></el-form>
+      <el-form v-if="mode === 'bind'" label-position="top" class="density-form" :disabled="busy || !!pending"><p v-if="pool">将本票全部实收货物排入原车次。系统复用合格排车单，没有时生成并关联；来源冲突或货量不完整时停止。成功后仍需核对容量并完成审核，不代表已装车或发车。</p><p v-else>先将来货库存预排为客户排车单，再填写排车单号。关联后重新核对整车装载并完成审核。</p><el-form-item v-if="!pool" label="排车单号"><el-input v-model="dispatchNo" placeholder="输入包含本次实收货物的排车单号" /></el-form-item></el-form>
     </div>
   </AppDialog>
 </template>
diff --git a/src/modules/overseas-master-data/components/TripDispatchSelector.vue b/src/modules/overseas-master-data/components/TripDispatchSelector.vue
new file mode 100644
index 00000000..a722d12b
--- /dev/null
+++ b/src/modules/overseas-master-data/components/TripDispatchSelector.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { ref, watch, onBeforeUnmount } from 'vue'
+import { listTripDispatchCandidates, type DispatchCandidate } from '../api/trips'
+import { getApiErrorDetails } from '@/shared/api/http'
+const value = defineModel<string>({ default: '' })
+const props = defineProps<{ tripNo: string; disabled?: boolean }>()
+const rows = ref<DispatchCandidate[]>([]), loading = ref(false), error = ref(''), total = ref(0)
+let sequence = 0, timer: ReturnType<typeof setTimeout> | undefined
+function search(keyword = '') {
+  clearTimeout(timer); const current = ++sequence
+  timer = setTimeout(async () => {
+    loading.value = true; error.value = ''
+    try { const result = await listTripDispatchCandidates(props.tripNo, keyword.trim() || undefined); if (current === sequence) { rows.value = result.records; total.value = result.total } }
+    catch (cause) { if (current === sequence) { rows.value = []; error.value = getApiErrorDetails(cause, '待运货物加载失败').message } }
+    finally { if (current === sequence) loading.value = false }
+  }, 250)
+}
+watch(() => props.tripNo, () => { sequence++; clearTimeout(timer); rows.value = []; value.value = ''; loading.value = false })
+onBeforeUnmount(() => { sequence++; clearTimeout(timer) })
+</script>
+<template><div><el-select v-model="value" aria-label="选择本仓待运排车单" filterable remote :remote-method="search" :loading="loading" :disabled="disabled" placeholder="按排车单号或目的地搜索" @focus="search()"><el-option v-for="row in rows" :key="row.dispatchNo" :label="`${row.dispatchNo} · ${row.route || '路线待核对'} · ${row.packageCount}箱`" :value="row.dispatchNo" /></el-select><p v-if="error" role="alert">{{ error }} <el-button link @click="search()">重试</el-button></p><small v-if="total > rows.length">候选较多，请输入排车单号缩小范围。</small></div></template>
diff --git a/src/modules/overseas-master-data/components/TripPreparationDialog.test.ts b/src/modules/overseas-master-data/components/TripPreparationDialog.test.ts
new file mode 100644
index 00000000..071bf519
--- /dev/null
+++ b/src/modules/overseas-master-data/components/TripPreparationDialog.test.ts
@@ -0,0 +1,41 @@
+import { createPinia } from 'pinia'
+import { shallowMount, flushPromises } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import TripPreparationDialog from './TripPreparationDialog.vue'
+import { listTrips, prepareTrip } from '../api/trips'
+import type { TripDetail, FleetTrip } from '../tripTypes'
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('../api/trips', () => ({ listTrips: vi.fn(), prepareTrip: vi.fn() }))
+vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() } }))
+const trip = { tripNo: 'TR-READY', recordVersion: 4, warehouseId: '9007199254740993', stops: [{ name: '起运仓' }, { name: 'ACY2' }] } as FleetTrip
+beforeEach(() => { vi.clearAllMocks(); vi.mocked(listTrips).mockResolvedValue({ records: [trip], page: 1, size: 100, total: 1, pages: 1 }) })
+function render() {
+  const field = { props: ['modelValue'], emits: ['update:modelValue', 'focus'], template: '<div><slot/></div>' }
+  return shallowMount(TripPreparationDialog, { props: { modelValue: true, warehouseId: trip.warehouseId, warehouseName: '本仓', dispatchNos: ['DS-ONE', 'DS-TWO'] }, global: { plugins: [createPinia()], stubs: {
+    AppDialog: { name: 'AppDialog', props: ['showConfirm'], emits: ['confirm'], template: '<div><slot/></div>' },
+    ElForm: field, ElFormItem: field, ElSelect: { ...field, name: 'ElSelect' }, ElOption: true,
+    ElRadioGroup: { ...field, name: 'ElRadioGroup' }, ElRadio: true, ElDatePicker: field,
+    ElButton: { template: '<button><slot/></button>' }, CapacityOfferSettingsDialog: true,
+  } } })
+}
+it('loads same-warehouse trips on demand and retries one immutable atomic preparation', async () => {
+  const wrapper=render(); await flushPromises()
+  expect(listTrips).not.toHaveBeenCalled()
+  const select=wrapper.findComponent({ name: 'ElSelect' })
+  select.vm.$emit('focus'); await flushPromises()
+  expect(listTrips).toHaveBeenCalledWith(expect.objectContaining({ warehouseId: '9007199254740993', status: 'PLANNED' }))
+  select.vm.$emit('update:modelValue', trip.tripNo); await flushPromises()
+  vi.mocked(prepareTrip).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ trip, dispatches: [], driverQualification: null, loadingReview: { status: 'PENDING', reason: null, reviewerId: null, reviewedAt: null, recordVersion: null } } as TripDetail)
+  const dialog=wrapper.findComponent({ name: 'AppDialog' })
+  dialog.vm.$emit('confirm'); await flushPromises()
+  const original=vi.mocked(prepareTrip).mock.calls[0]![0]
+  expect(original).toMatchObject({ tripNo: 'TR-READY', recordVersion: 4, dispatchNos: ['DS-ONE','DS-TWO'], plan: null, vehicleId: null, driverId: null })
+  expect(wrapper.emitted('saved')).toBeUndefined()
+  dialog.vm.$emit('confirm'); await flushPromises()
+  expect(prepareTrip).toHaveBeenNthCalledWith(2, original)
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  expect(wrapper.text()).toContain('核对容量并发布余位')
+  expect(dialog.props('showConfirm')).toBe(false)
+  wrapper.unmount()
+})
diff --git a/src/modules/overseas-master-data/components/TripPreparationDialog.vue b/src/modules/overseas-master-data/components/TripPreparationDialog.vue
new file mode 100644
index 00000000..a46ea9d2
--- /dev/null
+++ b/src/modules/overseas-master-data/components/TripPreparationDialog.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import { computed, nextTick, onBeforeUnmount, reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listTrips, prepareTrip, type TripPreparation } from '../api/trips'
+import { listVehicles } from '../api/overseasMasterData'
+import { listDrivers } from '../api/drivers'
+import type { FleetTrip, TripDetail } from '../tripTypes'
+import type { VehicleDetail } from '../types'
+import type { DriverDetail } from '../driverTypes'
+import { useFleetDraftGuard } from '../useFleetDraftGuard'
+import CapacityOfferSettingsDialog from './CapacityOfferSettingsDialog.vue'
+const open = defineModel<boolean>({ default: false })
+const props = defineProps<{ warehouseId: string; warehouseName: string; dispatchNos: string[] }>()
+const emit = defineEmits<{ saved: [value: TripDetail] }>()
+const access = useAccessPreviewStore(), router = useRouter()
+const form = reactive({ mode: 'existing', tripNo: '', vehicleId: '', driverId: '', departure: '', end: '' })
+const trips = ref<FleetTrip[]>([]), vehicles = ref<VehicleDetail[]>([]), drivers = ref<DriverDetail[]>([])
+const busy = ref(false), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+const submittedSummary = ref<{ warehouseName: string; dispatchNos: string[] } | null>(null)
+const pending = ref<TripPreparation | null>(null), result = ref<TripDetail | null>(null), publishOpen = ref(false)
+const canCreate = computed(() => access.can('platform:fleet:trip:create') && access.can('platform:fleet:trip:assign'))
+const guard = useFleetDraftGuard('trip-preparation', open, form, busy, computed(() => !!pending.value))
+let generation = 0, searchSequence = 0
+watch(open, async visible => {
+  generation++; searchSequence++
+  if (!visible || pending.value) return
+  Object.assign(form, { mode: 'existing', tripNo: '', vehicleId: '', driverId: '', departure: '', end: '' })
+  result.value = null; trips.value = []; vehicles.value = []; drivers.value = []; error.value = null
+  await nextTick(); guard.capture()
+})
+async function search(kind: 'trip' | 'vehicle' | 'driver', keyword = '') {
+  const current = ++searchSequence; loading.value = true; error.value = null
+  try {
+    if (kind === 'trip') { const value = await listTrips({ page: 1, size: 100, warehouseId: props.warehouseId, status: 'PLANNED', keyword: keyword || undefined }); if (current === searchSequence) trips.value = value.records }
+    if (kind === 'vehicle') { const value = await listVehicles({ page: 1, size: 100, region: 'OVERSEAS', status: 'IN_SERVICE', keyword: keyword || undefined }); if (current === searchSequence) vehicles.value = value.records }
+    if (kind === 'driver') { const value = await listDrivers({ page: 1, size: 100, region: 'OVERSEAS', active: true, reviewStatus: 'APPROVED', expectedEnd: form.end || undefined, keyword: keyword || undefined }); if (current === searchSequence) drivers.value = value.records }
+  } catch (cause) { if (current === searchSequence) error.value = getApiErrorDetails(cause, '候选读取失败') }
+  finally { if (current === searchSequence) loading.value = false }
+}
+async function save() {
+  if (busy.value || !access.can('platform:fleet:trip:edit')) return
+  if (!pending.value) {
+    const creating = form.mode === 'new', selected = trips.value.find(t => t.tripNo === form.tripNo)
+    if (!props.warehouseId || !props.dispatchNos.length) { ElMessage.warning('请选择同仓待运排车单'); return }
+    if (creating ? !canCreate.value || !form.vehicleId || !form.driverId || !form.departure || !form.end : !selected) { ElMessage.warning('请完整选择车次或新车次资源和时间'); return }
+    submittedSummary.value = { warehouseName: props.warehouseName, dispatchNos: [...props.dispatchNos] }
+    const key = crypto.randomUUID()
+    pending.value = { tripNo: creating ? null : selected!.tripNo, recordVersion: creating ? null : selected!.recordVersion,
+      vehicleId: creating ? form.vehicleId : null, driverId: creating ? form.driverId : null, dispatchNos: [...props.dispatchNos], idempotencyKey: key,
+      plan: creating ? { warehouseId: props.warehouseId, plannedDepartureAt: form.departure, expectedDriverEndAt: form.end, stops: [{ name: '起运仓' }, { name: '待确定卸货点' }], idempotencyKey: key } : null }
+  }
+  const current = generation; busy.value = true; error.value = null
+  try {
+    const value = await prepareTrip(pending.value)
+    if (current === generation) { result.value = value; pending.value = null; guard.capture(); emit('saved', value); ElMessage.success('已安排车次，请核对容量后发布余位') }
+  } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '安排车次未完成'); if (cause instanceof ApiResponseError) pending.value = null } }
+  finally { if (current === generation) busy.value = false }
+}
+onBeforeUnmount(() => { generation++; searchSequence++ })
+</script>
+<template>
+  <AppDialog v-model="open" class="admin-density-dialog" title="安排车次" width="1080px" :before-close="guard.beforeClose" :show-confirm="!result" :confirm-text="pending ? '重试原请求' : '确认安排'" :confirm-loading="busy" @confirm="save">
+    <LoadErrorState v-if="error" title="安排未完成" :message="error.message" @retry="save"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <p>{{ pending ? submittedSummary?.warehouseName : warehouseName }} · 已选 {{ (pending ? submittedSummary?.dispatchNos : dispatchNos)?.length }} 张排车单：{{ (pending ? submittedSummary?.dispatchNos : dispatchNos)?.join('、') }}</p>
+    <p v-if="pending">提交结果尚未确定，请保留原请求重试，不另建车次。</p>
+    <template v-if="result"><p>已安排到 {{ result.trip.tripNo }} · {{ result.trip.stops.map(s => s.name).join(' → ') }}</p><p>多目的地请先在车次中确认行驶顺序，再核对容量发布余位。安排成功不代表已审核或发车。</p><el-button v-if="access.can('platform:fleet:trip:list')" @click="router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: result.trip.tripNo } })">查看车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:list')" type="primary" @click="publishOpen = true">核对容量并发布余位</el-button></template>
+    <el-form v-else label-position="top" class="density-form preparation-form" :disabled="busy || !!pending">
+      <el-form-item label="安排方式"><el-radio-group v-model="form.mode"><el-radio value="existing">加入已有车次</el-radio><el-radio v-if="canCreate" value="new">新建车次</el-radio></el-radio-group></el-form-item>
+      <el-form-item v-if="form.mode === 'existing'" label="本仓计划中车次" required><el-select v-model="form.tripNo" filterable remote :remote-method="(k: string) => search('trip', k)" :loading="loading" placeholder="按车次、车牌或司机搜索" @focus="search('trip')"><el-option v-for="t in trips" :key="t.tripNo" :value="t.tripNo" :label="`${t.tripNo} · ${t.vehiclePlate || '待分配车辆'} · ${t.stops.map(s => s.name).join(' → ')}`" /></el-select></el-form-item>
+      <template v-else>
+        <el-form-item label="计划发车时间" required><el-date-picker v-model="form.departure" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>
+        <el-form-item label="司机预计任务结束" required><el-date-picker v-model="form.end" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="包括返程或转场" /></el-form-item>
+        <el-form-item label="车辆" required><el-select v-model="form.vehicleId" placeholder="按车牌搜索" filterable remote :remote-method="(k: string) => search('vehicle', k)" :loading="loading" @focus="search('vehicle')"><el-option v-for="v in vehicles" :key="v.id" :value="v.id" :label="`${v.plateNumber} · ${v.maxPalletSpaces ?? '待核对'}托位`" /></el-select></el-form-item>
+        <el-form-item label="司机" required><el-select v-model="form.driverId" placeholder="按姓名搜索" filterable remote :remote-method="(k: string) => search('driver', k)" :loading="loading" @focus="search('driver')"><el-option v-for="d in drivers" :key="d.id" :value="d.id" :label="d.details.name" /></el-select></el-form-item>
+      </template>
+    </el-form>
+  </AppDialog>
+  <CapacityOfferSettingsDialog v-if="result" v-model="publishOpen" :trip="result.trip" @trip-updated="result.trip = $event" />
+</template>
+<style scoped>.preparation-form{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.preparation-form :deep(.el-select),.preparation-form :deep(.el-date-editor){width:100%}</style>
diff --git a/src/modules/overseas-master-data/index.ts b/src/modules/overseas-master-data/index.ts
index 5e9055e0..32e76b27 100644
--- a/src/modules/overseas-master-data/index.ts
+++ b/src/modules/overseas-master-data/index.ts
@@ -3,3 +3,7 @@ export { overseasMasterDataPermissions } from './permissions'
 export type * from './types'
 export { default as TransportRouteDialog } from './components/TransportRouteDialog.vue'
 export { routeLocation, type RouteLocation } from './routeLocations'
+
+export { default as TripPreparationDialog } from './components/TripPreparationDialog.vue'
+export { default as TripDispatchSelector } from './components/TripDispatchSelector.vue'
+export { listTripDispatchCandidates, prepareTrip, type TripPreparation, type DispatchCandidate } from './api/trips'
diff --git a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
index db94278c..a872d376 100644
--- a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
@@ -10,6 +10,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import CapacityInquiryTable from '../components/CapacityInquiryTable.vue'
+import CapacityInquiryFulfillment from '../components/CapacityInquiryFulfillment.vue'
 import CapacityInquiryDialog from '../components/CapacityInquiryDialog.vue'
 import { getCapacityOffer, getCapacityInquiry, listCapacityInquiries } from '../api/capacityOffers'
 import { offerStatusLabels, offerTime, loadText, type CapacityOfferDetail, type CapacityInquiry, type InquiryResult } from '../capacityOfferTypes'
@@ -17,6 +18,16 @@ import { useCapacityInquiryCommands } from '../useCapacityInquiryCommands'
 const route = useRoute(), router = useRouter(), access = useAccessPreviewStore()
 const detail = ref<CapacityOfferDetail | null>(null), loading = ref(false), error = ref<ApiErrorDetails | null>(null), inquiryError = ref<ApiErrorDetails | null>(null)
 const page = ref(1), size = ref(20), inquiryLoading = ref(false), editorOpen = ref(false), editing = ref<CapacityInquiry | null>(null), readonly = ref(false)
+const confirmMode = ref(false)
+const fulfillmentOpen = ref(false), fulfillmentRow = ref<CapacityInquiry | null>(null), fulfillmentMode = ref<'incoming' | 'receipt' | 'bind' | 'view'>('view')
+function openFulfillment(key: string, row: CapacityInquiry) {
+  if (key === 'appointment' && access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')) { void router.push({ name: 'appointment-calendar', query: { sourceKey: `BOOKING:${row.bookingNo}`, customerId: row.customerId, destinationKey: row.cargo.destinationKey } }); return true }
+  if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } }); return true }
+  if (!['incoming', 'receipt', 'bind', 'fulfillment'].includes(key)) return false
+  editorOpen.value = false
+  fulfillmentRow.value = row; fulfillmentMode.value = key === 'fulfillment' ? 'view' : key as 'incoming' | 'receipt' | 'bind'; fulfillmentOpen.value = true
+  return true
+}
 let sequence = 0, inquirySequence = 0, resetting = false
 const hasCreatePermission = computed(() => (access.can('platform:fleet:capacity-offer:manage') || access.can('platform:fleet:capacity-offer:list') && access.can('platform:fleet:capacity-offer:inquiry-create')))
 const canCreate = computed(() => detail.value?.offer.canCreateInquiry && hasCreatePermission.value)
@@ -49,8 +60,8 @@ function accept(value: InquiryResult) {
   for (const row of rows) { row.offerRecordVersion = value.offer.recordVersion; row.tripRecordVersion = value.offer.tripRecordVersion }
 }
 const commands = useCapacityInquiryCommands('capacity-offer-command', accept)
-async function action(key: string, row: CapacityInquiry) { if (key === 'confirm' || key === 'cancel') await commands.run(row, key); else { editing.value = row; readonly.value = key !== 'edit'; editorOpen.value = true } }
-function create() { if (!canCreate.value) return; editing.value = null; readonly.value = false; editorOpen.value = true }
+async function action(key: string, row: CapacityInquiry) { if (openFulfillment(key, row)) return; if (key === 'cancel') await commands.run(row, key); else { if (key === 'confirm' && !access.can('platform:fleet:capacity-offer:manage')) return; confirmMode.value = key === 'confirm'; editing.value = row; readonly.value = key !== 'edit' && key !== 'confirm'; editorOpen.value = true } }
+function create() { if (!canCreate.value) return; confirmMode.value = false; editing.value = null; readonly.value = false; editorOpen.value = true }
 watch(() => [route.name, route.params.offerNo], ([name, offerNo]) => {
   if (name !== 'overseas-master-data-capacity-offer-detail' || typeof offerNo !== 'string' || !offerNo) return
   detail.value = null; editorOpen.value = false; void load()
@@ -59,17 +70,18 @@ watch([page, size], loadInquiries)
 onBeforeUnmount(() => { sequence++; inquirySequence++ })
 </script>
 <template><AdminPage class="admin-density"><DetailPageLayout class="density-detail-layout surface-panel" aria-label="运力发布详情">
-  <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-master-data-capacity-offers' })">返回拼车需求池</el-button><h1 class="density-detail-title">{{ detail?.offer.offerNo || '运力发布详情' }}</h1><span v-if="detail">{{ offerStatusLabels[detail.offer.status] }}</span></div><div class="density-actions"><el-button :loading="loading" @click="load">重新核对</el-button><el-button v-if="hasCreatePermission" type="primary" :disabled="loading || !canCreate" @click="create">登记意向</el-button></div></div></template>
+  <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-master-data-capacity-offers' })">返回拼车接货</el-button><h1 class="density-detail-title">{{ detail?.offer.offerNo || '运力发布详情' }}</h1><span v-if="detail">{{ offerStatusLabels[detail.offer.status] }}</span></div><div class="density-actions"><el-button :loading="loading" @click="load">重新核对</el-button><el-button v-if="hasCreatePermission" type="primary" :disabled="loading || !canCreate" @click="create">登记客户货物</el-button></div></div></template>
   <LoadErrorState v-if="error" title="发布详情读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
   <div v-loading="loading" :aria-busy="loading"><template v-if="detail">
-    <dl class="density-fields"><div><dt>车次号</dt><dd><el-button v-if="access.can('platform:fleet:trip:list')" link type="primary" @click="router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: detail.offer.tripNo } })">{{ detail.offer.tripNo }}</el-button><span v-else>{{ detail.offer.tripNo }}</span></dd></div><div><dt>起运仓</dt><dd>{{ detail.offer.warehouseName }}</dd></div><div><dt>计划发车</dt><dd>{{ offerTime(detail.offer.plannedDepartureAt) }}</dd></div><div><dt>交货截止</dt><dd>{{ offerTime(detail.offer.cutoffAt) }}</dd></div><div><dt>调度联系人</dt><dd>{{ detail.offer.contactName || '—' }}</dd></div><div><dt>调度联系方式</dt><dd>{{ detail.offer.contactPhone || '—' }}</dd></div></dl>
-    <p v-if="hasCreatePermission && !detail.offer.canCreateInquiry" role="status">无法登记意向：{{ detail.offer.blockReason || '当前发布不接受新意向' }}</p>
-    <p v-else>{{ detail.offer.blockReason || '按所选卸货站核对每段余位；登记意向不占位，调度确认后占位。' }}</p><p v-if="detail.offer.remark">{{ detail.offer.remark }}</p>
+    <dl class="density-fields"><div><dt>车次号</dt><dd><el-button v-if="access.can('platform:fleet:trip:list')" link type="primary" @click="router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: detail.offer.tripNo } })">{{ detail.offer.tripNo }}</el-button><span v-else>{{ detail.offer.tripNo }}</span></dd></div><div><dt>起运仓</dt><dd>{{ detail.offer.warehouseName }}</dd></div><div><dt>计划发车</dt><dd>{{ offerTime(detail.offer.plannedDepartureAt) }}</dd></div><div><dt>最晚送仓</dt><dd>{{ offerTime(detail.offer.cutoffAt) }}</dd></div><div><dt>调度联系人</dt><dd>{{ detail.offer.contactName || '—' }}</dd></div><div><dt>调度联系方式</dt><dd>{{ detail.offer.contactPhone || '—' }}</dd></div></dl>
+    <p v-if="hasCreatePermission && !detail.offer.canCreateInquiry" role="status">无法登记客户货物：{{ detail.offer.blockReason || '当前发布不接受新意向' }}</p>
+    <p v-else>{{ detail.offer.blockReason || '按所选卸货站核对每段余位；登记客户货物不占位，调度确认后占位。' }}</p><p v-if="detail.offer.remark">{{ detail.offer.remark }}</p>
     <h2 class="capacity-section-title">分段运力</h2><DataTable :data="detail.offer.segments" :columns="columns" :stripe="false" row-key="fromIndex" empty-text="容量待调度核对"><template #planned="{ row }">{{ loadText(row.planned) }}</template><template #reserved="{ row }">{{ loadText(row.reserved) }}</template><template #remaining="{ row }">{{ detail.offer.capacityKnown ? loadText(row.remaining) : '待调度核对' }}</template></DataTable>
-    <h2 class="capacity-section-title">{{ access.can('platform:fleet:capacity-offer:manage') ? '本发布全部意向' : '我的意向' }}</h2>
+    <h2 class="capacity-section-title">{{ access.can('platform:fleet:capacity-offer:manage') ? '本发布全部意向' : '我的登记' }}</h2>
     <LoadErrorState v-if="inquiryError || commands.error.value" title="意向操作未完成" :message="(inquiryError || commands.error.value)?.message" @retry="commands.state.pending ? commands.retry() : loadInquiries()"><template #details><ApiErrorMeta :details="(inquiryError || commands.error.value)!" /></template></LoadErrorState><el-button v-if="commands.state.pending" :loading="commands.busy.value" @click="commands.retry">重试原操作</el-button>
     <CapacityInquiryTable v-model:page="page" v-model:size="size" :rows="detail.inquiries.records" :total="detail.inquiries.total" :loading="inquiryLoading" :failed="!!inquiryError" :busy="commands.busy.value" @action="action" />
   </template></div>
-  <CapacityInquiryDialog v-model="editorOpen" :offer="detail?.offer || null" :inquiry="editing" :readonly="readonly" @saved="accept" @refresh="load" />
+  <CapacityInquiryFulfillment v-model="fulfillmentOpen" :inquiry="fulfillmentRow" :mode="fulfillmentMode" @saved="load" />
+  <CapacityInquiryDialog v-model="editorOpen" :offer="detail?.offer || null" :inquiry="editing" :readonly="readonly" :confirm-mode="confirmMode" @action="action" @saved="accept" @refresh="load" />
 </DetailPageLayout></AdminPage></template>
 <style scoped>.capacity-section-title{font-size:var(--admin-font-section);margin:var(--admin-space-6) 0 var(--admin-space-3)}</style>
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index 135927ae..9be4ccc4 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -14,9 +14,9 @@ const state = vi.hoisted(() => ({ manage: false, write: true, quote: false, rout
 vi.mock('vue-router', () => ({ useRoute: () => state.route, useRouter: () => ({ push: state.push }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (p: string) => p === 'platform:fleet:capacity-offer:manage' ? state.manage : p === 'platform:fleet:quote:list' ? state.quote : p === 'platform:fleet:capacity-offer:list' || p.includes(':inquiry-') && state.write }) }))
 vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn().mockResolvedValue(undefined) } }))
-vi.mock('../api/capacityOffers', () => ({ listCapacityOffers: vi.fn(), listCapacityInquiries: vi.fn(), getCapacityOffer: vi.fn(), getCapacityInquiry: vi.fn(), saveCapacityInquiry: vi.fn(), commandCapacityInquiry: vi.fn(), listOfferCustomers: vi.fn(), listOfferQuotes: vi.fn(), saveCapacityOffer: vi.fn(), commandCapacityOffer: vi.fn() }))
+vi.mock('../api/capacityOffers', () => ({ listCapacityOffers: vi.fn(), listCapacityInquiries: vi.fn(), getCapacityOffer: vi.fn(), getCapacityInquiry: vi.fn(), saveCapacityInquiry: vi.fn(), saveAndConfirmInquiry: vi.fn(), commandCapacityInquiry: vi.fn(), listOfferCustomers: vi.fn(), listOfferQuotes: vi.fn(), saveCapacityOffer: vi.fn(), commandCapacityOffer: vi.fn() }))
 export const offer: CapacityOffer = { offerNo: 'CO-1', tripNo: 'TR-1', status: 'OPEN', recordVersion: 2, tripRecordVersion: 5, warehouseId: '92', warehouseName: '测试起运仓', plannedDepartureAt: '2026-10-10T12:00:00Z', cutoffAt: '2026-10-10T10:00:00Z', contactName: '调度', contactPhone: '测试联系信息', remark: null, capacityKnown: false, canCreateInquiry: true, canConfirm: false, blockReason: '待调度核对', destinations: [{ destinationKey: 'FBA:ONT8', name: 'ONT8', deliveryIndex: 1, remaining: null }], segments: [], actions: { canEdit: true, canPublish: false, canPause: true, canResume: false, canClose: true } }
-export const inquiry: CapacityInquiry = { bookingNo: 'FB-1', offerNo: 'CO-1', tripNo: 'TR-1', status: 'DRAFT', recordVersion: 1, offerRecordVersion: 2, tripRecordVersion: 5, salesOwnerUserId: '17', customerId: '19', customerCode: 'C-19', customerName: '测试客户', businessType: 'US_TRUCK', deliveryMode: 'SELF_DELIVERY', estimatedArrivalAt: null, expectedPalletCount: null, cargo: { destinationKey: 'FBA:ONT8', cargoName: null, packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null, priceBasis: 'PALLET', unitPrice: null, currency: 'USD', contactName: null, contactPhone: null, remark: null }, destinationLabel: 'ONT8', agreedAmount: null, quoteSource: null, businessOrderNo: null, incomingNo: null, dispatchNo: null, updatedAt: '2026-10-07T00:00:00Z', actions: { canEdit: true, canConfirm: false, canCancel: true, blockReason: null } }
+export const inquiry: CapacityInquiry = { bookingNo: 'FB-1', offerNo: 'CO-1', tripNo: 'TR-1', status: 'DRAFT', recordVersion: 1, offerRecordVersion: 2, tripRecordVersion: 5, salesOwnerUserId: '17', customerId: '19', customerCode: 'C-19', customerName: '测试客户', businessType: 'US_TRUCK', deliveryMode: 'SELF_DELIVERY', estimatedArrivalAt: null, expectedPalletCount: null, cargo: { destinationKey: 'FBA:ONT8', cargoName: null, packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null, priceBasis: 'PALLET', unitPrice: null, currency: 'USD', contactName: null, contactPhone: null, remark: null }, destinationLabel: 'ONT8', agreedAmount: null, quoteSource: null, businessOrderNo: null, incomingNo: null, dispatchNo: null, updatedAt: '2026-10-07T00:00:00Z', actions: { canEdit: true, canConfirm: false, canCancel: true, blockReason: null }, appointmentCoverage: null, progress: { stage: 'NEEDS_DETAILS', label: '待补资料', reservation: '尚未保位', owner: '销售', primaryAction: 'EDIT', message: '确认前还需补充资料', missingFields: ['预计重量'] } }
 const pageOf = <T,>(records: T[], total = records.length) => ({ records, total, page: 1, size: 20, pages: Math.ceil(total / 20) })
 const wrappers: VueWrapper[] = []
 const layout = { template: '<div><slot name="header"/><slot/></div>' }
@@ -44,7 +44,7 @@ it('loads only the active tab and sends exactly one query after resetting from a
   wrapper.findComponent({ name: 'DataTable' }).vm.$emit('update:page', 2); await flushPromises()
   wrapper.findComponent({ name: 'QueryToolbar' }).vm.$emit('search'); await flushPromises()
   expect(api.listCapacityOffers).toHaveBeenCalledTimes(3); expect(api.listCapacityOffers).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1 }))
-  await button(wrapper, '我的意向').trigger('click'); await flushPromises()
+  await button(wrapper, '我的登记').trigger('click'); await flushPromises()
   expect(api.listCapacityInquiries).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ scope: 'MINE' })); expect(api.getCapacityOffer).not.toHaveBeenCalled()
   const query = wrapper.findComponent({ name: 'QueryToolbar' }); query.vm.$emit('update:modelValue', { scope: 'ALL' }); await flushPromises(); query.vm.$emit('search'); await flushPromises()
   expect(api.listCapacityInquiries).toHaveBeenLastCalledWith(expect.objectContaining({ scope: 'MINE' }))
@@ -52,7 +52,7 @@ it('loads only the active tab and sends exactly one query after resetting from a
 it('ignores an older page response after changing tabs and retains an explicit error state', async () => {
   let resolve!: (value: ReturnType<typeof pageOf<CapacityOffer>>) => void
   vi.mocked(api.listCapacityOffers).mockReturnValue(new Promise(done => { resolve = done }))
-  const { wrapper } = mount(CapacityOffersView); await button(wrapper, '我的意向').trigger('click'); await flushPromises()
+  const { wrapper } = mount(CapacityOffersView); await button(wrapper, '我的登记').trigger('click'); await flushPromises()
   resolve(pageOf([offer], 900)); await flushPromises()
   expect(wrapper.findComponent({ name: 'CapacityInquiryTable' }).props('total')).toBe(1)
   vi.mocked(api.listCapacityInquiries).mockRejectedValue(new Error('读取失败')); wrapper.findComponent({ name: 'QueryToolbar' }).vm.$emit('search'); await flushPromises()
@@ -62,7 +62,7 @@ it('ignores an older page response after changing tabs and retains an explicit e
 it('reads detail once, permits drafting while capacity is unknown, and never preloads customers or quotes', async () => {
   const { wrapper } = mount(CapacityOfferDetailView); await flushPromises()
   expect(api.getCapacityOffer).toHaveBeenCalledOnce(); expect(api.listCapacityInquiries).not.toHaveBeenCalled()
-  await button(wrapper, '登记意向').trigger('click'); await flushPromises()
+  await button(wrapper, '登记客户货物').trigger('click'); await flushPromises()
   expect(wrapper.findComponent({ name: 'CapacityInquiryDialog' }).props('modelValue')).toBe(true)
   expect(api.listOfferCustomers).not.toHaveBeenCalled(); expect(api.listOfferQuotes).not.toHaveBeenCalled()
 })
@@ -100,7 +100,7 @@ it('retains an uncertain request and route protection after closing and reopenin
 })
 it('keeps sales from confirming even if a stale row advertises the action', async () => {
   const row = { ...inquiry, actions: { ...inquiry.actions, canConfirm: true } }
-  const { wrapper } = mount(CapacityOffersView); await flushPromises(); await button(wrapper, '我的意向').trigger('click'); await flushPromises()
+  const { wrapper } = mount(CapacityOffersView); await flushPromises(); await button(wrapper, '我的登记').trigger('click'); await flushPromises()
   wrapper.findComponent({ name: 'CapacityInquiryTable' }).vm.$emit('action', 'confirm', row); await flushPromises()
   expect(api.commandCapacityInquiry).not.toHaveBeenCalled(); expect(ElMessageBox.confirm).not.toHaveBeenCalled()
 })
@@ -110,27 +110,31 @@ it('loads publishing settings only when explicitly opened, not with the trip pag
   expect(api.listCapacityOffers).not.toHaveBeenCalled(); await (wrapper as VueWrapper<Record<string, unknown>>).setProps({ modelValue: true }); await flushPromises()
   expect(api.listCapacityOffers).toHaveBeenCalledExactlyOnceWith({ scope: 'ALL', tripNo: 'TR-1', page: 1, size: 1 })
 })
-it('retries an uncertain dispatch confirmation with the same command and no second confirmation box', async () => {
+it('retries an uncertain combined save and confirmation with the original payload', async () => {
   state.manage = true
   const row = { ...inquiry, actions: { ...inquiry.actions, canConfirm: true } }
-  vi.mocked(api.commandCapacityInquiry).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ offer, inquiry: { ...row, status: 'CONFIRMED' }, replayed: true })
-  const { wrapper } = mount(CapacityOffersView); await flushPromises(); await button(wrapper, '我的意向').trigger('click'); await flushPromises()
-  wrapper.findComponent({ name: 'CapacityInquiryTable' }).vm.$emit('action', 'confirm', row); await flushPromises()
-  const first = vi.mocked(api.commandCapacityInquiry).mock.calls[0]!
-  await button(wrapper, '重试原操作').trigger('click'); await flushPromises()
-  expect(api.commandCapacityInquiry).toHaveBeenNthCalledWith(2, ...first); expect(ElMessageBox.confirm).toHaveBeenCalledOnce()
-  expect(api.listCapacityInquiries).toHaveBeenCalledOnce()
+  vi.mocked(api.saveAndConfirmInquiry).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ offer, inquiry: { ...row, status: 'CONFIRMED' }, replayed: true })
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: row, readonly: false, confirmMode: true }); await flushPromises()
+  const dialog = wrapper.findComponent({ name: 'AppDialog' })
+  dialog.vm.$emit('confirm'); await flushPromises()
+  const first = vi.mocked(api.saveAndConfirmInquiry).mock.calls[0]!
+  expect(first[0]).toBe(row.bookingNo)
+  expect(wrapper.emitted('saved')).toBeUndefined()
+  dialog.vm.$emit('confirm'); await flushPromises()
+  expect(api.saveAndConfirmInquiry).toHaveBeenNthCalledWith(2, ...first)
+  expect(api.saveCapacityInquiry).not.toHaveBeenCalled()
+  expect(wrapper.emitted('saved')).toHaveLength(1)
 })
 
 it('keeps the create button disabled with a reason after cutoff, while hiding it without write permission', async () => {
   vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer: { ...offer, canCreateInquiry: false, blockReason: '交货截止已过或不符合当前发车时间' }, inquiries: pageOf([]) })
   const { wrapper } = mount(CapacityOfferDetailView); await flushPromises()
-  expect(button(wrapper, '登记意向').attributes('disabled')).toBeDefined()
-  expect(wrapper.text()).toContain('无法登记意向：交货截止已过')
+  expect(button(wrapper, '登记客户货物').attributes('disabled')).toBeDefined()
+  expect(wrapper.text()).toContain('无法登记客户货物：交货截止已过')
   expect(wrapper.findComponent({ name: 'CapacityInquiryDialog' }).props('modelValue')).toBe(false)
   state.write = false
   const readonly = mount(CapacityOfferDetailView); await flushPromises()
-  expect(readonly.wrapper.findAll('button').some(node => node.text() === '登记意向')).toBe(false)
+  expect(readonly.wrapper.findAll('button').some(node => node.text() === '登记客户货物')).toBe(false)
 })
 it('defaults administrators to available offers and requires an explicit history filter', async () => {
   state.manage = true
@@ -142,3 +146,18 @@ it('defaults administrators to available offers and requires an explicit history
   query.vm.$emit('update:modelValue', {}); await flushPromises(); query.vm.$emit('search'); await flushPromises()
   expect(api.listCapacityOffers).toHaveBeenLastCalledWith(expect.objectContaining({ scope: 'AVAILABLE' }))
 })
+
+it('automatically selects a single destination and preserves unknown quantities when only the customer is known', async () => {
+  vi.mocked(api.saveCapacityInquiry).mockResolvedValue({ offer, inquiry, replayed: false })
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: null, readonly: false }); await flushPromises()
+  wrapper.findAllComponents({ name: 'ElSelect' })[0]!.vm.$emit('update:modelValue', '19'); await flushPromises()
+  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+  expect(api.saveCapacityInquiry).toHaveBeenCalledWith(offer.offerNo, null, expect.objectContaining({ customerId: '19', cargo: expect.objectContaining({ destinationKey: 'FBA:ONT8', packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null }) }))
+})
+it('requires an explicit choice for multiple destinations', async () => {
+  const many = { ...offer, destinations: [...offer.destinations, { ...offer.destinations[0]!, destinationKey: 'FBA:ACY2', name: 'ACY2', deliveryIndex: 2 }] }
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer: many, inquiry: null, readonly: false }); await flushPromises()
+  wrapper.findAllComponents({ name: 'ElSelect' })[0]!.vm.$emit('update:modelValue', '19'); await flushPromises()
+  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+  expect(api.saveCapacityInquiry).not.toHaveBeenCalled()
+})
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersView.vue b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
index bdcbb79a..8dc6346a 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
@@ -11,6 +11,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import CapacityInquiryTable from '../components/CapacityInquiryTable.vue'
+import CapacityInquiryFulfillment from '../components/CapacityInquiryFulfillment.vue'
 import CapacityInquiryDialog from '../components/CapacityInquiryDialog.vue'
 import { listCapacityOffers, listCapacityInquiries, getCapacityOffer, getCapacityInquiry } from '../api/capacityOffers'
 import { offerStatusLabels, inquiryStatusLabels, offerTime, loadText, type CapacityOffer, type CapacityInquiry, type InquiryResult, type OfferQuery, type InquiryQuery } from '../capacityOfferTypes'
@@ -20,6 +21,16 @@ const tab = ref<'offers' | 'inquiries'>('offers'), filters = ref<QueryModel>({})
 const page = ref(1), size = ref(20), total = ref(0), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
 const offers = ref<CapacityOffer[]>([]), inquiries = ref<CapacityInquiry[]>([])
 const editorOpen = ref(false), editing = ref<CapacityInquiry | null>(null), selectedOffer = ref<CapacityOffer | null>(null), readonly = ref(true)
+const confirmMode = ref(false)
+const fulfillmentOpen = ref(false), fulfillmentRow = ref<CapacityInquiry | null>(null), fulfillmentMode = ref<'incoming' | 'receipt' | 'bind' | 'view'>('view')
+function openFulfillment(key: string, row: CapacityInquiry) {
+  if (key === 'appointment' && access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')) { void router.push({ name: 'appointment-calendar', query: { sourceKey: `BOOKING:${row.bookingNo}`, customerId: row.customerId, destinationKey: row.cargo.destinationKey } }); return true }
+  if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } }); return true }
+  if (!['incoming', 'receipt', 'bind', 'fulfillment'].includes(key)) return false
+  editorOpen.value = false
+  fulfillmentRow.value = row; fulfillmentMode.value = key === 'fulfillment' ? 'view' : key as 'incoming' | 'receipt' | 'bind'; fulfillmentOpen.value = true
+  return true
+}
 let sequence = 0, editorSequence = 0
 const manage = computed(() => access.can('platform:fleet:capacity-offer:manage'))
 const fields = computed<QueryField[]>(() => tab.value === 'offers' ? [
@@ -30,15 +41,22 @@ const fields = computed<QueryField[]>(() => tab.value === 'offers' ? [
 ] : [
   { key: 'keyword', label: '意向关键词', type: 'input', placeholder: '预订号 / 客户 / 车次', width: 260 },
   { key: 'status', label: '意向状态', type: 'select', placeholder: '全部状态', width: 150, options: Object.entries(inquiryStatusLabels).map(([value, label]) => ({ value, label })) },
-  ...(manage.value ? [{ key: 'scope', label: '意向范围', type: 'select', width: 150, placeholder: '我的意向', options: [{ value: 'MINE', label: '我的意向' }, { value: 'ALL', label: '全部意向' }] } as QueryField] : []),
+  ...(manage.value ? [{ key: 'scope', label: '意向范围', type: 'select', width: 150, placeholder: '我的登记', options: [{ value: 'MINE', label: '我的登记' }, { value: 'ALL', label: '全部登记' }, { value: 'TODO', label: '待我处理' }] } as QueryField] : []),
 ])
-const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' }, { key: 'offerNo', label: '发布号 / 车次号', minWidth: 220, slotName: 'identity' },
+const columns = computed<DataTableColumn[]>(() => [
+  { key: 'actions', label: '操作', width: 200, fixed: 'left', slotName: 'actions' }, { key: 'offerNo', label: '发布号 / 车次号', minWidth: 220, slotName: 'identity' },
   { key: 'warehouseName', label: '起运仓', minWidth: 155 }, { key: 'destinations', label: '目的站与可接余位', minWidth: 310, slotName: 'destinations', singleLine: false },
-  { key: 'plannedDepartureAt', label: '发车 / 交货截止', minWidth: 195, slotName: 'times' },
-  { key: 'segments', label: '分段计划占用 / 外接预留', minWidth: 320, slotName: 'loads', singleLine: false },
+  { key: 'plannedDepartureAt', label: '发车 / 最晚送仓', minWidth: 195, slotName: 'times' },
+  ...(manage.value ? [{ key: 'segments', label: '分段计划占用 / 外接预留', minWidth: 320, slotName: 'loads', singleLine: false }] : []),
   { key: 'status', label: '接单状态', minWidth: 170, slotName: 'status', singleLine: false }, { key: 'contactName', label: '调度联系信息', minWidth: 180, slotName: 'contact' },
-]
+])
+const canCreate = computed(() => manage.value || access.can('platform:fleet:capacity-offer:list') && access.can('platform:fleet:capacity-offer:inquiry-create'))
+async function create(row: CapacityOffer) {
+  if (!canCreate.value || !row.canCreateInquiry) return
+  const current = ++editorSequence; error.value = null
+  try { const value = await getCapacityOffer(row.offerNo); if (current !== editorSequence) return; selectedOffer.value = value.offer; confirmMode.value = false; editing.value = null; readonly.value = false; editorOpen.value = true }
+  catch (cause) { if (current === editorSequence) error.value = getApiErrorDetails(cause, '登记信息读取失败') }
+}
 function switchTab(value: 'offers' | 'inquiries') { if (tab.value === value) return; filters.value = {}; applied.value = {}; page.value = 1; total.value = 0; tab.value = value }
 async function load() {
   const current = ++sequence; loading.value = true; error.value = null
@@ -48,10 +66,10 @@ async function load() {
       const query: OfferQuery = { scope: manage.value && q.scope === 'ALL' ? 'ALL' : 'AVAILABLE', page: page.value, size: size.value, origin: String(q.origin || '') || undefined, destination: String(q.destination || '') || undefined, departureFrom: String(q.departureFrom || '') || undefined, departureTo: String(q.departureTo || '') || undefined, status: manage.value ? String(q.status || '') || undefined : undefined, canConfirm: q.canConfirm === 'true' ? true : q.canConfirm === 'false' ? false : undefined }
       const value = await listCapacityOffers(query); if (current === sequence) { offers.value = value.records; total.value = value.total }
     } else {
-      const query: InquiryQuery = { page: page.value, size: size.value, keyword: String(q.keyword || '') || undefined, status: String(q.status || '') || undefined, scope: manage.value && q.scope === 'ALL' ? 'ALL' : 'MINE' }
+      const query: InquiryQuery = { page: page.value, size: size.value, keyword: String(q.keyword || '') || undefined, status: String(q.status || '') || undefined, scope: manage.value && q.scope === 'TODO' ? 'TODO' : manage.value && q.scope === 'ALL' ? 'ALL' : 'MINE' }
       const value = await listCapacityInquiries(query); if (current === sequence) { inquiries.value = value.records; total.value = value.total }
     }
-  } catch (cause) { if (current === sequence) error.value = getApiErrorDetails(cause, '拼车需求池读取失败') }
+  } catch (cause) { if (current === sequence) error.value = getApiErrorDetails(cause, '拼车接货读取失败') }
   finally { if (current === sequence) loading.value = false }
 }
 function search() { applied.value = { ...filters.value }; if (page.value !== 1) page.value = 1; else void load() }
@@ -63,13 +81,16 @@ function accept(value: InquiryResult) {
 }
 const commands = useCapacityInquiryCommands('capacity-pool-command', accept)
 async function inquiryAction(key: string, row: CapacityInquiry) {
-  if (key === 'confirm' || key === 'cancel') { await commands.run(row, key); return }
+  if (openFulfillment(key, row)) return
+  if (key === 'cancel') { await commands.run(row, key); return }
+  if (key === 'confirm' && !manage.value) return
+  confirmMode.value = key === 'confirm'
   const current = ++editorSequence; error.value = null
-  if (key === 'edit') {
+  if (key === 'edit' || key === 'confirm') {
     try { const detail = await getCapacityOffer(row.offerNo); if (current !== editorSequence) return; selectedOffer.value = detail.offer }
     catch (cause) { if (current === editorSequence) error.value = getApiErrorDetails(cause, '意向编辑信息读取失败'); return }
   } else selectedOffer.value = null
-  editing.value = row; readonly.value = key !== 'edit'; editorOpen.value = true
+  editing.value = row; readonly.value = key !== 'edit' && key !== 'confirm'; editorOpen.value = true
 }
 async function recheckEditor() {
   if (!editing.value) return
@@ -82,33 +103,34 @@ async function recheckEditor() {
 }
 watch([tab, page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++; editorSequence++ })
 </script>
-<template><AdminPage class="admin-density"><ListPageLayout aria-label="拼车需求池">
+<template><AdminPage class="admin-density"><ListPageLayout aria-label="拼车接货">
   <DataTable v-if="tab === 'offers'" appearance="integrated" :stripe="false" preference-key="fleet-capacity-offers" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="offers" :columns="columns" :loading="loading" :total="total" row-key="offerNo" :empty-text="Object.values(applied).some(Boolean) ? '当前筛选条件下暂无运力发布' : '暂无获准查看的运力发布'">
-    <template #toolbar-start><h1>拼车需求池</h1></template>
+    <template #toolbar-start><h1>拼车接货</h1></template><template #toolbar-end><el-button v-if="manage" @click="switchTab('inquiries'); filters = { scope: 'TODO' }; applied = { scope: 'TODO' }">待我处理</el-button><el-button v-if="manage && access.can('platform:fleet:trip:list')" @click="router.push({ name: 'overseas-master-data-trips' })">选择车次发布余位</el-button></template>
     <template #filters>
       <div class="integrated-query-group">
-        <div class="density-status-tabs" role="tablist" aria-label="拼车需求池页签"><button role="tab" aria-selected="true" class="is-active" @click="switchTab('offers')">可接运力</button><button role="tab" aria-selected="false" @click="switchTab('inquiries')">我的意向</button></div>
-        <QueryToolbar v-model="filters" :fields="fields" ariaLabel="可接运力查询" :loading="loading" @search="search" />
+        <div class="density-status-tabs" role="tablist" aria-label="拼车接货页签"><button role="tab" aria-selected="true" class="is-active" @click="switchTab('offers')">可拼车次</button><button role="tab" aria-selected="false" @click="switchTab('inquiries')">我的登记</button></div>
+        <QueryToolbar v-model="filters" :fields="fields" ariaLabel="可拼车次查询" :loading="loading" @search="search" />
       </div>
     </template>
     <template #notices><LoadErrorState v-if="error" title="运力列表读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
-    <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" @click="router.push({ name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: row.offerNo } })">详情</el-button></div></template>
+    <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" v-if="canCreate" :disabled="!row.canCreateInquiry" @click="create(row as CapacityOffer)">登记客户货物</el-button><el-button class="density-action" @click="router.push({ name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: row.offerNo } })">详情</el-button></div></template>
     <template #identity="{ row }"><div>{{ row.offerNo }}</div><div>{{ row.tripNo }}</div></template>
     <template #destinations="{ row }"><div v-for="stop in (row as CapacityOffer).destinations" :key="stop.destinationKey">{{ stop.name }} · {{ row.capacityKnown ? loadText(stop.remaining) : '待调度核对' }}</div></template>
-    <template #times="{ row }"><div>{{ offerTime(row.plannedDepartureAt) }}</div><div>截止 {{ offerTime(row.cutoffAt) }}</div></template>
+    <template #times="{ row }"><div>发车 {{ offerTime(row.plannedDepartureAt) }}</div><div>最晚送仓 {{ offerTime(row.cutoffAt) }}</div></template>
     <template #loads="{ row }"><span v-if="!row.segments.length">{{ row.capacityKnown ? '—' : '待调度核对' }}</span><div v-for="segment in (row as CapacityOffer).segments" :key="segment.fromIndex">{{ segment.fromName }} → {{ segment.toName }}<br>计划 {{ loadText(segment.planned) }}<br>预留 {{ loadText(segment.reserved) }}</div></template>
-    <template #status="{ row }">{{ offerStatusLabels[(row as CapacityOffer).status] }} · {{ row.canConfirm ? '可确认承运' : '暂不可确认' }}<div v-if="row.blockReason">{{ row.blockReason }}</div></template>
+    <template #status="{ row }">{{ offerStatusLabels[(row as CapacityOffer).status] }} · {{ row.canConfirm ? '可登记，确认后保位' : row.canCreateInquiry ? '可先登记，待调度核对，尚不保位' : '暂不可登记' }}<div v-if="row.blockReason">{{ row.blockReason }}</div></template>
     <template #contact="{ row }"><div>{{ row.contactName || '—' }}</div><div>{{ row.contactPhone || '—' }}</div></template>
   </DataTable>
   <CapacityInquiryTable v-else integrated v-model:page="page" v-model:size="size" :rows="inquiries" :total="total" :loading="loading" :failed="!!error" :busy="commands.busy.value" @action="inquiryAction">
-    <template #toolbar-start><h1>{{ applied.scope === 'ALL' ? '全部意向' : '我的意向' }}</h1></template>
+    <template #toolbar-start><h1>{{ applied.scope === 'TODO' ? '待我处理' : applied.scope === 'ALL' ? '全部登记' : '我的登记' }}</h1></template>
     <template #filters>
       <div class="integrated-query-group">
-        <div class="density-status-tabs" role="tablist" aria-label="拼车需求池页签"><button role="tab" aria-selected="false" @click="switchTab('offers')">可接运力</button><button role="tab" aria-selected="true" class="is-active" @click="switchTab('inquiries')">我的意向</button></div>
+        <div class="density-status-tabs" role="tablist" aria-label="拼车接货页签"><button role="tab" aria-selected="false" @click="switchTab('offers')">可拼车次</button><button role="tab" aria-selected="true" class="is-active" @click="switchTab('inquiries')">我的登记</button></div>
         <QueryToolbar v-model="filters" :fields="fields" ariaLabel="拼车意向查询" :loading="loading" @search="search" />
       </div>
     </template>
     <template #notices><LoadErrorState v-if="error || commands.error.value" title="意向操作未完成" :message="(error || commands.error.value)?.message" @retry="commands.state.pending ? commands.retry() : load()"><template #details><ApiErrorMeta :details="(error || commands.error.value)!" /></template></LoadErrorState><el-button v-if="commands.state.pending" :loading="commands.busy.value" @click="commands.retry">重试原操作</el-button></template>
   </CapacityInquiryTable>
-  <CapacityInquiryDialog v-model="editorOpen" :offer="selectedOffer" :inquiry="editing" :readonly="readonly" @saved="accept" @refresh="recheckEditor" />
+  <CapacityInquiryFulfillment v-model="fulfillmentOpen" :inquiry="fulfillmentRow" :mode="fulfillmentMode" @saved="load" />
+  <CapacityInquiryDialog v-model="editorOpen" :offer="selectedOffer" :inquiry="editing" :readonly="readonly" :confirm-mode="confirmMode" @action="inquiryAction" @saved="accept" @refresh="recheckEditor" />
 </ListPageLayout></AdminPage></template>
diff --git a/src/modules/overseas-master-data/pages/TripDetailView.vue b/src/modules/overseas-master-data/pages/TripDetailView.vue
index bb1f8d61..68b133e7 100644
--- a/src/modules/overseas-master-data/pages/TripDetailView.vue
+++ b/src/modules/overseas-master-data/pages/TripDetailView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import TripDispatchSelector from '../components/TripDispatchSelector.vue'
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -194,8 +195,8 @@ onBeforeUnmount(() => { generation++; inspectionSequence++; historySequence++ })
       <el-tabs v-model="activeTab" class="density-element-tabs"><el-tab-pane name="overview"><template #label><span>🚚 分配与货物</span></template></el-tab-pane><el-tab-pane name="bookings"><template #label><span>📦 外接预订</span></template></el-tab-pane><el-tab-pane name="capacity"><template #label><span>📋 计划容量</span></template></el-tab-pane><el-tab-pane name="loading"><template #label><span>📦 实际装载</span></template></el-tab-pane><el-tab-pane name="completion"><template #label><span>✅ 结案与任务结束</span></template></el-tab-pane><el-tab-pane name="handovers"><template #label><span>在途交接</span></template></el-tab-pane><el-tab-pane name="costs"><template #label><span>直接成本</span></template></el-tab-pane><el-tab-pane name="history"><template #label><span>🕘 操作历史</span></template></el-tab-pane></el-tabs>
       <template v-if="activeTab === 'overview'">
         <FormSection v-if="planned && access.can(permission.tripAssign)" class="density-form-section" title="车辆与司机"><TripAssignmentPanel :key="detail.trip.tripNo" :detail="detail" @saved="accept" /></FormSection>
-        <FormSection class="density-form-section" title="本车排车单"><div v-if="editable" class="trip-inline"><el-input v-model="dispatchNo" placeholder="输入待关联的排车单号" :disabled="!!busy" @keyup.enter="bind" /><el-button type="primary" :loading="busy === 'bind'" :disabled="!!busy || !detail.trip.vehicleId" @click="bind">关联排车单</el-button><el-button :loading="busy === 'stops'" :disabled="!!busy || !detail.dispatches.length" @click="matchStops">按货物匹配卸货站</el-button></div>
-          <p>先分配车辆和司机，关联排车单并匹配卸货站。每单调度审核通过后拣货，确认实际装载并通过理货审核后整车发车。</p>
+        <FormSection class="density-form-section" title="本车排车单"><div v-if="editable" class="trip-inline"><TripDispatchSelector v-model="dispatchNo" :trip-no="detail.trip.tripNo" :disabled="!!busy" /><el-button type="primary" :loading="busy === 'bind'" :disabled="!!busy || !detail.trip.vehicleId" @click="bind">关联排车单</el-button><el-button :loading="busy === 'stops'" :disabled="!!busy || !detail.dispatches.length" @click="matchStops">按货物匹配卸货站</el-button></div>
+          <p>先分配车辆和司机，选择待运排车单后自动匹配卸货站。每单调度审核通过后拣货，确认实际装载并通过理货审核后整车发车。</p>
           <DataTable :data="detail.dispatches" :columns="bindingsColumns" row-key="dispatchNo" empty-text="尚未关联排车单"><template #actions="{ row }"><div class="density-actions"><el-button v-if="access.can('platform:overseas-warehouse:dispatch:list')" class="density-action" @click="router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } })">详情</el-button><el-button v-if="editable" class="density-action" data-tone="danger" :disabled="!!busy" @click="unbind(row.dispatchNo)">解除关联</el-button><el-button v-if="planned && access.can(permission.tripDispatchReview)" class="density-action" :disabled="!!busy || row.review.status === 'APPROVED'" @click="review('APPROVED', row.dispatchNo)">审核通过</el-button><el-button v-if="planned && access.can(permission.tripDispatchReview)" class="density-action" data-tone="danger" :disabled="!!busy" @click="review('REJECTED', row.dispatchNo)">打回</el-button></div></template><template #review="{ row }"><span>{{ tripReviewLabels[row.review.status as keyof typeof tripReviewLabels] }}</span><p v-if="row.review.reason">{{ row.review.reason }}</p><span v-if="row.review.reviewedAt">{{ time(row.review.reviewedAt) }}</span></template><template #boundAt="{ row }">{{ time(row.boundAt) }}</template></DataTable>
         </FormSection>
       </template>
diff --git a/src/modules/overseas-master-data/routes.ts b/src/modules/overseas-master-data/routes.ts
index f7d3fc47..f3b57145 100644
--- a/src/modules/overseas-master-data/routes.ts
+++ b/src/modules/overseas-master-data/routes.ts
@@ -6,7 +6,7 @@ export const overseasMasterDataRoutes = [
     path: 'overseas-master-data/capacity-offers',
     name: 'overseas-master-data-capacity-offers',
     component: () => import('./pages/CapacityOffersView.vue'),
-    meta: { title: '拼车需求池', description: '查看车次可接运力并跟进拼车意向', permission: permission.capacityOfferList, permissionAnyOf: [permission.capacityOfferManage], showPageHeading: false },
+    meta: { title: '拼车接货', description: '查看车次可接运力并跟进拼车意向', permission: permission.capacityOfferList, permissionAnyOf: [permission.capacityOfferManage], showPageHeading: false },
   },
   {
     path: 'overseas-master-data/capacity-offers/:offerNo',
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
index d2ec2336..35c1e2d4 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts
@@ -1,3 +1,4 @@
+import { createPinia } from 'pinia'
 import ElementPlus, { ElFormItem, ElDatePicker, ElSelect, ElCheckbox } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import { readFileSync } from 'node:fs'
@@ -69,7 +70,7 @@ describe('DispatchesView', () => {
   it('queries stages on the server and discards an older response after switching', async () => {
     let resolveOld!: (value: Awaited<ReturnType<typeof listDispatches>>) => void
     vi.mocked(listDispatches).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await wrapper.get('[role="tablist"]').findAll('button')[2]!.trigger('click')
     await flushPromises()
     expect(listDispatches).toHaveBeenLastCalledWith(expect.objectContaining({ stage: 'LOADING', page: 1, status: undefined }))
@@ -83,7 +84,7 @@ describe('DispatchesView', () => {
   })
 
   it('shows the shared route map only in the after-loading vehicle section without another query', async () => {
-    const wrapper = mount(DispatchesView, { attachTo: document.body, global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(wrapper.text()).not.toContain('查看路线')
     await wrapper.get('[aria-label="排车执行阶段"]').findAll('button')[3]!.trigger('click')
@@ -106,7 +107,7 @@ describe('DispatchesView', () => {
     result.records[0]!.workflow = { tripNo: 'TR-A', dispatchReview: { status: 'REJECTED', reason: '请核对货量', reviewedAt: null }, loadingReview: { status: 'PENDING', reason: null, reviewedAt: null } }
     vi.mocked(listDispatches).mockClear().mockResolvedValue(result)
     canPermission.mockImplementation(code => code === 'platform:fleet:trip:list')
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     const sections = wrapper.get('[aria-label="排车业务分区"]')
     expect(sections.findAll('button').map(button => button.text())).toEqual(['车辆信息'])
@@ -133,7 +134,7 @@ describe('DispatchesView', () => {
   })
 
   it.each([0, 2, 3, 4].flatMap(stageIndex => [1, 2].map(sectionIndex => [stageIndex, sectionIndex])))('leaving a review section for stage %s resets section %s to vehicle information', async (stageIndex, sectionIndex) => {
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     const stages = wrapper.get('[aria-label="排车执行阶段"]').findAll('button')
     const sections = wrapper.get('[aria-label="排车业务分区"]')
@@ -163,7 +164,7 @@ describe('DispatchesView', () => {
     [['edit', 'cancel', 'transfer-delivery'], ['查看', '打印BOL', '转派送', '更多'], true],
   ])('uses the row action threshold for permissions %j', async (allowed, labels, overflow) => {
     canPermission.mockImplementation(code => allowed.some(action => code === 'platform:overseas-warehouse:dispatch:' + action))
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     const actions = wrapper.get('.el-table__body-wrapper .density-actions')
     expect(actions.findAll('button').map(button => button.text().trim())).toEqual(labels)
@@ -172,7 +173,7 @@ describe('DispatchesView', () => {
 
   it('keeps the integrated header and filters usable through failure and retry', async () => {
     vi.mocked(listDispatches).mockRejectedValueOnce(new Error('网络错误'))
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     const card = wrapper.get('.data-table--integrated')
     expect(card.get('.data-table__toolbar h1').text()).toBe('排车列表')
@@ -188,7 +189,7 @@ describe('DispatchesView', () => {
   })
 
   it('loads immediately and sends only supported page filters', async () => {
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(listDispatches).toHaveBeenCalledWith({ page: 1, size: 10, dispatchNo: undefined, vehiclePlate: undefined, status: undefined, fbaAppointmentNo: undefined })
 
@@ -221,7 +222,7 @@ describe('DispatchesView', () => {
       records: [{ id: '190000000000000099', dispatchNo: '190000000000000099' }],
       page: 1, size: 20, total: 1, pages: 1,
     })
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(wrapper.html()).toContain('190000000000000099')
   })
@@ -230,7 +231,7 @@ describe('DispatchesView', () => {
     const pdfWindow = { location: { href: '' }, close: vi.fn() }
     vi.spyOn(window, 'open').mockReturnValue(pdfWindow as unknown as Window)
     vi.stubGlobal('URL', { createObjectURL: vi.fn(() => 'blob:dispatch-bol'), revokeObjectURL: vi.fn() })
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(getDispatchBolPdf).not.toHaveBeenCalled()
 
@@ -251,7 +252,7 @@ describe('DispatchesView', () => {
     vi.mocked(getDispatchExternalFreight).mockResolvedValue({ snapshotHash: 'external-hash', requiresDeliveryFee: false, quotes: [
       { bookingNo: 'FB-1', recordVersion: '4', incomingNo: 'WT-1', inboundCode: 'IN-1', customerName: '客户甲', destinationKey: 'FBA:ONT8', currency: 'CNY', amount: 60, quantity: 2, quantityUnit: '托位', unitPrice: 30 },
     ] })
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(getDispatchExternalFreight).not.toHaveBeenCalled()
     await wrapper.findAll('button').find(button => button.text() === '转派送')!.trigger('click')
@@ -276,7 +277,7 @@ describe('DispatchesView', () => {
       cargo: [{ dispatchItemId: '201', warehousePalletId: '501', palletNo: 'PLT-1', orderId: '401', sourceRegion: 'FIRSTLEG', sourceInboundId: '11', inboundCode: 'IN-11', packages: 20, dispatchInboundCode: 'IN-11' }],
       feeSources: [{ financeFeeId: '711', sourceFeeId: '811', sourceType: 'INBOUND_FEE', sourceVersion: 3, customerId: '101', sourceInboundId: '11', inboundCode: 'IN-11', feeItemCode: 'FREIGHT', feeItemName: '原运费', currency: 'CNY', amount: 100, sourceHash: 'original-fee-hash', status: 'AVAILABLE' }],
     })
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(getDispatchFeeCoverage).not.toHaveBeenCalled()
     await wrapper.findAll('button').find(button => button.text() === '转派送')!.trigger('click')
@@ -315,7 +316,7 @@ describe('DispatchesView', () => {
     expect(source).not.toContain('departDispatch')
 
     canPermission.mockReturnValue(false)
-    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    const wrapper = mount(DispatchesView, { global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(wrapper.text()).not.toContain('转派送')
   })
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.vue b/src/modules/overseas-warehouse/pages/DispatchesView.vue
index f62a8941..223e75ab 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
+import { TripPreparationDialog, TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
 import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
@@ -35,6 +35,16 @@ function openRoute(row: DispatchListItem) {
 }
 const access = useAccessPreviewStore()
 const rows = ref<DispatchListItem[]>([])
+const selectedDispatches = ref<DispatchListItem[]>([]), prepareOpen = ref(false), prepareWarehouse = ref(''), prepareWarehouseName = ref(''), prepareNumbers = ref<string[]>([])
+const canPrepare = computed(() => access.can('platform:fleet:trip:edit') && access.can('platform:fleet:trip:list'))
+function beginPreparation() {
+  const selected = selectedDispatches.value
+  if (!selected.length || selected.some(row => row.statusCode !== 'PENDING_DEPARTURE' || row.workflow)) { ElMessage.warning('请选择尚未关联车次的待发运排车单'); return }
+  const warehouses = new Set(selected.map(row => dispatchSnapshots.get(row.dispatchNo)?.overseasWarehouseId))
+  if (warehouses.size !== 1 || ![...warehouses][0]) { ElMessage.warning('请选择同一起运仓的排车单'); return }
+  prepareWarehouse.value = String([...warehouses][0]); prepareWarehouseName.value = selected[0]!.overseasWarehouse
+  prepareNumbers.value = selected.map(row => row.dispatchNo); prepareOpen.value = true
+}
 const loading = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
 const page = ref(1)
@@ -277,6 +287,7 @@ const visibleColumns = computed(() => {
   const keys = ['actions', 'dispatchNo', 'workflow', section.value, 'vehiclePlate', 'driverName', 'route', 'palletCount', 'packageCount', 'status']
   return keys.map(key => columns.find(column => column.key === key)!)
 })
+const preparationColumns = computed<DataTableColumn[]>(() => canPrepare.value ? [visibleColumns.value[0]!, { key: 'selection', type: 'selection', width: 45, selectable: (row: DispatchListItem) => row.statusCode === 'PENDING_DEPARTURE' && !row.workflow }, ...visibleColumns.value.slice(1)] : visibleColumns.value)
 const tablePreferenceKey = computed(() => section.value === 'vehicle' ? 'overseas-dispatches' : `overseas-dispatches-${section.value}`)
 
 function text(value: unknown) {
@@ -652,9 +663,9 @@ onMounted(load)
 
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="海外仓排车列表">
-    <OperationErrorToast :details="mutationError" />
-    <DataTable v-model:page="page" v-model:page-size="pageSize" appearance="integrated" :stripe="false" :data="rows" :columns="visibleColumns" :loading="loading" :total="total" :preference-key="tablePreferenceKey" row-key="id" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
-      <template #toolbar-start><h1>排车列表</h1></template>
+    <OperationErrorToast :details="mutationError" /><TripPreparationDialog v-model="prepareOpen" :warehouse-id="prepareWarehouse" :warehouse-name="prepareWarehouseName" :dispatch-nos="prepareNumbers" @saved="load()" />
+    <DataTable v-model:page="page" v-model:page-size="pageSize" appearance="integrated" :stripe="false" :data="rows" :columns="preparationColumns" @selection-change="selectedDispatches = $event" :loading="loading" :total="total" :preference-key="tablePreferenceKey" row-key="id" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
+      <template #toolbar-start><h1>排车列表</h1></template><template #toolbar-end><el-button v-if="canPrepare" type="primary" :disabled="!selectedDispatches.length" @click="beginPreparation">安排车次</el-button></template>
       <template #filters><div class="integrated-query-group">
         <div class="density-status-tabs" role="tablist" aria-label="排车执行阶段">
           <button v-for="item in stages" :key="item.value" role="tab" :aria-selected="stage === item.value" :class="{ 'is-active': stage === item.value }" @click="switchStage(item.value)">{{ item.label }}</button>

From 302cc50a4bf6f619f0eaed2bfb0c6f823087437c Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 02:19:39 +0800
Subject: [PATCH 11/47] feat(procurement): add sample fulfillment operation
 workspace

---
 .../overseas-business/PROTOTYPE_MATRIX.md     |   2 +
 .../api/platformOverseasBusiness.test.ts      |  31 ++-
 .../api/platformOverseasBusiness.ts           |  60 ++--
 .../api/procurementCommands.test.ts           |  58 ++++
 .../api/procurementCommands.ts                |  62 +++++
 .../components/ProcurementChargeFields.vue    |  29 ++
 .../components/ProcurementControlFields.vue   |  41 +++
 .../components/ProcurementFinanceFields.vue   |  74 +++++
 .../components/ProcurementNodeActions.test.ts | 213 ++++++++++++++
 .../components/ProcurementNodeActions.vue     | 178 ++++++++++++
 .../components/ProcurementPhysicalFields.vue  |  50 ++++
 .../components/ProcurementTransportFields.vue |  61 ++++
 .../overseas-business/contract.test.ts        |  10 +-
 .../pages/OverseasBusinessViews.test.ts       | 115 +++++---
 .../pages/PurchaseOrderDetailView.vue         | 263 +++++++++++-------
 .../pages/PurchaseOrderEditView.vue           | 119 ++++----
 .../pages/PurchaseOrdersView.vue              |  39 ++-
 .../procurementControlForm.test.ts            |  66 +++++
 .../procurementControlForm.ts                 |  51 ++++
 .../procurementFinanceForm.test.ts            | 119 ++++++++
 .../procurementFinanceForm.ts                 | 113 ++++++++
 .../overseas-business/procurementPending.ts   | 132 +++++++++
 .../procurementPhysicalForm.test.ts           |  80 ++++++
 .../procurementPhysicalForm.ts                |  76 +++++
 .../procurementPresentation.ts                |  65 +++++
 .../procurementTransportForm.test.ts          |  71 +++++
 .../procurementTransportForm.ts               |  75 +++++
 .../overseas-business/procurementTypes.ts     | 119 ++++++++
 src/modules/overseas-business/types.ts        |  32 +--
 src/styles/adminDensity.test.ts               |   4 +-
 30 files changed, 2107 insertions(+), 301 deletions(-)
 create mode 100644 src/modules/overseas-business/api/procurementCommands.test.ts
 create mode 100644 src/modules/overseas-business/api/procurementCommands.ts
 create mode 100644 src/modules/overseas-business/components/ProcurementChargeFields.vue
 create mode 100644 src/modules/overseas-business/components/ProcurementControlFields.vue
 create mode 100644 src/modules/overseas-business/components/ProcurementFinanceFields.vue
 create mode 100644 src/modules/overseas-business/components/ProcurementNodeActions.test.ts
 create mode 100644 src/modules/overseas-business/components/ProcurementNodeActions.vue
 create mode 100644 src/modules/overseas-business/components/ProcurementPhysicalFields.vue
 create mode 100644 src/modules/overseas-business/components/ProcurementTransportFields.vue
 create mode 100644 src/modules/overseas-business/procurementControlForm.test.ts
 create mode 100644 src/modules/overseas-business/procurementControlForm.ts
 create mode 100644 src/modules/overseas-business/procurementFinanceForm.test.ts
 create mode 100644 src/modules/overseas-business/procurementFinanceForm.ts
 create mode 100644 src/modules/overseas-business/procurementPending.ts
 create mode 100644 src/modules/overseas-business/procurementPhysicalForm.test.ts
 create mode 100644 src/modules/overseas-business/procurementPhysicalForm.ts
 create mode 100644 src/modules/overseas-business/procurementPresentation.ts
 create mode 100644 src/modules/overseas-business/procurementTransportForm.test.ts
 create mode 100644 src/modules/overseas-business/procurementTransportForm.ts
 create mode 100644 src/modules/overseas-business/procurementTypes.ts

diff --git a/src/modules/overseas-business/PROTOTYPE_MATRIX.md b/src/modules/overseas-business/PROTOTYPE_MATRIX.md
index 65687119..28fc3ad8 100644
--- a/src/modules/overseas-business/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-business/PROTOTYPE_MATRIX.md
@@ -1,5 +1,7 @@
 # 海外业务原型核对矩阵
 
+采购样品履约的当前操作与页面承载以[采购订单样品履约流程变更需求第 10.6 节](../../../../../docs/海外仓业务/采购订单样品履约流程变更需求.md#106-平台页面实施核对矩阵)为准。下表采购旧五分区和通用编辑仅保留原型定位；当前详情使用履约聚合数据，独立编辑只维护内部备注，节点写入使用各自权限和命令。
+
 本土散板列表、本土卡车新增/编辑共用`../overseas-master-data/index.ts`公开的`TransportRouteDialog`。字段来源、原型证据和缺值处理唯一见[运输路线地图](../overseas-master-data/PROTOTYPE_MATRIX.md#运输路线地图)。按已有起终点规划，不写订单、不使用固定演示、不采集GPS。
 
 ## 池来源本土订单承运安排
diff --git a/src/modules/overseas-business/api/platformOverseasBusiness.test.ts b/src/modules/overseas-business/api/platformOverseasBusiness.test.ts
index 134c073c..4c14d578 100644
--- a/src/modules/overseas-business/api/platformOverseasBusiness.test.ts
+++ b/src/modules/overseas-business/api/platformOverseasBusiness.test.ts
@@ -4,9 +4,9 @@ const overseas = vi.hoisted(() => ({ get: vi.fn(), patch: vi.fn(), post: vi.fn()
 vi.mock('@/shared/api/http', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: overseas }))
 
 import {
-  createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getUsTruckOrder,
+  createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getOverseasPurchaseEditor, getUsTruckOrder,
   listLocalLooseboardOrders, listOverseasPurchaseCustomerOptions, listOverseasPurchases,
-  listOverseasPurchaseWarehouseOptions, listUsTruckOrders, reviewOverseasPurchase, updateLocalLooseboardOrder, updateOverseasPurchase,
+  listOverseasPurchaseWarehouseOptions, listUsTruckOrders, updateLocalLooseboardOrder, updateOverseasPurchase,
   updateUsTruckOrder,
 } from './platformOverseasBusiness'
 import type { UpdateLocalTransportOrderRequest } from '../types'
@@ -15,7 +15,7 @@ const envelope = <T>(data: T) => ({ code: '200', message: 'success', data })
 const purchaseSummary = {
   id: '9007199254740993', orderNo: 'OP-1', customerId: '10001', customerName: '客户一', purchaseCategory: '服装', productName: '外套',
   productSpecification: null, purchaseQuantity: 10, budgetUnitPrice: 12.34, currency: 'USD', purchaseWarehouseId: '9007199254740995',
-  purchaseWarehouseName: '采购仓', inboundQuantity: 5, outboundQuantity: 0, inventoryQuantity: 5, status: 'PENDING_OUTBOUND', version: 4,
+  purchaseWarehouseName: '采购仓', status: 'WAIT_PACKING', version: 4,
   createdAt: '2026-08-01T00:00:00', updatedAt: '2026-08-02T00:00:00',
 }
 const truckSummary = {
@@ -48,23 +48,24 @@ describe('platform overseas business API adapter', () => {
   })
 
   it('loads and patches procurement detail with three-state null payloads', async () => {
-    const detail = { summary: purchaseSummary, productUrl: null, histories: [{ operationType: 'UPDATE', fromStatus: 'APPROVED', toStatus: 'APPROVED', operatorId: '7', changeDetail: '{}', remark: null, createdAt: '2026-08-02T00:00:00' }] }
-    overseas.get.mockResolvedValue(envelope(detail))
-    expect((await getOverseasPurchase('OP/1', '10001')).histories[0]?.operationType).toBe('UPDATE')
+    const detail = { summary: purchaseSummary, productUrl: null, histories: [{ operationType: 'UPDATE', fromStatus: 'WAIT_PURCHASE', toStatus: 'WAIT_PURCHASE', operatorId: '7', changeDetail: '{}', remark: null, createdAt: '2026-08-02T00:00:00' }] }
+    overseas.get.mockResolvedValue(envelope({ customerView: { order: purchaseSummary }, reviewHistory: detail.histories, physical: { dispositions: [], receipts: [], cartons: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] } }))
+    expect((await getOverseasPurchase('OP/1', '10001')).reviewHistory[0]?.operationType).toBe('UPDATE')
     overseas.patch.mockResolvedValue(envelope(detail))
-    const payload = { version: 4, productUrl: null, estimatedArrivalAt: null }
+    const payload = { version: 4, remark: null }
     await updateOverseasPurchase('OP-1', '10001', payload)
     expect(overseas.patch).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP-1', payload, { params: { customerId: '10001' } })
   })
 
-  it('submits procurement review with version and idempotency data', async () => {
-    const detail = { summary: { ...purchaseSummary, status: 'APPROVED', version: 5 }, histories: [] }
-    overseas.post.mockResolvedValue(envelope(detail))
-    const payload = { version: 4, decision: 'APPROVE' as const, idempotencyKey: 'review-key', remark: '资料齐全' }
-    const result = await reviewOverseasPurchase('OP/1', '10001', payload)
-    expect(overseas.post).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/review', payload, { params: { customerId: '10001' } })
-    expect(result.status).toBe('APPROVED')
-    expect(result.version).toBe(5)
+  it('reads the aggregate editor context and strips obsolete mutation fields', async () => {
+    const detail = { customerView: { order: { orderNo: 'OP/1', customerId: '10001', productName: '外套', purchaseQuantity: 10, version: 4 } }, internalRemark: '内部' }
+    overseas.get.mockResolvedValue(envelope(detail))
+    expect(await getOverseasPurchaseEditor('OP/1', '10001')).toEqual(detail)
+    expect(overseas.get).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1', { params: { customerId: '10001' } })
+    overseas.patch.mockResolvedValue(envelope({ summary: purchaseSummary }))
+    const obsolete = { version: 4, remark: '内部', inboundQuantity: 200, purchaseWarehouseId: 'other', productName: 'changed' }
+    await updateOverseasPurchase('OP/1', '10001', obsolete)
+    expect(overseas.patch).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1', { version: 4, remark: '内部' }, { params: { customerId: '10001' } })
   })
 
   it('supports platform truck list/detail/create/update without status endpoints', async () => {
diff --git a/src/modules/overseas-business/api/platformOverseasBusiness.ts b/src/modules/overseas-business/api/platformOverseasBusiness.ts
index d76f6b76..16660e73 100644
--- a/src/modules/overseas-business/api/platformOverseasBusiness.ts
+++ b/src/modules/overseas-business/api/platformOverseasBusiness.ts
@@ -1,12 +1,13 @@
+import type { PlatformProcurement } from '../procurementTypes'
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 import type {
   CreateLocalLooseboardOrderRequest, CreateLocalTransportOrderRequest, LocalLooseboardDetail, LocalLooseboardOrder,
   LocalLooseboardQuery, LocalTransportDetail, LocalTransportOrder, LocalTransportPallet, LocalTransportQuery,
-  OverseasBusinessHistory, OverseasBusinessPage, OverseasPurchaseCustomerOption, OverseasPurchaseDetail,
+  OverseasBusinessHistory, OverseasBusinessPage, OverseasPurchaseCustomerOption,
   OverseasPurchaseQuery, OverseasPurchaseSummary, OverseasPurchaseWarehouseOption, UpdateLocalLooseboardOrderRequest,
-  UpdateLocalTransportOrderRequest, UpdateOverseasPurchaseRequest, OverseasPurchaseOutboundDetail,
-  OverseasPurchaseFile, OverseasPurchaseFee, ReviewOverseasPurchaseRequest,
+  UpdateLocalTransportOrderRequest, UpdateOverseasPurchaseRequest,
+  OverseasPurchaseEditorDetail,
 } from '../types'
 
 const procurementBasePath = '/platform/v1/last-leg/overseas-procurements'
@@ -15,13 +16,7 @@ const looseboardBasePath = '/platform/v1/last-leg/local-looseboard-orders'
 type Numeric = number | string
 interface PagePayload<T> { records?: T[]; page: Numeric; size: Numeric; total: Numeric; pages: Numeric }
 interface ProcurementSummaryPayload extends Omit<OverseasPurchaseSummary, 'id' | 'purchaseWarehouseId' | 'budgetUnitPrice'> { id: Numeric; purchaseWarehouseId?: Numeric | null; budgetUnitPrice?: Numeric | null }
-interface ProcurementDetailPayload {
-  summary: ProcurementSummaryPayload; productUrl?: string | null; receivingAddress?: string | null
-  contactName?: string | null; contactPhone?: string | null; domesticCarrier?: string | null; domesticTrackingNo?: string | null
-  overseasCarrier?: string | null; overseasTrackingNo?: string | null; estimatedArrivalAt?: string | null; remark?: string | null
-  createdBy?: string | null; reviewedBy?: string | null; reviewRemark?: string | null; reviewedAt?: string | null
-  histories?: OverseasBusinessHistory[]; outboundDetails?: OverseasPurchaseOutboundDetail[]; files?: any[]; fees?: any[]
-}
+interface ProcurementDetailPayload { summary: ProcurementSummaryPayload }
 interface TruckSummaryPayload extends Omit<LocalTransportOrder, 'id' | 'budgetAmount' | 'totalWeightKg' | 'totalVolumeCbm'> { id: Numeric; budgetAmount?: Numeric | null; totalWeightKg: Numeric; totalVolumeCbm: Numeric }
 interface TruckPalletPayload extends Omit<LocalTransportPallet, 'id' | 'warehousePalletId'> { id: Numeric; warehousePalletId?: Numeric | null }
 interface TruckDetailPayload {
@@ -40,9 +35,6 @@ function normalizePage<TPayload, TResult>(payload: PagePayload<TPayload>, normal
 function procurementSummary(value: ProcurementSummaryPayload): OverseasPurchaseSummary {
   return { ...value, id: String(value.id), purchaseWarehouseId: value.purchaseWarehouseId == null ? null : String(value.purchaseWarehouseId), budgetUnitPrice: value.budgetUnitPrice == null ? null : String(value.budgetUnitPrice) }
 }
-function procurementDetail(value: ProcurementDetailPayload): OverseasPurchaseDetail {
-  return { ...procurementSummary(value.summary), productUrl: value.productUrl || null, receivingAddress: value.receivingAddress || null, contactName: value.contactName || null, contactPhone: value.contactPhone || null, domesticCarrier: value.domesticCarrier || null, domesticTrackingNo: value.domesticTrackingNo || null, overseasCarrier: value.overseasCarrier || null, overseasTrackingNo: value.overseasTrackingNo || null, estimatedArrivalAt: value.estimatedArrivalAt || null, remark: value.remark || null, createdBy: value.createdBy || null, reviewedBy: value.reviewedBy || null, reviewRemark: value.reviewRemark || null, reviewedAt: value.reviewedAt || null, histories: value.histories || [], outboundDetails: (value.outboundDetails || []).map((item) => ({ ...item, id: String(item.id), quantity: Number(item.quantity) })), files: (value.files || []).map((item) => ({ ...item, id: String(item.id), fileId: String(item.fileId), sizeBytes: Number(item.sizeBytes) })), fees: (value.fees || []).map((item) => ({ ...item, id: String(item.id), voucherFileId: String(item.voucherFileId), amount: String(item.amount) })) }
-}
 function truckSummary(value: TruckSummaryPayload): LocalTransportOrder {
   return { ...value, id: String(value.id), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
 }
@@ -69,25 +61,33 @@ export async function listOverseasPurchases(query: OverseasPurchaseQuery = {}) {
   return normalizePage(unwrapApiResponse(response), procurementSummary)
 }
 export async function getOverseasPurchase(orderNo: string, customerId: string) {
-  const response = await http.get<ApiEnvelope<ProcurementDetailPayload>, ApiEnvelope<ProcurementDetailPayload>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { params: { customerId } })
-  return procurementDetail(unwrapApiResponse(response))
+  const response = await http.get<ApiEnvelope<PlatformProcurement>, ApiEnvelope<PlatformProcurement>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { params: { customerId } })
+  const detail = unwrapApiResponse(response)
+  if (detail.purchaseFacts?.actual_warehouse_id != null) detail.purchaseFacts.actual_warehouse_id = String(detail.purchaseFacts.actual_warehouse_id)
+  detail.physical.dispositions = detail.physical.dispositions.map(row => ({ ...row, id: String(row.id), source_carton_id: row.source_carton_id == null ? null : String(row.source_carton_id), receipt_id: row.receipt_id == null ? null : String(row.receipt_id), voucher_file_id: String(row.voucher_file_id) }))
+  detail.physical.receipts = detail.physical.receipts.map(row => ({ ...row, id: String(row.id), sourceCartonId: row.sourceCartonId == null ? null : String(row.sourceCartonId) }))
+  detail.physical.cartons = detail.physical.cartons.map(row => ({ ...row, id: String(row.id), sources: row.sources.map(source => ({ ...source, receiptId: String(source.receiptId) })) }))
+  detail.fees = detail.fees.map(fee => ({ ...fee, id: String(fee.id), parentFeeId: fee.parentFeeId == null ? null : String(fee.parentFeeId), sourceFeeId: fee.sourceFeeId == null ? null : String(fee.sourceFeeId), voucherFileId: fee.voucherFileId == null ? null : String(fee.voucherFileId), walletLedgerId: fee.walletLedgerId == null ? null : String(fee.walletLedgerId) }))
+  detail.transport.shipments = detail.transport.shipments.map(row => ({ ...row, id: String(row.id) }))
+  detail.controls.notes = detail.controls.notes.map(row => ({ ...row, id: String(row.id), target_id: row.target_id == null ? null : String(row.target_id), voucher_file_id: String(row.voucher_file_id), resolution_voucher_id: row.resolution_voucher_id == null ? null : String(row.resolution_voucher_id) }))
+  detail.controls.remaining = detail.controls.remaining.map(row => ({ ...row, sourceId: row.sourceId == null ? null : String(row.sourceId) }))
+  detail.controls.closures = detail.controls.closures.map(row => ({ ...row, id: String(row.id) }))
+  detail.controls.closureItems = detail.controls.closureItems.map(row => ({ ...row, id: String(row.id), closure_id: String(row.closure_id), source_id: row.source_id == null ? null : String(row.source_id), voucher_file_id: String(row.voucher_file_id) }))
+  detail.files = detail.files.map(file => ({ ...file, id: String(file.id), fileId: String(file.fileId) }))
+  for (const leg of ['overseasCargo', 'domesticCargo'] as const) detail.transport[leg] = detail.transport[leg].map(row => ({ ...row, cartonId: String(row.cartonId), packagingRecordId: row.packagingRecordId == null ? null : String(row.packagingRecordId), sources: row.sources.map(source => ({ ...source, receiptId: String(source.receiptId) })) }))
+  for (const labels of [detail.transport.overseasLabels, detail.transport.domesticLabels]) if (labels) {
+    labels.id = String(labels.id); labels.manifestId = String(labels.manifestId)
+    labels.labels = labels.labels.map(row => ({ ...row, cartonId: String(row.cartonId), fileId: String(row.fileId) }))
+  }
+  return detail
+}
+export async function getOverseasPurchaseEditor(orderNo: string, customerId: string) {
+  const response = await http.get<ApiEnvelope<OverseasPurchaseEditorDetail>, ApiEnvelope<OverseasPurchaseEditorDetail>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { params: { customerId } })
+  return unwrapApiResponse(response)
 }
 export async function updateOverseasPurchase(orderNo: string, customerId: string, payload: UpdateOverseasPurchaseRequest) {
-  const response = await http.patch<ApiEnvelope<ProcurementDetailPayload>, ApiEnvelope<ProcurementDetailPayload>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, payload, { params: { customerId } })
-  return procurementDetail(unwrapApiResponse(response))
-}
-export async function reviewOverseasPurchase(orderNo: string, customerId: string, payload: ReviewOverseasPurchaseRequest) {
-  const response = await http.post<ApiEnvelope<ProcurementDetailPayload>, ApiEnvelope<ProcurementDetailPayload>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}/review`, payload, { params: { customerId } })
-  return procurementDetail(unwrapApiResponse(response))
-}
-export async function uploadOverseasPurchaseFile(orderNo: string, customerId: string, category: 'RECEIPT' | 'VOUCHER', file: File) {
-  const body = new FormData(); body.append('file', file)
-  const response = await http.post<ApiEnvelope<OverseasPurchaseFile>, ApiEnvelope<OverseasPurchaseFile>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}/files/${category}`, body, { params: { customerId } })
-  return unwrapApiResponse(response)
-}
-export async function createOverseasPurchaseFee(orderNo: string, customerId: string, payload: { feeItemCode: string; feeItemName: string; amount: number; voucherFileId: string; remark?: string }) {
-  const response = await http.post<ApiEnvelope<OverseasPurchaseFee>, ApiEnvelope<OverseasPurchaseFee>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}/fees`, payload, { params: { customerId } })
-  return unwrapApiResponse(response)
+  const response = await http.patch<ApiEnvelope<ProcurementDetailPayload>, ApiEnvelope<ProcurementDetailPayload>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { version: payload.version, remark: payload.remark }, { params: { customerId } })
+  return procurementSummary(unwrapApiResponse(response).summary)
 }
 export async function listUsTruckOrders(query: LocalTransportQuery = {}) {
   const response = await http.get<ApiEnvelope<PagePayload<TruckSummaryPayload>>, ApiEnvelope<PagePayload<TruckSummaryPayload>>>(truckBasePath, { params: { ...query, orderNo: query.orderNo?.trim() || undefined, routeKeyword: query.routeKeyword?.trim() || undefined, status: query.status || undefined, transportType: query.transportType || undefined, customerId: query.customerId || undefined } })
diff --git a/src/modules/overseas-business/api/procurementCommands.test.ts b/src/modules/overseas-business/api/procurementCommands.test.ts
new file mode 100644
index 00000000..951e5a56
--- /dev/null
+++ b/src/modules/overseas-business/api/procurementCommands.test.ts
@@ -0,0 +1,58 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+const api = vi.hoisted(() => ({ get: vi.fn(), post: vi.fn() }))
+vi.mock('@/shared/api/http', async importOriginal => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: api }))
+import { submitProcurementCommand, uploadProcurementFile, downloadProcurementFile, type ProcurementCommand } from './procurementCommands'
+const envelope = <T>(data: T) => ({ code: '200', message: 'success', data })
+beforeEach(() => vi.clearAllMocks())
+describe('procurement node HTTP contract', () => {
+  it.each<ProcurementCommand>(['review', 'purchase', 'purchase/confirm', 'budget-authorizations', 'planned-warehouse', 'cancel', 'overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'packing', 'packing/confirm', 'packing/withdraw', 'dispositions', 'labels', 'international-estimate', 'labels/apply', 'domestic-repack', 'overseas-shipment', 'customer-shipment', 'charges/confirm', 'control-notes', 'actual-warehouse/correct', 'exception-close'])('sends %s to the scoped order endpoint without interpreting money success', async command => {
+    api.post.mockResolvedValue(envelope({ status: 'WAIT_OVERSEAS_RECEIPT', purchase: { walletStatus: 'FREEZE_PENDING' } }))
+    const payload = { version: 3, idempotencyKey: 'same-command', reason: '已核对', amount: '9007199254740993.01' }
+    await submitProcurementCommand('OP/1', '10001', command, payload)
+    expect(api.post).toHaveBeenCalledWith(`/platform/v1/last-leg/overseas-procurements/OP%2F1/${command}`, payload, { params: { customerId: '10001' } })
+  })
+  it('posts additional expenses without a fee route id or inherited correction fields', async () => {
+    api.post.mockResolvedValue(envelope({}))
+    const payload = { version: 3, idempotencyKey: 'additional', reason: 'invoice', name: 'Storage', amount: '3.25', currency: 'USD' as const, businessDate: '2020-01-03', voucherFileId: '501' }
+    await submitProcurementCommand('OP/1', '10001', 'fees/additional', { ...payload, feeId: '11', targetOriginalAmount: '99' })
+    expect(api.post).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/fees/additional', payload, { params: { customerId: '10001' } })
+  })
+  it('resolves the exact order-owned blocker and does not send the internal route reference as a mutable field', async () => {
+    api.post.mockResolvedValue(envelope({}))
+    await submitProcurementCommand('OP/1', '10001', 'control-notes/resolve', { version: 3, idempotencyKey: 'resolve-one', reason: '核对完成', noteId: '71', voucherFileId: '501' })
+    expect(api.post).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/control-notes/71/resolve', { version: 3, idempotencyKey: 'resolve-one', reason: '核对完成', voucherFileId: '501' }, { params: { customerId: '10001' } })
+  })
+  it('uses the exact fee endpoint and sends only fields belonging to that financial operation', async () => {
+    api.post.mockResolvedValue(envelope({}))
+    const base = { version: 3, idempotencyKey: 'finance-one', reason: '核对', feeId: '11' }
+    await submitProcurementCommand('OP/1', '10001', 'fees/correct-target', { ...base, targetOriginalAmount: '12.00', voucherFileId: '501', amount: 'unrelated' })
+    expect(api.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/fees/11/correct-target', { version: 3, idempotencyKey: 'finance-one', reason: '核对', targetOriginalAmount: '12.00', voucherFileId: '501' }, { params: { customerId: '10001' } })
+    await submitProcurementCommand('OP/1', '10001', 'fees/replace-failed', { ...base, targetOriginalAmount: '12.00', voucherFileId: '501' })
+    expect(api.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/fees/11/replace-failed', { version: 3, idempotencyKey: 'finance-one', reason: '核对', targetOriginalAmount: '12.00', voucherFileId: '501' }, { params: { customerId: '10001' } })
+    await submitProcurementCommand('OP/1', '10001', 'fees/refund', { ...base, amount: '1.01', voucherFileId: '501' })
+    expect(api.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/fees/11/refund', { version: 3, idempotencyKey: 'finance-one', reason: '核对', amount: '1.01', voucherFileId: '501' }, { params: { customerId: '10001' } })
+    for (const command of ['fees/retry', 'fees/terminate', 'fees/release-estimate'] as const) {
+      await submitProcurementCommand('OP/1', '10001', command, base)
+      expect(api.post).toHaveBeenLastCalledWith(`/platform/v1/last-leg/overseas-procurements/OP%2F1/fees/11/${command.slice(5)}`, { version: 3, idempotencyKey: 'finance-one', reason: '核对' }, { params: { customerId: '10001' } })
+    }
+  })
+  it('targets an original receipt and nests only the receipt contract plus correction evidence', async () => {
+    api.post.mockResolvedValue(envelope({}))
+    const receipt = { version: 3, idempotencyKey: 'correct-one', reason: '实收复核', leg: 'OVERSEAS' as const, warehouseId: '20', goodQuantity: 5, damagedQuantity: 1, extraQuantity: 0, receivedAt: '2020-01-02T10:00:00' }
+    await submitProcurementCommand('OP/1', '10001', 'receipts/correct', { ...receipt, receiptId: '11', voucherFileId: '901' })
+    expect(api.post).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/receipts/11/correct', { receipt: { ...receipt, sourceCartonId: undefined }, voucherFileId: '901' }, { params: { customerId: '10001' } })
+    await submitProcurementCommand('OP/1', '10001', 'dispositions/revoke', { version: 3, idempotencyKey: 'revoke-one', reason: '撤销错误处置', dispositionId: '71', voucherFileId: '901' })
+    expect(api.post).toHaveBeenLastCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/dispositions/71/revoke', { version: 3, idempotencyKey: 'revoke-one', reason: '撤销错误处置', voucherFileId: '901' }, { params: { customerId: '10001' } })
+  })
+  it('uses purchase-purpose multipart evidence and normalizes file references', async () => {
+    api.post.mockResolvedValue(envelope({ id: 11, fileId: '9007199254740993', category: 'PURCHASE', fileName: 'purchase.pdf' }))
+    const file = new File(['pdf'], 'purchase.pdf', { type: 'application/pdf' })
+    expect(await uploadProcurementFile('OP/1', '10001', 'PURCHASE', file)).toMatchObject({ id: '11', fileId: '9007199254740993' })
+    const call = api.post.mock.calls[0]; expect(call[0]).toBe('/platform/v1/last-leg/overseas-procurements/OP%2F1/files/PURCHASE'); expect(call[1].get('file')).toBe(file); expect(call[2]).toEqual({ params: { customerId: '10001' } })
+  })
+  it('downloads binary files through the authenticated order boundary', async () => {
+    const blob = new Blob(['pdf'], { type: 'application/pdf' }); api.get.mockResolvedValue(blob)
+    expect(await downloadProcurementFile('OP/1', '10001', '901')).toBe(blob)
+    expect(api.get).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1/files/901/content', { params: { customerId: '10001' }, responseType: 'blob' })
+  })
+})
diff --git a/src/modules/overseas-business/api/procurementCommands.ts b/src/modules/overseas-business/api/procurementCommands.ts
new file mode 100644
index 00000000..f955ea58
--- /dev/null
+++ b/src/modules/overseas-business/api/procurementCommands.ts
@@ -0,0 +1,62 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { ProcurementFile, ProcurementFileCategory, ProcurementRemainingKind } from '../procurementTypes'
+
+export type ProcurementCommand = 'review' | 'purchase' | 'purchase/confirm' | 'budget-authorizations' | 'planned-warehouse' | 'cancel' | 'overseas-receipts' | 'domestic-receipts' | 'overseas-receipts/complete' | 'domestic-receipts/complete' | 'packing' | 'packing/confirm' | 'packing/withdraw' | 'dispositions' | 'receipts/correct' | 'dispositions/revoke' | 'labels' | 'international-estimate' | 'labels/apply' | 'domestic-repack' | 'overseas-shipment' | 'customer-shipment' | 'charges/confirm' | 'fees/retry' | 'fees/terminate' | 'fees/release-estimate' | 'fees/correct-target' | 'fees/refund' | 'fees/replace-failed' | 'fees/additional' | 'control-notes' | 'control-notes/resolve' | 'actual-warehouse/correct' | 'exception-close'
+export interface ProcurementCommandBody {
+  name?: string
+  targetType?: 'PURCHASE' | 'WAREHOUSE' | 'RECEIPT' | 'SHIPMENT'; targetId?: string; blocking?: boolean; clientSummary?: string; noteId?: string
+  resolutions?: ProcurementResolution[]; customerVoucherFileId?: string; financialConclusion?: string
+  feeId?: string; targetOriginalAmount?: string; internationalFreight?: ProcurementFeeSelection; duty?: ProcurementFeeSelection; domesticFreight?: ProcurementFeeSelection
+  otherDetermination?: 'NOT_APPLICABLE' | 'ITEMIZED'; otherFees?: { code: string; name: string; selection: ProcurementFeeSelection }[]
+  version: number; idempotencyKey: string; reason?: string; decision?: 'APPROVE' | 'REJECT' | 'ACCEPT_SHORTAGE' | 'DISPOSE_DAMAGED' | 'RETURN_EXTRA'; remark?: string
+  purchaseWarehouseId?: string; warehouseId?: string; productName?: string; specification?: string
+  leg?: 'OVERSEAS' | 'DOMESTIC'; sourceCartonId?: string; receiptId?: string; dispositionId?: string
+  goodQuantity?: number; damagedQuantity?: number; extraQuantity?: number; receivedAt?: string
+  labelVersion?: number; receiver?: { name: string; phone: string; address: string }; addressVoucherFileId?: string
+  labels?: { cartonId: string; fileId: string; page: number; carrier: string; trackingNo: string }[]
+  cartonIds?: string[]; businessDate?: string; appliedAt?: string; shippedAt?: string; cartonId?: string
+  lengthCm?: string; widthCm?: string; heightCm?: string; grossWeightKg?: string
+  kind?: 'SHORTAGE' | 'DAMAGED' | 'EXTRA'; packingVersion?: number; cartons?: ProcurementPackingCarton[]
+  quantity?: number; amount?: string; currency?: 'CNY' | 'USD'; purchasedAt?: string; estimatedArrivalAt?: string; voucherFileId?: string
+}
+export interface ProcurementResolution { kind: ProcurementRemainingKind; sourceId: string | null; quantity: number; decision: string; destination: string; voucherFileId: string }
+export interface ProcurementChargeAmount { determination: 'POSITIVE' | 'ZERO' | 'NOT_APPLICABLE'; amount: string; currency: 'CNY' | 'USD'; businessDate: string; voucherFileId?: string; reason: string }
+export interface ProcurementFeeSelection { feeId?: string; value?: ProcurementChargeAmount }
+export interface ProcurementPackingCarton { cartonNo: string; lengthCm: string; widthCm: string; heightCm: string; grossWeightKg: string; sources: { receiptId: string; quantity: number }[] }
+const base = '/platform/v1/last-leg/overseas-procurements'
+export async function submitProcurementCommand(orderNo: string, customerId: string, command: ProcurementCommand, payload: ProcurementCommandBody) {
+  let path: string = command; let body: unknown = payload
+  if (command === 'receipts/correct') {
+    if (!payload.receiptId || !/^[1-9]\d*$/.test(payload.receiptId)) throw new Error('缺少有效实收来源')
+    path = `receipts/${payload.receiptId}/correct`
+    body = { receipt: { version: payload.version, idempotencyKey: payload.idempotencyKey, reason: payload.reason, leg: payload.leg, warehouseId: payload.warehouseId, sourceCartonId: payload.sourceCartonId, goodQuantity: payload.goodQuantity, damagedQuantity: payload.damagedQuantity, extraQuantity: payload.extraQuantity, receivedAt: payload.receivedAt }, voucherFileId: payload.voucherFileId }
+  } else if (command === 'dispositions/revoke') {
+    if (!payload.dispositionId || !/^[1-9]\d*$/.test(payload.dispositionId)) throw new Error('缺少有效差异处置来源')
+    path = `dispositions/${payload.dispositionId}/revoke`
+    body = { version: payload.version, idempotencyKey: payload.idempotencyKey, reason: payload.reason, voucherFileId: payload.voucherFileId }
+  }
+  if (command === 'control-notes/resolve') {
+    if (!payload.noteId || !/^[1-9]\d*$/.test(payload.noteId)) throw new Error('缺少有效阻断异常来源')
+    path = `control-notes/${payload.noteId}/resolve`
+    body = { version: payload.version, idempotencyKey: payload.idempotencyKey, reason: payload.reason, voucherFileId: payload.voucherFileId }
+  }
+  if (command === 'fees/additional') body = { version: payload.version, idempotencyKey: payload.idempotencyKey, name: payload.name, amount: payload.amount, currency: payload.currency, businessDate: payload.businessDate, voucherFileId: payload.voucherFileId, reason: payload.reason }
+  if (command.startsWith('fees/') && command !== 'fees/additional') {
+    if (!payload.feeId || !/^[1-9]\d*$/.test(payload.feeId)) throw new Error('缺少有效费用来源')
+    path = `fees/${payload.feeId}/${command.slice(5)}`
+    body = { version: payload.version, idempotencyKey: payload.idempotencyKey, reason: payload.reason,
+      ...(['fees/correct-target', 'fees/replace-failed'].includes(command) ? { targetOriginalAmount: payload.targetOriginalAmount, voucherFileId: payload.voucherFileId } : {}),
+      ...(command === 'fees/refund' ? { amount: payload.amount, voucherFileId: payload.voucherFileId } : {}) }
+  }
+  const response = await http.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(`${base}/${encodeURIComponent(orderNo)}/${path}`, body, { params: { customerId } })
+  unwrapApiResponse(response)
+}
+export async function uploadProcurementFile(orderNo: string, customerId: string, category: ProcurementFileCategory, file: File) {
+  const data = new FormData(); data.append('file', file)
+  const response = await http.post<ApiEnvelope<ProcurementFile>, ApiEnvelope<ProcurementFile>>(`${base}/${encodeURIComponent(orderNo)}/files/${category}`, data, { params: { customerId } })
+  const result = unwrapApiResponse(response)
+  return { ...result, id: String(result.id), fileId: String(result.fileId) }
+}
+export async function downloadProcurementFile(orderNo: string, customerId: string, fileId: string) {
+  return http.get<Blob, Blob>(`${base}/${encodeURIComponent(orderNo)}/files/${encodeURIComponent(fileId)}/content`, { params: { customerId }, responseType: 'blob' })
+}
diff --git a/src/modules/overseas-business/components/ProcurementChargeFields.vue b/src/modules/overseas-business/components/ProcurementChargeFields.vue
new file mode 100644
index 00000000..ae9706d6
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementChargeFields.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed } from 'vue'
+import type { PlatformProcurement, ProcurementFile } from '../procurementTypes'
+import type { ChargeDraft } from '../procurementFinanceForm'
+import { money } from '../procurementPresentation'
+const props = defineProps<{ detail: PlatformProcurement; files: ProcurementFile[] }>()
+const form = defineModel<ChargeDraft>({ required: true })
+const existing = computed(() => props.detail.fees.filter(row => row.active && row.purpose === form.value.purpose && (row.purpose !== 'OTHER' || row.feeItemCode === form.value.code)))
+const selected = computed(() => existing.value.find(row => row.id === form.value.feeId))
+function determine() { form.value.amount = form.value.determination === 'POSITIVE' ? '' : form.value.determination ? '0.00' : '' }
+</script>
+<template>
+  <div class="admin-density charge-fields">
+    <template v-if="form.mode === 'EXISTING'"><el-form-item label="引用已核定版本" required><el-select v-model="form.feeId" placeholder="选择本单该用途的有效费用"><el-option v-for="row in existing" :key="row.id" :value="row.id" :label="`${row.feeNo} · ${money(row.originalAmount, row.originalCurrency)}`" /></el-select></el-form-item><dl v-if="selected" class="density-fields"><div><dt>原费用版本</dt><dd>{{ selected.feeVersion }}</dd></div><div><dt>原业务日期</dt><dd>{{ selected.businessDate }}</dd></div></dl><p>本次仅核对并引用原费用，不重复扣款。金额更正请使用财务调整。</p></template>
+    <el-alert v-else-if="detail.operations.some(row => row.action === 'CONFIRM_CHARGES')" title="本项缺少有效版本，请先由财务完成替代核定。" type="warning" :closable="false" />
+    <template v-else>
+      <div class="charge-grid"><el-form-item label="核定结果" required><el-select v-model="form.determination" placeholder="明确正额、零元或不适用" @change="determine"><el-option value="POSITIVE" label="确认正额" /><el-option value="ZERO" label="确认零元" /><el-option value="NOT_APPLICABLE" label="不适用" /></el-select></el-form-item><el-form-item label="原币金额" required><el-input v-model="form.amount" :readonly="form.determination === 'ZERO' || form.determination === 'NOT_APPLICABLE'" placeholder="填写实际金额，最多两位小数" /></el-form-item><el-form-item label="币种" required><el-select v-model="form.currency"><el-option value="CNY" label="人民币 CNY" /><el-option value="USD" label="美元 USD" /></el-select></el-form-item><el-form-item label="业务日期" required><el-date-picker v-model="form.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item></div>
+      <el-form-item label="本项费用凭证" :required="form.determination === 'POSITIVE'"><el-select v-model="form.voucherFileId" clearable placeholder="选择已上传的本单费用凭证"><el-option v-for="file in files.filter(row => row.category === 'VOUCHER')" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select></el-form-item>
+      <el-form-item label="本项核定说明" required><el-input v-model="form.reason" maxlength="500" placeholder="说明计费依据；零元或不适用也需说明" /></el-form-item>
+    </template>
+  </div>
+</template>
+<style scoped>
+.charge-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: var(--admin-space-3); }
+:deep(.el-select), :deep(.el-date-editor) { width: 100%; }
+.charge-fields p { color: var(--cc-muted); font-size: var(--admin-font-caption); }
+@media (max-width: 760px) { .charge-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
+</style>
diff --git a/src/modules/overseas-business/components/ProcurementControlFields.vue b/src/modules/overseas-business/components/ProcurementControlFields.vue
new file mode 100644
index 00000000..90bfb983
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementControlFields.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed } from 'vue'
+import type { ProcurementCommand } from '../api/procurementCommands'
+import type { PlatformProcurement, ProcurementFile } from '../procurementTypes'
+import { allowedDecisions, decisionLabels, remainingLabels, type ControlForm } from '../procurementControlForm'
+const props = defineProps<{ command: ProcurementCommand; detail: PlatformProcurement; files: ProcurementFile[] }>()
+const form = defineModel<ControlForm>({ required: true })
+const proofs = computed(() => props.files.filter(file => file.category === 'EXCEPTION'))
+const blockers = computed(() => props.detail.controls.notes.filter(note => note.blocking && !note.resolved_at))
+</script>
+<template>
+  <div class="admin-density">
+    <template v-if="command === 'control-notes'">
+      <el-alert title="追加说明保留原购买、仓库、实收及交寄事实。需要阻断时，正式装箱、预估核对、核费及交寄须先处理异常。" type="info" :closable="false" />
+      <el-form-item label="关联事实类型" required><el-select v-model="form.targetType" placeholder="选择需要留痕的事实" @change="form.targetId = ''"><el-option value="PURCHASE" label="真实购买" /><el-option value="WAREHOUSE" label="实际收货仓" /><el-option value="RECEIPT" label="实收记录" /><el-option value="SHIPMENT" label="实际交寄记录" /></el-select></el-form-item>
+      <el-form-item v-if="form.targetType === 'RECEIPT'" label="关联实收" required><el-select v-model="form.targetId" placeholder="选择本单实收记录"><el-option v-for="row in detail.physical.receipts" :key="row.id" :value="row.id" :label="`${row.receiptNo} · ${row.leg === 'OVERSEAS' ? '海外' : '国内'}${row.active ? '' : '（已更正）'}`" /></el-select></el-form-item>
+      <el-form-item v-if="form.targetType === 'SHIPMENT'" label="关联实际交寄" required><el-select v-model="form.targetId" placeholder="选择本单实际交寄记录"><el-option v-for="row in detail.transport.shipments" :key="row.id" :value="row.id" :label="`${row.shipmentNo} · ${row.leg === 'OVERSEAS' ? '国际段' : '寄客户段'}`" /></el-select></el-form-item>
+      <dl v-if="form.targetType === 'WAREHOUSE'" class="density-fields"><div><dt>当前实际仓</dt><dd>{{ detail.customerView.order.actualWarehouseName || '尚无实际仓' }}</dd></div></dl>
+      <el-form-item label="是否阻断后续正式作业" required><el-radio-group v-model="form.blocking"><el-radio :value="true">需要阻断</el-radio><el-radio :value="false">仅追加说明</el-radio></el-radio-group></el-form-item>
+      <el-form-item label="对客摘要（客户可见，选填）"><el-input v-model="form.clientSummary" type="textarea" :rows="2" maxlength="500" show-word-limit placeholder="仅填写允许客户看到的处理摘要" /></el-form-item>
+    </template>
+    <template v-if="command === 'control-notes/resolve'"><el-alert title="解除阻断须填写处理依据并关联本单凭证，原说明与处理记录均保留。" type="info" :closable="false" /><el-form-item label="待解除阻断" required><el-select v-model="form.noteId" placeholder="选择本单未处理的阻断异常"><el-option v-for="note in blockers" :key="note.id" :value="note.id" :label="`${note.note_no} · ${note.reason.slice(0, 60)}`" /></el-select></el-form-item></template>
+    <template v-if="command === 'actual-warehouse/correct'"><el-alert title="已有箱明细、交寄记录或订单已结束时，本操作仅追加更正说明和阻断，不重新归属货物。是否修改有效仓以服务端历史记录为准。" type="warning" :closable="false" /><dl class="density-fields"><div><dt>原实际收货仓</dt><dd>{{ detail.customerView.order.actualWarehouseName || '尚未记录' }}</dd></div></dl></template>
+    <template v-if="command === 'exception-close'">
+      <el-alert title="确认全部实物去向和资金处理后关闭。此操作不自动退款、不生成退货物流，不覆盖原履约事实。" type="warning" :closable="false" />
+      <section v-for="row in form.resolutions" :key="`${row.kind}:${row.sourceId || ''}`" class="resolution-row"><h3>{{ remainingLabels[row.kind] }} · {{ row.businessNo || '—' }} · {{ row.quantity }} 件</h3><div class="resolution-grid"><el-form-item label="实际处置" required><el-select v-model="row.decision" placeholder="明确实际处置结果"><el-option v-for="value in allowedDecisions[row.kind]" :key="value" :value="value" :label="decisionLabels[value]" /></el-select></el-form-item><el-form-item label="本项处置凭证" required><el-select v-model="row.voucherFileId" placeholder="选择本单对应凭证"><el-option v-for="file in proofs" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select></el-form-item></div><el-form-item label="实际去向及接收方" required><el-input v-model="row.destination" maxlength="500" placeholder="填写货物实际去向、接收方或确认丢失的依据" /></el-form-item></section>
+      <p v-if="!form.resolutions.length">服务端当前无待处置的剩余货物，仍需核对客户停止履约凭证和资金处理结论。</p>
+      <el-form-item label="客户同意停止履约凭证" required><el-select v-model="form.customerVoucherFileId" placeholder="选择本单客户确认凭证"><el-option v-for="file in proofs" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select></el-form-item>
+      <el-form-item label="财务处理结论（仅平台可见）" required><el-input v-model="form.financialConclusion" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="说明扣款、调整、退款及冻结释放的最终处理结果" /></el-form-item>
+      <el-form-item label="对客关闭摘要（客户可见）" required><el-input v-model="form.clientSummary" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="填写允许客户看到的最终处理结论" /></el-form-item>
+    </template>
+  </div>
+</template>
+<style scoped>
+.resolution-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-3); }
+.resolution-row { padding-block: var(--admin-space-3); border-bottom: 1px solid var(--cc-border); }
+.resolution-row h3 { font-size: var(--admin-font-section); }
+:deep(.el-select) { width: 100%; }
+@media (max-width: 760px) { .resolution-grid { grid-template-columns: 1fr; } }
+</style>
diff --git a/src/modules/overseas-business/components/ProcurementFinanceFields.vue b/src/modules/overseas-business/components/ProcurementFinanceFields.vue
new file mode 100644
index 00000000..6ce3cd13
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementFinanceFields.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed, watch } from 'vue'
+import type { ProcurementCommand } from '../api/procurementCommands'
+import type { PlatformProcurement, ProcurementFile } from '../procurementTypes'
+import { chargeDraft, feeRetryPermission, refundAvailable, targetPreview, replacementCandidates, replacementPreview, type FinanceForm } from '../procurementFinanceForm'
+import { money, decimal, feePurposes } from '../procurementPresentation'
+import { commandKey } from '../procurementPending'
+import ProcurementChargeFields from './ProcurementChargeFields.vue'
+const props = defineProps<{ command: ProcurementCommand; detail: PlatformProcurement; files: ProcurementFile[]; can: (permission: string) => boolean }>()
+const form = defineModel<FinanceForm>({ required: true })
+const candidates = computed(() => props.detail.fees.filter(fee => {
+  if (props.command === 'fees/replace-failed') return replacementCandidates(props.detail).some(row => row.id === fee.id)
+  if (props.command === 'fees/retry') return fee.active && fee.walletStatus.endsWith('_FAILED') && props.can(feeRetryPermission(fee))
+  if (props.command === 'fees/terminate') return fee.active && fee.walletStatus.endsWith('_FAILED')
+  if (props.command === 'fees/release-estimate') return fee.active && fee.purpose === 'INTERNATIONAL_ESTIMATE' && ['FROZEN', 'ZERO'].includes(fee.walletStatus)
+  if (props.command === 'fees/correct-target') return fee.active && !['INTERNATIONAL_ESTIMATE', 'ADJUSTMENT', 'REFUND'].includes(fee.purpose)
+  return fee.walletStatus === 'SETTLED' && !!fee.walletLedgerId && fee.purpose !== 'INTERNATIONAL_ESTIMATE'
+}))
+watch(candidates, rows => { if (form.value.feeId && !rows.some(row => row.id === form.value.feeId)) form.value.feeId = '' })
+const selected = computed(() => props.detail.fees.find(row => row.id === form.value.feeId))
+const preview = computed(() => {
+  if (!selected.value) return null
+  try {
+    if (props.command === 'fees/replace-failed' && form.value.targetOriginalAmount) return { ...replacementPreview(props.detail, selected.value, form.value.targetOriginalAmount), error: '' }
+    if (props.command === 'fees/correct-target' && form.value.targetOriginalAmount) return { ...targetPreview(props.detail, selected.value, form.value.targetOriginalAmount), error: '' }
+    if (props.command === 'fees/refund') return { refundable: decimal(refundAvailable(props.detail, selected.value)), error: '' }
+  } catch (error) { return { error: error instanceof Error ? error.message : '请核对原费用' } }
+  return null
+})
+function addOther() { form.value.otherDetermination = 'ITEMIZED'; const row = chargeDraft('OTHER', undefined, `OTHER_${commandKey().slice(0, 20).toUpperCase()}`); row.name = ''; form.value.others.push(row) }
+</script>
+<template>
+  <div class="admin-density">
+    <template v-if="command === 'charges/confirm'">
+      <el-alert v-if="detail.operations.some(row => row.action === 'CONFIRM_CHARGES')" title="本单已完成过核费，本次只引用已有费用版本；新增费用或重新核定请使用财务操作。" type="info" :closable="false" />
+      <el-alert title="一次确认实际国际运费、关税、国内运费和其他费用。正额确认后发起资金处理；确认成功不代表已扣款或可交寄。" type="info" :closable="false" />
+      <section v-for="(row, index) in form.fixed" :key="row.purpose" class="charge-section"><h3>{{ row.name }}</h3><ProcurementChargeFields v-model="form.fixed[index]" :detail="detail" :files="files" /></section>
+      <section class="charge-section"><h3>其他费用</h3><el-form-item label="其他费用适用情况" required><el-radio-group v-model="form.otherDetermination"><el-radio value="NOT_APPLICABLE" :disabled="detail.fees.some(row => row.active && row.purpose === 'OTHER')">不适用</el-radio><el-radio value="ITEMIZED">逐项核定</el-radio></el-radio-group></el-form-item>
+        <template v-if="form.otherDetermination === 'ITEMIZED'"><section v-for="(row, index) in form.others" :key="row.code" class="other-charge"><div class="charge-heading"><el-form-item label="费用名称" required><el-input v-model="row.name" :readonly="row.mode === 'EXISTING'" maxlength="128" placeholder="填写独立发生的费用名称" /></el-form-item><el-button v-if="row.mode === 'NEW'" class="density-action" data-tone="danger" @click="form.others.splice(index, 1)">移除新费用</el-button></div><ProcurementChargeFields v-model="form.others[index]" :detail="detail" :files="files" /></section><el-button v-if="!detail.operations.some(row => row.action === 'CONFIRM_CHARGES')" class="density-action" @click="addOther">增加其他费用</el-button></template>
+      </section>
+    </template>
+    <template v-else-if="command === 'fees/additional'">
+      <el-alert title="登记独立新发生的正额费用，使用该业务日期的汇率。与原费用金额更正分开处理；已完成订单保留原履约状态。" type="info" :closable="false" />
+      <el-form-item label="独立费用名称" required><el-input v-model="form.additional.name" maxlength="128" placeholder="填写独立发生的费用名称" /></el-form-item>
+      <el-form-item label="新增费用原币金额" required><el-input v-model="form.additional.amount" placeholder="填写正额金额，最多两位小数" /></el-form-item>
+      <el-form-item label="新增费用币种" required><el-select v-model="form.additional.currency"><el-option value="CNY" label="人民币 CNY" /><el-option value="USD" label="美元 USD" /></el-select></el-form-item>
+      <el-form-item label="新增费用业务日期" required><el-date-picker v-model="form.additional.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item>
+      <el-form-item label="新增费用凭证" required><el-select v-model="form.additional.voucherFileId" placeholder="选择本单已上传的费用凭证"><el-option v-for="file in files.filter(row => row.category === 'VOUCHER')" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select></el-form-item>
+    </template>
+    <template v-else>
+      <el-alert v-if="command === 'fees/replace-failed'" title="原费用须已明确失败并完成终止及冻结释放。本次按核定总额创建新的实际费用版本，沿用原汇率和业务日期；货款仍受客户预算限制。" type="warning" :closable="false" />
+      <el-alert v-if="command === 'fees/correct-target'" title="输入这条原费用链正确的原币总额。沿用原汇率，按目标与净实扣差额生成追加或逐笔退款；历史扣款不覆盖。" type="info" :closable="false" />
+      <el-alert v-if="command === 'fees/refund'" title="退款回到客户资金账户，关联选中的原成功扣款；不以普通充值替代，不自动退款其他费用。" type="warning" :closable="false" />
+      <el-alert v-if="command === 'fees/terminate'" title="仅终止明确失败的费用版本；仍有有效冻结时先释放，释放成功后才可重新核定，不能将未决结果当作失败。" type="warning" :closable="false" />
+      <el-alert v-if="command === 'fees/release-estimate'" title="释放有效预估冻结不产生退款或实际收费，后续交寄须重新满足预估核对条件。" type="warning" :closable="false" />
+      <el-alert v-if="command === 'fees/retry'" title="仅重试已明确失败的原资金请求，金额与费用版本不改变；处理中请刷新结果。" type="info" :closable="false" />
+      <el-form-item label="原费用" required><el-select v-model="form.feeId" placeholder="选择本单符合操作条件的费用"><el-option v-for="fee in candidates" :key="fee.id" :value="fee.id" :label="`${fee.feeNo} · ${feePurposes[fee.purpose] || fee.feeItemName} · ${money(fee.amount, fee.currency)}`" /></el-select></el-form-item>
+      <dl v-if="selected" class="density-fields"><div><dt>原币金额</dt><dd>{{ money(selected.originalAmount, selected.originalCurrency) }}</dd></div><div><dt>原汇率及月份</dt><dd>{{ selected.exchangeRate }} / {{ selected.exchangeRateMonth }}</dd></div></dl>
+      <el-form-item v-if="['fees/correct-target', 'fees/replace-failed'].includes(command)" :label="`正确原币总额（${selected?.originalCurrency || '先选择费用'}）`" required><el-input v-model="form.targetOriginalAmount" placeholder="填写原费用链正确总额，最多两位小数" /></el-form-item>
+      <el-form-item v-if="command === 'fees/refund'" label="本次退款金额（CNY）" required><el-input v-model="form.refundAmount" placeholder="填写本次正额退款金额" /></el-form-item>
+      <el-alert v-if="preview?.error" :title="preview.error" type="warning" :closable="false" />
+      <dl v-else-if="preview" class="density-fields"><template v-if="'target' in preview"><div><dt>目标人民币金额</dt><dd>{{ money(preview.target, 'CNY') }}</dd></div><div><dt>当前净实扣</dt><dd>{{ money(preview.net, 'CNY') }}</dd></div><div><dt>本次差额</dt><dd>{{ money(preview.difference, 'CNY') }}</dd></div></template><div v-if="'refundable' in preview"><dt>该笔剩余可退</dt><dd>{{ money(preview.refundable, 'CNY') }}</dd></div></dl>
+    </template>
+  </div>
+</template>
+<style scoped>
+.charge-section { padding-block: var(--admin-space-4); border-bottom: 1px solid var(--cc-border); }
+.charge-section h3 { font-size: var(--admin-font-section); margin: 0 0 var(--admin-space-3); }
+.charge-heading { display: flex; align-items: center; gap: var(--admin-space-3); }
+.charge-heading :deep(.el-form-item) { flex: 1; }
+.other-charge { padding-bottom: var(--admin-space-3); }
+:deep(.el-select) { width: 100%; }
+</style>
diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
new file mode 100644
index 00000000..e522f75d
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
@@ -0,0 +1,213 @@
+import ElementPlus from 'element-plus'
+import { createPinia, setActivePinia } from 'pinia'
+import { mount, flushPromises, enableAutoUnmount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAuthStore } from '@/core/auth/auth'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { ApiResponseError } from '@/shared/api/http'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import ProcurementNodeActions from './ProcurementNodeActions.vue'
+import { listOverseasPurchaseWarehouseOptions } from '../api/platformOverseasBusiness'
+import { submitProcurementCommand, uploadProcurementFile } from '../api/procurementCommands'
+import { readPendingProcurement } from '../procurementPending'
+import type { PlatformProcurement } from '../procurementTypes'
+vi.mock('../api/platformOverseasBusiness', () => ({ listOverseasPurchaseWarehouseOptions: vi.fn() }))
+vi.mock('../api/procurementCommands', () => ({ submitProcurementCommand: vi.fn(), uploadProcurementFile: vi.fn() }))
+vi.mock('@/core/unsaved-work/useUnsavedWorkRegistration', () => ({ useUnsavedWorkRegistration: () => ({ captureBaseline: vi.fn() }) }))
+const storageKey = 'procurement-command:7:10001:OP-100'
+function storage(): Storage { const values = new Map<string, string>(); return { get length() { return values.size }, clear: () => values.clear(), getItem: key => values.get(key) ?? null, key: index => [...values.keys()][index] ?? null, removeItem: key => values.delete(key), setItem: (key, value) => values.set(key, value) } }
+function fixture(key = 'REVIEW', allowed = true): PlatformProcurement {
+  const keys: Record<string, [string, string]> = { REVIEW: ['审核采购', 'review'], PURCHASE: ['登记购买完成', 'buy'], AUTHORIZE_BUDGET: ['核验预算上限', 'review'], PLAN_WAREHOUSE: ['修改计划仓', 'review'], CANCEL: ['购买前取消', 'cancel'], RECEIVE_OVERSEAS: ['登记海外实收', 'receive-overseas'], FINISH_DOMESTIC: ['确认国内收货完成', 'receive-domestic'], PACK: ['保存装箱草稿', 'pack'], MANAGE: ['事实更正及异常处置', 'manage'], LABELS: ['维护两段面单', 'label'], ESTIMATE: ['核对预估运费', 'estimate'], SHIP_OVERSEAS: ['确认海外交寄', 'ship-overseas'], CONFIRM_CHARGES: ['确认国内费用', 'charge'], FINANCE_ADJUST: ['费用更正与退款', 'finance-adjust'], EXCEPTION_CLOSE: ['异常关闭', 'manage'] }
+  const [label, suffix] = keys[key]
+  return {
+    customerView: { order: { id: '1', orderNo: 'OP-100', customerId: '10001', customerName: '测试客户', purchaseCategory: '家居', productName: '样品商品', productSpecification: '黑色', productUrl: null, purchaseQuantity: 2, budgetUnitPrice: '10.00', currency: 'USD', receivingAddress: '深圳', contactName: '收件人', contactPhone: '13800000000', estimatedArrivalAt: null, plannedWarehouseName: null, actualWarehouseCode: null, actualWarehouseName: null, status: 'PENDING_REVIEW', version: 3, createdAt: '', updatedAt: '' }, budget: { totalAmount: '20.00', currency: 'USD', authorizedAt: null }, purchased: false, purchaseConfirmed: false, purchaseNeedsAttention: false, progress: [], boxes: [], shipments: [], fees: [], exceptionSummaries: [] },
+    purchaseFacts: {}, physical: { dispositions: [], receipts: [], cartons: [], packingVersion: null, packingStatus: null }, transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], reviewHistory: [], operations: [], actions: [{ key, label, permission: `platform:overseas-business:purchase:${suffix}`, allowed, reason: allowed ? null : '业务条件不满足' }], internalRemark: null,
+  }
+}
+function render(detail = fixture(), permissions = ['review', 'buy', 'cancel', 'receive-overseas', 'receive-domestic', 'pack', 'manage', 'label', 'estimate', 'ship-overseas', 'charge', 'finance-adjust']) {
+  const pinia = createPinia(); setActivePinia(pinia)
+  const auth = useAuthStore(); auth.user = { id: '7', name: '测试操作员', account: 'tester', roles: [] }; auth.token = 'test-token'; auth.permissions = permissions.map(item => `platform:overseas-business:purchase:${item}`); useAccessPreviewStore().initializeAfterLogin()
+  return mount(ProcurementNodeActions, { attachTo: document.body, props: { detail, customerId: '10001' }, global: { plugins: [pinia, ElementPlus] } })
+}
+async function open(wrapper: ReturnType<typeof render>) { await wrapper.find('.purchase-actions button').trigger('click'); await flushPromises(); return wrapper.findComponent(AppDialog) }
+async function explain(wrapper: ReturnType<typeof render>, value = '已核对客户资料') { await wrapper.findComponent(AppDialog).findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '操作说明')!.find('textarea').setValue(value) }
+async function confirm(wrapper: ReturnType<typeof render>) { wrapper.findComponent(AppDialog).vm.$emit('confirm'); await flushPromises() }
+enableAutoUnmount(afterEach)
+afterEach(() => vi.unstubAllGlobals())
+beforeEach(() => {
+  vi.stubGlobal('sessionStorage', storage()); vi.stubGlobal('localStorage', storage()); document.body.innerHTML = ''
+  vi.mocked(listOverseasPurchaseWarehouseOptions).mockReset().mockResolvedValue([{ warehouseId: '20001', warehouseCode: 'LAX', warehouseName: '海外收货仓', countryCode: 'US' }])
+  vi.mocked(submitProcurementCommand).mockReset().mockResolvedValue(undefined)
+  vi.mocked(uploadProcurementFile).mockReset().mockResolvedValue({ id: '11', fileId: '101', category: 'PURCHASE', fileName: 'purchase.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' })
+})
+describe('procurement purchase node operations', () => {
+  it('requires explicit remaining-goods outcomes and keeps private closure reasons separate', async () => {
+    const value = fixture('EXCEPTION_CLOSE'); value.purchaseFacts.purchased_at = '2020-01-01T10:00:00'
+    value.controls.remaining = [{ kind: 'PURCHASE_REMAINDER', sourceId: null, businessNo: 'OP-100', quantity: 2 }]
+    value.files = [{ id: '51', fileId: '501', category: 'EXCEPTION', fileName: 'agreement.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' }]
+    const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '内部客户沟通及供应商处理依据')
+    await confirm(wrapper); expect(submitProcurementCommand).not.toHaveBeenCalled()
+    const field = (label: string) => dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === label)!
+    field('实际处置').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'SUPPLIER_RETAINED')
+    field('本项处置凭证').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '501')
+    await field('实际去向及接收方').find('input').setValue('供应商原仓留存')
+    field('客户同意停止履约凭证').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '501')
+    await field('财务处理结论（仅平台可见）').find('textarea').setValue('全部退款及冻结释放已处理')
+    await field('对客关闭摘要（客户可见）').find('textarea').setValue('货物由供应商保留，停止后续寄送')
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'exception-close', expect.objectContaining({ resolutions: [{ kind: 'PURCHASE_REMAINDER', sourceId: null, quantity: 2, decision: 'SUPPLIER_RETAINED', destination: '供应商原仓留存', voucherFileId: '501' }], customerVoucherFileId: '501', financialConclusion: '全部退款及冻结释放已处理', clientSummary: '货物由供应商保留，停止后续寄送' }))
+    expect(dialog.findAllComponents({ name: 'ElInputNumber' })).toHaveLength(0)
+  })
+  it('confirms three explicit zero determinations and marks other charges not applicable in one request', async () => {
+    const value = fixture('CONFIRM_CHARGES'); value.purchaseFacts.domestic_received_at = '2020-01-04T10:00:00'
+    const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '整单费用核对完成')
+    await confirm(wrapper); expect(submitProcurementCommand).not.toHaveBeenCalled()
+    const groups = dialog.findAllComponents({ name: 'ProcurementChargeFields' }); expect(groups).toHaveLength(3)
+    for (const group of groups) {
+      const determination = group.findAllComponents({ name: 'ElSelect' })[0]; determination.vm.$emit('update:modelValue', 'ZERO'); determination.vm.$emit('change', 'ZERO')
+      group.findComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2020-01-04')
+      await group.find('input[placeholder="说明计费依据；零元或不适用也需说明"]').setValue('本项费用免收')
+    }
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
+    const [number, customer, command, payload] = vi.mocked(submitProcurementCommand).mock.calls[0]
+    expect([number, customer, command]).toEqual(['OP-100', '10001', 'charges/confirm'])
+    for (const selection of [payload.internationalFreight, payload.duty, payload.domesticFreight]) expect(selection).toEqual({ value: { determination: 'ZERO', amount: '0.00', currency: 'CNY', businessDate: '2020-01-04', reason: '本项费用免收' } })
+    expect(payload.otherDetermination).toBe('NOT_APPLICABLE'); expect(payload.otherFees).toEqual([])
+  })
+  it('lets finance replace a terminated unpaid sample without modifying its original purchase fact', async () => {
+    const value = fixture('FINANCE_ADJUST')
+    value.fees = [{ id: '11', feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', confirmationOrigin: 'BUSINESS', feeItemCode: 'SAMPLE_PAYMENT', feeItemName: '样品货款', feeVersion: 1, active: false, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeId: null, sourceFeeId: null, voucherFileId: '501', voucherFileName: 'invoice.pdf', walletStatus: 'TERMINATED', walletLedgerId: null, walletErrorCode: null, walletErrorMessage: null, remark: null }]
+    value.files = [{ id: '51', fileId: '501', category: 'VOUCHER', fileName: 'invoice.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' }]
+    const wrapper = render(value, ['finance-adjust']); const dialog = await open(wrapper)
+    const field = (label: string) => dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === label)!
+    field('财务处理方式').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'fees/replace-failed'); await flushPromises()
+    field('原费用').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '11'); await flushPromises()
+    await dialog.find('input[placeholder="填写原费用链正确总额，最多两位小数"]').setValue('12.00')
+    field('本单凭证').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '501'); await explain(wrapper, '原资金已终止，按真实凭证重新核定')
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'fees/replace-failed', expect.objectContaining({ feeId: '11', targetOriginalAmount: '12.00', voucherFileId: '501' }))
+    expect(value.fees[0].originalAmount).toBe('10.00'); expect(value.fees[0].active).toBe(false)
+  })
+  it('lets a buyer retry a failed sample payment without granting ordinary charge or finance-adjust access', async () => {
+    const value = fixture('PURCHASE')
+    value.fees = [{ id: '11', feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', confirmationOrigin: 'BUSINESS', feeItemCode: 'SAMPLE_PAYMENT', feeItemName: '样品货款', feeVersion: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeId: null, sourceFeeId: null, voucherFileId: '501', voucherFileName: 'invoice.pdf', walletStatus: 'FREEZE_FAILED', walletLedgerId: null, walletErrorCode: null, walletErrorMessage: null, remark: null }]
+    const wrapper = render(value, ['buy']); await wrapper.findAll('button').find(button => button.text() === '重试失败资金请求')!.trigger('click'); await flushPromises(); await explain(wrapper, '客户已补足余额，重试原资金请求')
+    wrapper.findComponent(AppDialog).findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '11'); await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'fees/retry', expect.objectContaining({ feeId: '11', version: 3 }))
+    expect(vi.mocked(submitProcurementCommand).mock.calls[0][3]).not.toHaveProperty('amount')
+    wrapper.unmount(); const restricted = render(value, ['charge']); expect(restricted.text()).not.toContain('重试失败资金请求')
+  })
+  it('uploads an external label and submits a per-carton association with receiving details', async () => {
+    const value = fixture('LABELS'); value.physical.packingStatus = 'CONFIRMED'; value.physical.packingVersion = 2
+    value.transport.overseasCargo = [{ cartonId: '31', cartonNo: 'BOX-31', quantity: 2, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.234', packagingRecordId: null, sources: [{ receiptId: '11', quantity: 2 }] }]
+    vi.mocked(uploadProcurementFile).mockResolvedValue({ id: '51', fileId: '501', category: 'LABEL', fileName: 'label.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' })
+    const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '国内客服制作国际面单')
+    const field = (label: string) => dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === label)!
+    await field('国内接收人').find('input').setValue('国内收货人'); await field('联系电话').find('input').setValue('13800000001'); await field('完整收件地址').find('input').setValue('上海国内收货地址')
+    const input = dialog.find('input[aria-label="上传快递面单"]'); const file = new File(['pdf'], 'label.pdf', { type: 'application/pdf' }); Object.defineProperty(input.element, 'files', { value: [file] }); await input.trigger('change'); await flushPromises()
+    field('本单面单文件').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '501'); await field('承运商').find('input').setValue('UPS'); await field('本箱运单号').find('input').setValue('TRACK-31')
+    await confirm(wrapper)
+    expect(uploadProcurementFile).toHaveBeenCalledWith('OP-100', '10001', 'LABEL', file)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'labels', expect.objectContaining({ leg: 'OVERSEAS', packingVersion: 2, receiver: { name: '国内收货人', phone: '13800000001', address: '上海国内收货地址' }, labels: [{ cartonId: '31', fileId: '501', page: 1, carrier: 'UPS', trackingNo: 'TRACK-31' }] }))
+    expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
+  })
+  it('records a partial overseas receipt separately from completing receipt', async () => {
+    const value = fixture('RECEIVE_OVERSEAS'); value.purchaseFacts = { purchased_at: '2020-01-01T10:00:00', purchased_quantity: 2 }
+    const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '首批样品到仓')
+    dialog.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '20001')
+    dialog.findAllComponents({ name: 'ElInputNumber' })[0].vm.$emit('update:modelValue', 1)
+    dialog.findComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2020-01-02T10:00:00')
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'overseas-receipts', expect.objectContaining({ version: 3, leg: 'OVERSEAS', warehouseId: '20001', goodQuantity: 1, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-02T10:00:00' }))
+    expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
+    expect(vi.mocked(submitProcurementCommand).mock.calls[0][3]).not.toHaveProperty('sourceCartonId')
+  })
+  it('saves structured packing sources without invoking packing confirmation', async () => {
+    const value = fixture('PACK')
+    value.physical.receipts = [{ id: '11', receiptNo: 'PR-11', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 2, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-02T10:00:00', active: true }]
+    const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '核对装箱草稿')
+    const values = ['BOX-ONE', '10.12', '20', '30', '1.234']
+    for (const [index, input] of dialog.findAll('.packing-grid input').entries()) await input.setValue(values[index])
+    dialog.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '11')
+    dialog.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 2)
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'packing', expect.objectContaining({ cartons: [{ cartonNo: 'BOX-ONE', lengthCm: '10.12', widthCm: '20', heightCm: '30', grossWeightKg: '1.234', sources: [{ receiptId: '11', quantity: 2 }] }] }))
+    expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
+  })
+  it('uses exception evidence and source quantities for damaged goods disposition', async () => {
+    const value = fixture('MANAGE'); value.purchaseFacts.purchased_quantity = 2
+    value.physical.receipts = [{ id: '11', receiptNo: 'PR-11', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 1, damagedQuantity: 1, extraQuantity: 0, receivedAt: '2020-01-02T10:00:00', active: true }]
+    vi.mocked(uploadProcurementFile).mockResolvedValue({ id: '12', fileId: '102', category: 'EXCEPTION', fileName: 'damage.png', contentType: 'image/png', sizeBytes: 3, createdAt: '' })
+    const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '破损样品已经处理，客户已确认')
+    const field = (label: string) => dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === label)!
+    field('差异及处置').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'DAMAGED'); await flushPromises()
+    field('对应实收').findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '11')
+    dialog.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 1)
+    const input = dialog.find('input[type="file"]'); const file = new File(['img'], 'damage.png', { type: 'image/png' }); Object.defineProperty(input.element, 'files', { value: [file] }); await input.trigger('change'); await flushPromises()
+    await confirm(wrapper)
+    expect(uploadProcurementFile).toHaveBeenCalledWith('OP-100', '10001', 'EXCEPTION', file)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'dispositions', expect.objectContaining({ receiptId: '11', kind: 'DAMAGED', decision: 'DISPOSE_DAMAGED', quantity: 1, voucherFileId: '102' }))
+  })
+  it('requires an authoritative warehouse on approval and sends the current order version', async () => {
+    const wrapper = render(); const dialog = await open(wrapper); await explain(wrapper)
+    await confirm(wrapper); expect(submitProcurementCommand).not.toHaveBeenCalled(); expect(document.body.textContent).toContain('请选择有效采购仓')
+    dialog.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '20001'); await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'review', { version: 3, idempotencyKey: expect.any(String), decision: 'APPROVE', remark: '已核对客户资料', purchaseWarehouseId: '20001' })
+    expect(wrapper.emitted('changed')).toHaveLength(1); expect(sessionStorage.getItem(storageKey)).toBeNull()
+  })
+  it('rejects without a warehouse and never substitutes an invented candidate', async () => {
+    vi.mocked(listOverseasPurchaseWarehouseOptions).mockRejectedValue(new Error('unavailable'))
+    const wrapper = render(); const dialog = await open(wrapper); await explain(wrapper, '购买对象不符合要求')
+    dialog.findComponent({ name: 'ElRadioGroup' }).vm.$emit('update:modelValue', 'REJECT'); await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'review', expect.objectContaining({ decision: 'REJECT' }))
+    expect(vi.mocked(submitProcurementCommand).mock.calls[0][3]).not.toHaveProperty('purchaseWarehouseId')
+  })
+  it('records explicit zero purchase with the exact product snapshot and purchase-purpose evidence', async () => {
+    const wrapper = render(fixture('PURCHASE')); const dialog = await open(wrapper); await explain(wrapper, '供应商免费提供样品')
+    await confirm(wrapper); expect(submitProcurementCommand).not.toHaveBeenCalled()
+    const amount = dialog.findAll('.el-form-item').find(item => item.text().startsWith('供应商实付总额'))!.find('input'); await amount.setValue('0.00')
+    const dates = dialog.findAllComponents({ name: 'ElDatePicker' }); dates[0].vm.$emit('update:modelValue', '2026-10-08T10:00:00'); dates[1].vm.$emit('update:modelValue', '2026-10-15T10:00:00')
+    const input = dialog.find('input[type="file"]'); const file = new File(['pdf'], 'purchase.pdf', { type: 'application/pdf' }); Object.defineProperty(input.element, 'files', { value: [file] }); await input.trigger('change'); await flushPromises()
+    expect(uploadProcurementFile).toHaveBeenCalledWith('OP-100', '10001', 'PURCHASE', file)
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'purchase', expect.objectContaining({ productName: '样品商品', specification: '黑色', quantity: 2, amount: '0.00', currency: 'USD', voucherFileId: '101', purchasedAt: '2026-10-08T10:00:00' }))
+  })
+  it('recovers an uncertain request after reload without changing its body or key', async () => {
+    vi.mocked(submitProcurementCommand).mockRejectedValueOnce(new Error('timeout'))
+    let wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper, '客户取消'); await confirm(wrapper)
+    const original = vi.mocked(submitProcurementCommand).mock.calls[0][3]; expect(sessionStorage.getItem(storageKey)).not.toBeNull(); wrapper.unmount()
+    wrapper = render(fixture('CANCEL')); await flushPromises()
+    const retry = wrapper.findAll('button').find(button => button.text() === '确认上次提交结果')!; await retry.trigger('click'); await flushPromises()
+    expect(vi.mocked(submitProcurementCommand).mock.calls[1][3]).toEqual(original); expect(sessionStorage.getItem(storageKey)).toBeNull()
+  })
+  it('preserves an earlier uncertain financial or physical command when replay is rejected', async () => {
+    vi.mocked(submitProcurementCommand).mockRejectedValueOnce(new Error('timeout')).mockRejectedValueOnce(new ApiResponseError('资源正在处理中', 'A0409'))
+    const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper); await confirm(wrapper)
+    const saved = sessionStorage.getItem(storageKey); expect(saved).not.toBeNull()
+    await confirm(wrapper)
+    expect(sessionStorage.getItem(storageKey)).toBe(saved)
+    expect(vi.mocked(submitProcurementCommand).mock.calls[1][3]).toEqual(vi.mocked(submitProcurementCommand).mock.calls[0][3])
+    expect(wrapper.emitted('changed')).toBeUndefined()
+  })
+  it('keeps a version conflict visible, releases the failed command and does not report success', async () => {
+    vi.mocked(submitProcurementCommand).mockRejectedValue(new ApiResponseError('订单版本冲突，请刷新', 'A0409'))
+    const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper); await confirm(wrapper)
+    expect(sessionStorage.getItem(storageKey)).toBeNull(); expect(document.body.textContent).toContain('订单版本冲突'); expect(wrapper.emitted('changed')).toBeUndefined()
+  })
+  it('hides actions without permission and disables actions blocked by the server', async () => {
+    let wrapper = render(fixture(), []); expect(wrapper.find('.purchase-actions button').exists()).toBe(false); wrapper.unmount()
+    wrapper = render(fixture('REVIEW', false)); expect(wrapper.find('.purchase-actions button').attributes('disabled')).toBeDefined()
+  })
+  it('prevents a second submit while the first command is pending', async () => {
+    let complete!: () => void; vi.mocked(submitProcurementCommand).mockImplementation(() => new Promise(resolve => { complete = resolve }))
+    const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper)
+    wrapper.findComponent(AppDialog).vm.$emit('confirm'); wrapper.findComponent(AppDialog).vm.$emit('confirm'); await flushPromises()
+    expect(submitProcurementCommand).toHaveBeenCalledTimes(1); complete(); await flushPromises()
+  })
+  it('rejects malformed recovery records instead of allowing a fresh competing operation', async () => {
+    sessionStorage.setItem(storageKey, '{bad')
+    const wrapper = render(); expect(wrapper.text()).toContain('上次操作记录无法读取'); expect(wrapper.find('.purchase-actions button').attributes('disabled')).toBeDefined()
+    expect(() => readPendingProcurement(JSON.stringify({ command: 'purchase', payload: { version: 3, idempotencyKey: 'a', amount: '-2' } }))).toThrow()
+  })
+})
diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.vue b/src/modules/overseas-business/components/ProcurementNodeActions.vue
new file mode 100644
index 00000000..c695c291
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed, reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useAuthStore } from '@/core/auth/auth'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
+import { listOverseasPurchaseWarehouseOptions } from '../api/platformOverseasBusiness'
+import { submitProcurementCommand, uploadProcurementFile, type ProcurementCommand, type ProcurementCommandBody } from '../api/procurementCommands'
+import { commandKey, definitelyRejected, readPendingProcurement, type PendingProcurement } from '../procurementPending'
+import type { PlatformProcurement, ProcurementAction, ProcurementFile } from '../procurementTypes'
+import type { OverseasPurchaseWarehouseOption } from '../types'
+import ProcurementControlFields from './ProcurementControlFields.vue'
+import { controlCommands, controlForm, buildControl } from '../procurementControlForm'
+import ProcurementFinanceFields from './ProcurementFinanceFields.vue'
+import { financeCommands, financeForm, buildFinance, feeRetryPermission } from '../procurementFinanceForm'
+import ProcurementTransportFields from './ProcurementTransportFields.vue'
+import { transportCommands, transportForm, buildTransport } from '../procurementTransportForm'
+import ProcurementPhysicalFields from './ProcurementPhysicalFields.vue'
+import { physicalCommands, physicalForm, buildPhysical } from '../procurementPhysicalForm'
+const props = defineProps<{ detail: PlatformProcurement; customerId: string }>()
+const emit = defineEmits<{ changed: [] }>()
+const auth = useAuthStore(); const access = useAccessPreviewStore()
+const routes: Record<string, ProcurementCommand> = { REVIEW: 'review', PURCHASE: 'purchase', CONFIRM_PURCHASE: 'purchase/confirm', AUTHORIZE_BUDGET: 'budget-authorizations', PLAN_WAREHOUSE: 'planned-warehouse', CANCEL: 'cancel', RECEIVE_OVERSEAS: 'overseas-receipts', RECEIVE_DOMESTIC: 'domestic-receipts', FINISH_OVERSEAS: 'overseas-receipts/complete', FINISH_DOMESTIC: 'domestic-receipts/complete', PACK: 'packing', CONFIRM_PACKING: 'packing/confirm', MANAGE: 'dispositions', LABELS: 'labels', ESTIMATE: 'international-estimate', APPLY_LABELS: 'labels/apply', SHIP_OVERSEAS: 'overseas-shipment', SHIP_CUSTOMER: 'customer-shipment', REPACK: 'domestic-repack', CONFIRM_CHARGES: 'charges/confirm', FINANCE_ADJUST: 'fees/correct-target', RETRY_FEE: 'fees/retry', EXCEPTION_CLOSE: 'exception-close' }
+const retryFees = computed(() => props.detail.fees.filter(fee => fee.active && fee.walletStatus.endsWith('_FAILED') && access.can(feeRetryPermission(fee))))
+const actions = computed(() => [...props.detail.actions.filter(item => routes[item.key] && access.can(item.permission)), ...(retryFees.value.length ? [{ key: 'RETRY_FEE', label: '重试失败资金请求', permission: feeRetryPermission(retryFees.value[0]), allowed: true, reason: null }] : [])])
+const opened = ref(false); const active = ref<ProcurementAction | null>(null); const saving = ref(false); const uploading = ref(false)
+const error = ref<ApiErrorDetails | null>(null); const storageError = ref(''); const pending = ref<PendingProcurement | null>(null)
+const warehouses = ref<OverseasPurchaseWarehouseOption[]>([]); const warehouseLoading = ref(false); const warehouseError = ref('')
+const extraFiles = ref<ProcurementFile[]>([])
+const form = reactive({ decision: 'APPROVE' as 'APPROVE' | 'REJECT', warehouseId: '', reason: '', amount: '', currency: 'CNY' as 'CNY' | 'USD', purchasedAt: '', estimatedArrivalAt: '', voucherFileId: '' })
+const control = ref(controlForm(props.detail))
+const finance = ref(financeForm(props.detail))
+const financialCommand = ref<ProcurementCommand>('fees/correct-target')
+const transport = ref(transportForm(props.detail))
+const physical = ref(physicalForm())
+const manageCommand = ref<ProcurementCommand>('dispositions')
+const key = computed(() => auth.user?.id ? `procurement-command:${auth.user.id}:${props.customerId}:${props.detail.customerView.order.orderNo}` : '')
+const commandPermissions: Record<ProcurementCommand, string> = { review: 'review', purchase: 'buy', 'purchase/confirm': 'buy', 'budget-authorizations': 'review', 'planned-warehouse': 'review', cancel: 'cancel', 'overseas-receipts': 'receive-overseas', 'domestic-receipts': 'receive-domestic', 'overseas-receipts/complete': 'receive-overseas', 'domestic-receipts/complete': 'receive-domestic', packing: 'pack', 'packing/confirm': 'pack', 'packing/withdraw': 'manage', dispositions: 'manage', 'receipts/correct': 'manage', 'dispositions/revoke': 'manage', labels: 'label', 'international-estimate': 'estimate', 'labels/apply': 'apply-label', 'overseas-shipment': 'ship-overseas', 'customer-shipment': 'ship-customer', 'domestic-repack': 'receive-domestic', 'charges/confirm': 'charge', 'fees/retry': 'charge', 'fees/terminate': 'finance-adjust', 'fees/release-estimate': 'finance-adjust', 'fees/correct-target': 'finance-adjust', 'fees/additional': 'finance-adjust', 'fees/replace-failed': 'finance-adjust', 'fees/refund': 'finance-adjust', 'control-notes': 'manage', 'control-notes/resolve': 'manage', 'actual-warehouse/correct': 'manage', 'exception-close': 'manage' }
+const command = computed(() => pending.value?.command ?? (active.value?.key === 'MANAGE' ? manageCommand.value : active.value?.key === 'FINANCE_ADJUST' ? financialCommand.value : active.value ? routes[active.value.key] : undefined))
+const isControl = computed(() => !!command.value && controlCommands.has(command.value))
+const isFinance = computed(() => !!command.value && financeCommands.has(command.value))
+const isTransport = computed(() => !!command.value && transportCommands.has(command.value))
+const isPhysical = computed(() => !!command.value && physicalCommands.has(command.value))
+const needsEvidence = computed(() => ['dispositions', 'receipts/correct', 'dispositions/revoke', 'domestic-repack', 'fees/correct-target', 'fees/refund', 'fees/replace-failed', 'control-notes', 'control-notes/resolve', 'actual-warehouse/correct'].includes(command.value || ''))
+const needsWarehouse = computed(() => command.value === 'actual-warehouse/correct' || command.value === 'overseas-receipts' || (command.value === 'receipts/correct' && physical.value.leg === 'OVERSEAS') || command.value === 'planned-warehouse' || (command.value === 'review' && form.decision === 'APPROVE'))
+const needsAmount = computed(() => ['purchase', 'budget-authorizations'].includes(command.value || ''))
+const fileCategory = computed(() => isControl.value ? 'EXCEPTION' : isFinance.value ? 'VOUCHER' : command.value === 'labels' ? 'LABEL' : command.value === 'domestic-repack' ? 'RECEIPT' : needsEvidence.value ? 'EXCEPTION' : command.value === 'purchase' ? 'PURCHASE' : 'BUDGET')
+const allFiles = computed(() => [...props.detail.files, ...extraFiles.value].filter((file, index, all) => all.findIndex(other => other.fileId === file.fileId) === index))
+const files = computed(() => allFiles.value.filter(file => file.category === fileCategory.value))
+const { captureBaseline } = useUnsavedWorkRegistration({ key: 'procurement-purchase-action', label: computed(() => active.value?.label || '采购节点操作'), isOpen: opened, model: reactive({ purchase: form, physical, transport, finance, control }), requiredPermission: computed(() => active.value?.permission ?? null) })
+watch(key, () => {
+  opened.value = false; pending.value = null; storageError.value = ''; extraFiles.value = []; active.value = null
+  if (!key.value) return
+  try { pending.value = readPendingProcurement(sessionStorage.getItem(key.value)) }
+  catch { storageError.value = '上次操作记录无法读取，请先联系管理员核对该订单的处理结果。' }
+}, { immediate: true })
+async function loadWarehouses() {
+  if (warehouseLoading.value) return
+  warehouseLoading.value = true; warehouseError.value = ''
+  try { warehouses.value = await listOverseasPurchaseWarehouseOptions() }
+  catch { warehouseError.value = '采购仓候选加载失败，请重试'; warehouses.value = [] }
+  finally { warehouseLoading.value = false }
+}
+function open(action: ProcurementAction) {
+  if (!action.allowed || pending.value || storageError.value || saving.value) return
+  active.value = action; error.value = null; manageCommand.value = 'dispositions'; physical.value = physicalForm(props.detail)
+  control.value = controlForm(props.detail)
+  finance.value = financeForm(props.detail); financialCommand.value = 'fees/correct-target'
+  transport.value = transportForm(props.detail, ['SHIP_CUSTOMER', 'REPACK'].includes(action.key) ? 'DOMESTIC' : action.key === 'LABELS' ? undefined : 'OVERSEAS')
+  if (action.key.includes('DOMESTIC')) physical.value.leg = 'DOMESTIC'
+  Object.assign(form, { decision: 'APPROVE', warehouseId: props.detail.purchaseFacts.actual_warehouse_id || '', reason: '', amount: '', currency: props.detail.customerView.budget.currency === 'USD' ? 'USD' : 'CNY', purchasedAt: '', estimatedArrivalAt: '', voucherFileId: '' })
+  opened.value = true; captureBaseline()
+  if (needsWarehouse.value) void loadWarehouses()
+}
+watch(financialCommand, () => { finance.value.feeId = ''; finance.value.targetOriginalAmount = ''; finance.value.refundAmount = ''; form.voucherFileId = ''; error.value = null })
+watch(needsWarehouse, value => { if (value && opened.value) void loadWarehouses() })
+function build(): ProcurementCommandBody {
+  const order = props.detail.customerView.order
+  if (!form.reason.trim()) throw new Error('请填写操作说明')
+  const base = { version: order.version, idempotencyKey: commandKey(), reason: form.reason.trim() }
+  if (needsWarehouse.value && !warehouses.value.some(row => row.warehouseId === form.warehouseId)) throw new Error('请选择有效采购仓')
+  if (isControl.value && command.value) return buildControl(command.value, control.value, props.detail, allFiles.value, base, form.warehouseId, form.voucherFileId)
+  if (isFinance.value && command.value) return buildFinance(command.value, finance.value, props.detail, allFiles.value, base, form.voucherFileId)
+  if (isTransport.value && command.value) return buildTransport(command.value, transport.value, props.detail, allFiles.value, base, form.voucherFileId)
+  if (isPhysical.value && command.value) {
+    if (needsEvidence.value && !files.value.some(file => file.fileId === form.voucherFileId)) throw new Error('请选择本单异常处置凭证')
+    return buildPhysical(command.value, physical.value, props.detail, base, form.warehouseId, form.voucherFileId)
+  }
+  if (command.value === 'review') return { version: base.version, idempotencyKey: base.idempotencyKey, decision: form.decision, remark: base.reason, ...(form.decision === 'APPROVE' ? { purchaseWarehouseId: form.warehouseId } : {}) }
+  if (command.value === 'planned-warehouse') return { ...base, warehouseId: form.warehouseId }
+  if (needsAmount.value) {
+    if (!/^\d{1,16}(?:\.\d{1,2})?$/.test(form.amount.trim())) throw new Error('请明确填写非负金额，最多两位小数；免费样品请填 0')
+    if (!files.value.some(file => file.fileId === form.voucherFileId)) throw new Error('请选择本单对应用途的凭证')
+    const amount = { ...base, amount: form.amount.trim(), currency: form.currency, voucherFileId: form.voucherFileId }
+    if (command.value === 'budget-authorizations') return amount
+    if (!form.purchasedAt || !form.estimatedArrivalAt) throw new Error('请填写真实购买时间及预计到仓时间')
+    return { ...amount, productName: order.productName, specification: order.productSpecification ?? '', quantity: order.purchaseQuantity, purchasedAt: form.purchasedAt, estimatedArrivalAt: form.estimatedArrivalAt }
+  }
+  return base
+}
+async function submit() {
+  if (saving.value || uploading.value || storageError.value || !key.value) return
+  const resuming = !!pending.value
+  const scope = key.value; const orderNo = props.detail.customerView.order.orderNo; const customer = props.customerId
+  if (!pending.value) {
+    if (!active.value?.allowed || !access.can(active.value.permission) || !command.value) return
+    try {
+      const request = { command: command.value, payload: build() }
+      const serialized = JSON.stringify(request); readPendingProcurement(serialized)
+      sessionStorage.setItem(scope, serialized); pending.value = request
+    } catch (issue) { error.value = { message: issue instanceof Error ? issue.message : '提交信息保存失败，请重试' }; return }
+  }
+  const retryFee = pending.value.command === 'fees/retry' ? props.detail.fees.find(fee => fee.id === pending.value?.payload.feeId) : null
+  const requiredPermission = pending.value.command === 'fees/retry' ? (retryFee ? feeRetryPermission(retryFee) : '') : `platform:overseas-business:purchase:${commandPermissions[pending.value.command]}`
+  if (!requiredPermission || !access.can(requiredPermission)) { error.value = { message: '当前账号无此节点操作权限' }; return }
+  saving.value = true; error.value = null
+  try {
+    await submitProcurementCommand(orderNo, customer, pending.value.command, pending.value.payload)
+    sessionStorage.removeItem(scope)
+    if (key.value !== scope) return
+    pending.value = null; opened.value = false; captureBaseline(); ElMessage.success('操作已保存，请核对最新业务及资金结果'); emit('changed')
+  } catch (issue) {
+    if (key.value !== scope) return
+    if (!resuming && definitelyRejected(issue)) { sessionStorage.removeItem(scope); pending.value = null }
+    error.value = getApiErrorDetails(issue, '结果尚未确认，请使用原请求重试')
+  } finally { saving.value = false }
+}
+async function upload(event: Event) {
+  const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''
+  if (!file || uploading.value || pending.value) return
+  if (file.size > 10 * 1024 * 1024 || !['application/pdf', 'image/jpeg', 'image/png'].includes(file.type)) { ElMessage.warning('请上传不超过 10MB 的 PDF、JPG 或 PNG'); return }
+  const scope = key.value; uploading.value = true
+  try {
+    const saved = await uploadProcurementFile(props.detail.customerView.order.orderNo, props.customerId, fileCategory.value, file)
+    if (scope !== key.value) return
+    extraFiles.value.push(saved); form.voucherFileId = saved.fileId
+  } catch (issue) { if (scope === key.value) error.value = getApiErrorDetails(issue, '凭证上传失败') }
+  finally { uploading.value = false }
+}
+</script>
+<template>
+  <section class="admin-density" aria-label="采购履约节点操作">
+    <div class="density-actions purchase-actions"><el-tooltip v-for="action in actions" :key="action.key" :content="action.reason || action.label"><span><el-button class="density-action" :disabled="!action.allowed || !!pending || !!storageError || saving" @click="open(action)">{{ action.label }}</el-button></span></el-tooltip></div>
+    <el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
+    <el-alert v-if="pending" title="上次提交结果尚未确认，重试将使用原始内容与原请求编号。" type="warning" :closable="false"><p>原操作：{{ pending.command === 'review' ? (pending.payload.decision === 'APPROVE' ? '审核通过' : '审核拒绝') : actions.find(action => routes[action.key] === pending?.command)?.label || '采购节点操作' }} · {{ pending.payload.remark || pending.payload.reason }}</p><p v-if="pending.payload.amount !== undefined">原提交金额：{{ pending.payload.amount }} {{ pending.payload.currency || (['international-estimate', 'fees/refund'].includes(pending.command) ? 'CNY' : '') }}</p><el-button :loading="saving" @click="submit">确认上次提交结果</el-button></el-alert>
+    <ApiErrorMeta v-if="error && !opened" :details="error" />
+    <AppDialog class="admin-density-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="uploading || warehouseLoading || !!storageError || !key" :confirm-text="pending ? '重试原请求' : '确认提交'" @confirm="submit">
+      <template #default><el-alert v-if="command === 'purchase'" title="记录已实际购买的商品和供应商实付总额。资金未完成时，真实购买事实仍保留。" type="info" :closable="false" />
+        <el-form class="density-form" label-position="top" :disabled="saving || uploading || !!pending">
+          <el-form-item v-if="active?.key === 'MANAGE'" label="实物更正操作"><el-select v-model="manageCommand" placeholder="选择处置或更正操作"><el-option value="dispositions" label="记录差异处置" /><el-option value="receipts/correct" label="更正原实收数量" /><el-option value="dispositions/revoke" label="撤销原差异处置" /><el-option value="packing/withdraw" label="撤回未交寄的确认清单" /><el-option value="control-notes" label="追加事实说明或阻断" /><el-option value="control-notes/resolve" label="解除已处理的阻断" /><el-option value="actual-warehouse/correct" label="实际仓受控更正" /></el-select></el-form-item>
+          <el-form-item v-if="active?.key === 'FINANCE_ADJUST'" label="财务处理方式"><el-select v-model="financialCommand" placeholder="选择财务处理方式"><el-option value="fees/additional" label="登记独立新发生费用" /><el-option value="fees/correct-target" label="更正原费用链目标总额" /><el-option value="fees/refund" label="关联原扣款退款" /><el-option value="fees/terminate" label="终止明确失败的费用版本" /><el-option value="fees/replace-failed" label="重新核定已终止的未扣款费用" /><el-option value="fees/release-estimate" label="释放有效预估冻结" /></el-select></el-form-item>
+          <ProcurementControlFields v-if="isControl && command" v-model="control" :command="command" :detail="detail" :files="allFiles" />
+          <ProcurementFinanceFields v-if="isFinance && command" v-model="finance" :command="command" :detail="detail" :files="allFiles" :can="access.can" />
+          <ProcurementTransportFields v-if="isTransport && command" v-model="transport" :command="command" :detail="detail" :files="allFiles" />
+          <ProcurementPhysicalFields v-if="isPhysical && command" v-model="physical" :command="command" :detail="detail" />
+          <el-form-item v-if="command === 'review'" label="审核决定"><el-radio-group v-model="form.decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">拒绝</el-radio></el-radio-group></el-form-item>
+          <el-form-item v-if="needsWarehouse" :label="command === 'actual-warehouse/correct' ? '更正后的实际仓' : isPhysical ? '实际海外收货仓' : '采购仓'" required><el-select v-model="form.warehouseId" :disabled="isPhysical && !!detail.purchaseFacts.actual_warehouse_id" filterable :loading="warehouseLoading" placeholder="选择有效海外收货仓"><el-option v-for="item in warehouses" :key="item.warehouseId" :value="item.warehouseId" :label="`${item.warehouseName} · ${item.warehouseCode}`" /></el-select><span v-if="warehouseError">{{ warehouseError }}<el-button link @click="loadWarehouses">重试</el-button></span></el-form-item>
+          <div v-if="needsAmount" class="purchase-form-grid"><el-form-item :label="command === 'purchase' ? '供应商实付总额' : '客户授权预算总额'" required><el-input v-model="form.amount" placeholder="明确填写金额，包括零元" /></el-form-item><el-form-item label="原币" required><el-select v-model="form.currency"><el-option value="CNY" label="人民币 CNY" /><el-option value="USD" label="美元 USD" /></el-select></el-form-item></div>
+          <div v-if="command === 'purchase'" class="purchase-form-grid"><el-form-item label="真实购买时间" required><el-date-picker v-model="form.purchasedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="预计到海外仓时间" required><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item></div>
+          <el-form-item v-if="command === 'exception-close'" label="上传异常处置或客户确认凭证"><input aria-label="上传异常关闭凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="['charges/confirm', 'fees/additional'].includes(command || '')" label="上传费用凭证"><input aria-label="上传费用凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="command === 'labels'" label="上传本单面单"><input aria-label="上传快递面单" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="needsAmount || needsEvidence" label="本单凭证" required><el-select v-model="form.voucherFileId" placeholder="选择已上传凭证"><el-option v-for="file in files" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select><input aria-label="上传本单凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
+          <el-form-item label="操作说明" required><el-input v-model="form.reason" placeholder="填写本次操作的事实、依据或原因" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
+        </el-form><el-alert v-if="error" :title="error.message" type="error" :closable="false" /><ApiErrorMeta v-if="error" :details="error" /></template>
+      <template #footer><el-button :disabled="saving || uploading" @click="opened = false">关闭</el-button><el-button type="primary" :loading="saving" :disabled="uploading || warehouseLoading || !!storageError || !key" @click="submit">{{ pending ? '重试原请求' : '确认提交' }}</el-button></template>
+    </AppDialog>
+  </section>
+</template>
+<style scoped>
+.purchase-actions { flex-wrap: wrap; }
+.purchase-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-4); }
+.purchase-form-grid :deep(.el-date-editor), :deep(.el-select) { width: 100%; }
+</style>
diff --git a/src/modules/overseas-business/components/ProcurementPhysicalFields.vue b/src/modules/overseas-business/components/ProcurementPhysicalFields.vue
new file mode 100644
index 00000000..423817bc
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementPhysicalFields.vue
@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed } from 'vue'
+import type { ProcurementCommand } from '../api/procurementCommands'
+import type { PlatformProcurement } from '../procurementTypes'
+import { newCarton, shippedCartons, type PhysicalForm } from '../procurementPhysicalForm'
+const props = defineProps<{ command: ProcurementCommand; detail: PlatformProcurement }>()
+const form = defineModel<PhysicalForm>({ required: true })
+const receipts = computed(() => props.detail.physical.receipts.filter(row => row.active && (props.command === 'receipts/correct' || (row.leg === form.value.leg && row.sourceCartonId === (form.value.leg === 'DOMESTIC' ? form.value.sourceCartonId : null)))))
+const sources = computed(() => props.detail.physical.receipts.filter(row => row.active && row.leg === 'OVERSEAS' && row.goodQuantity > 0))
+const domesticBoxes = computed(() => shippedCartons(props.detail))
+const showReceipt = computed(() => ['overseas-receipts', 'domestic-receipts', 'receipts/correct'].includes(props.command))
+function selectReceipt(id: string) {
+  if (props.command !== 'receipts/correct') return
+  const row = props.detail.physical.receipts.find(item => item.id === id && item.active)
+  if (row) Object.assign(form.value, { leg: row.leg, sourceCartonId: row.sourceCartonId || '', goodQuantity: row.goodQuantity, damagedQuantity: row.damagedQuantity, extraQuantity: row.extraQuantity, receivedAt: row.receivedAt })
+}
+const differenceNames = { SHORTAGE: '短少', DAMAGED: '破损', EXTRA: '多货' }
+</script>
+<template>
+  <div class="admin-density">
+    <el-alert v-if="command.endsWith('/complete')" title="仅在全部到齐或差异已有明确处置后确认收货完成；登记实收不会自动完成收货。" type="info" :closable="false" />
+    <el-alert v-if="command === 'packing/confirm'" :title="`确认第 ${detail.physical.packingVersion || '—'} 版清单。须完成海外收货、样品货款及费用来源关联。`" type="info" :closable="false" />
+    <el-alert v-if="command === 'packing/withdraw'" title="撤回未交寄清单后，需要重新确认装箱并核对后续面单和费用。" type="warning" :closable="false" />
+    <el-form-item v-if="command === 'dispositions'" label="差异发生段" required><el-radio-group v-model="form.leg" @change="form.sourceCartonId = ''; form.receiptId = ''"><el-radio value="OVERSEAS">海外收货</el-radio><el-radio value="DOMESTIC">国内收货</el-radio></el-radio-group></el-form-item>
+    <el-form-item v-if="command === 'receipts/correct'" label="待更正实收" required><el-select v-model="form.receiptId" placeholder="选择有效原实收记录" @change="selectReceipt"><el-option v-for="row in receipts" :key="row.id" :value="row.id" :label="`${row.receiptNo} · ${row.leg === 'OVERSEAS' ? '海外' : '国内'}`" /></el-select><span>保留原记录，更正不能改变运输段或来源箱；已交寄后只能追加更正说明。</span></el-form-item>
+    <el-form-item v-if="(showReceipt || command === 'dispositions') && form.leg === 'DOMESTIC'" label="国际交寄原箱" required><el-select v-model="form.sourceCartonId" :disabled="command === 'receipts/correct'" placeholder="选择本单已国际交寄的箱" @change="form.receiptId = ''"><el-option v-for="box in domesticBoxes" :key="box.id" :value="box.id" :label="`${box.cartonNo} · ${box.quantity} 件`" /></el-select></el-form-item>
+    <template v-if="showReceipt"><div class="physical-grid"><el-form-item label="合格件数" required><el-input-number v-model="form.goodQuantity" :min="0" :precision="0" controls-position="right" placeholder="本次合格件数" /></el-form-item><el-form-item label="破损件数" required><el-input-number v-model="form.damagedQuantity" :min="0" :precision="0" controls-position="right" placeholder="本次破损件数" /></el-form-item><el-form-item label="多货件数" required><el-input-number v-model="form.extraQuantity" :min="0" :precision="0" controls-position="right" placeholder="本次多到件数" /></el-form-item></div><el-form-item label="实际收货时间" required><el-date-picker v-model="form.receivedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item></template>
+    <template v-if="command === 'dispositions'"><el-form-item label="差异及处置" required><el-select v-model="form.kind" placeholder="选择差异处理方式" @change="form.receiptId = ''; form.quantity = undefined"><el-option value="SHORTAGE" label="短少 · 客户接受短少" /><el-option value="DAMAGED" label="破损 · 处理破损货物" /><el-option value="EXTRA" label="多货 · 退回多到货物" /></el-select></el-form-item><el-form-item v-if="form.kind !== 'SHORTAGE'" label="对应实收" required><el-select v-model="form.receiptId" placeholder="选择差异来源实收"><el-option v-for="row in receipts" :key="row.id" :value="row.id" :label="`${row.receiptNo} · 破损 ${row.damagedQuantity} / 多货 ${row.extraQuantity}`" /></el-select></el-form-item><el-form-item label="本次处置件数" required><el-input-number v-model="form.quantity" :min="1" :precision="0" controls-position="right" placeholder="填写已完成处置的件数" /></el-form-item></template>
+    <el-form-item v-if="command === 'dispositions/revoke'" label="撤销差异处置" required><el-select v-model="form.dispositionId" placeholder="选择有效处置记录"><el-option v-for="row in detail.physical.dispositions.filter(item => item.active)" :key="row.id" :value="row.id" :label="`${row.leg === 'OVERSEAS' ? '海外' : '国内'} · ${differenceNames[row.kind]} ${row.quantity} 件 · ${row.reason}`" /></el-select></el-form-item>
+    <template v-if="command === 'packing'">
+      <el-alert title="每箱填写箱规、毛重及来源实收件数。草稿允许暂未分配完，确认时必须覆盖全部合格实收。" type="info" :closable="false" />
+      <section v-for="(box, index) in form.cartons" :key="index" class="packing-box">
+        <div class="packing-heading"><strong>第 {{ index + 1 }} 箱</strong><el-button class="density-action" data-tone="danger" @click="form.cartons.splice(index, 1)">移除本箱</el-button></div>
+        <div class="packing-grid"><el-form-item label="箱号" required><el-input v-model="box.cartonNo" maxlength="64" placeholder="填写本单唯一箱号" /></el-form-item><el-form-item label="长（cm）" required><el-input v-model="box.lengthCm" placeholder="最多两位小数" /></el-form-item><el-form-item label="宽（cm）" required><el-input v-model="box.widthCm" placeholder="最多两位小数" /></el-form-item><el-form-item label="高（cm）" required><el-input v-model="box.heightCm" placeholder="最多两位小数" /></el-form-item><el-form-item label="毛重（kg）" required><el-input v-model="box.grossWeightKg" placeholder="最多三位小数" /></el-form-item></div>
+        <div v-for="(source, sourceIndex) in box.sources" :key="sourceIndex" class="packing-source"><el-form-item label="海外实收来源" required><el-select v-model="source.receiptId" placeholder="选择有效合格实收"><el-option v-for="receipt in sources" :key="receipt.id" :value="receipt.id" :label="`${receipt.receiptNo} · 合格 ${receipt.goodQuantity} 件`" /></el-select></el-form-item><el-form-item label="本箱分配件数" required><el-input-number v-model="source.quantity" :min="1" :precision="0" placeholder="分配到此箱的件数" controls-position="right" /></el-form-item><el-button class="density-action" data-tone="danger" @click="box.sources.splice(sourceIndex, 1)">移除来源</el-button></div>
+        <el-button class="density-action" @click="box.sources.push({ receiptId: '', quantity: undefined })">增加来源</el-button>
+      </section><el-button class="density-action" data-tone="primary" @click="form.cartons.push(newCarton())">增加装货箱</el-button>
+    </template>
+  </div>
+</template>
+<style scoped>
+.physical-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: var(--admin-space-3); }
+.packing-grid { display: grid; grid-template-columns: 2fr repeat(4, minmax(0, 1fr)); gap: var(--admin-space-3); }
+.packing-source { display: grid; grid-template-columns: minmax(0, 2fr) minmax(0, 1fr) auto; gap: var(--admin-space-3); align-items: center; }
+.packing-box { padding-block: var(--admin-space-4); border-bottom: 1px solid var(--cc-border); }
+.packing-heading { display: flex; align-items: center; justify-content: space-between; margin-bottom: var(--admin-space-3); }
+:deep(.el-select), :deep(.el-input-number) { width: 100%; }
+@media (max-width: 760px) { .physical-grid, .packing-grid { grid-template-columns: 1fr; } .packing-source { grid-template-columns: 1fr; } }
+</style>
diff --git a/src/modules/overseas-business/components/ProcurementTransportFields.vue b/src/modules/overseas-business/components/ProcurementTransportFields.vue
new file mode 100644
index 00000000..c2b338c6
--- /dev/null
+++ b/src/modules/overseas-business/components/ProcurementTransportFields.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed } from 'vue'
+import type { PlatformProcurement, ProcurementFile } from '../procurementTypes'
+import type { ProcurementCommand } from '../api/procurementCommands'
+import { transportForm, transportCargo, type TransportForm } from '../procurementTransportForm'
+import { dateTime, measurement, money } from '../procurementPresentation'
+const props = defineProps<{ command: ProcurementCommand; detail: PlatformProcurement; files: ProcurementFile[] }>()
+const form = defineModel<TransportForm>({ required: true })
+const cargo = computed(() => transportCargo(props.detail, form.value.leg))
+const labelSet = computed(() => form.value.leg === 'OVERSEAS' ? props.detail.transport.overseasLabels : props.detail.transport.domesticLabels)
+const sender = computed(() => form.value.leg === 'DOMESTIC' ? props.detail.transport.overseasLabels?.receiver : labelSet.value?.sender)
+const estimate = computed(() => props.detail.customerView.fees.find(row => row.active && row.purpose === 'INTERNATIONAL_ESTIMATE'))
+const changedReceiver = computed(() => form.value.leg === 'DOMESTIC' && (form.value.receiver.name.trim() !== props.detail.customerView.order.contactName || form.value.receiver.phone.trim() !== props.detail.customerView.order.contactPhone || form.value.receiver.address.trim() !== props.detail.customerView.order.receivingAddress))
+function changeLeg() { form.value = transportForm(props.detail, form.value.leg) }
+function selectCarton(id: string) { const box = props.detail.transport.domesticCargo.find(row => row.cartonId === id); if (box) Object.assign(form.value, { lengthCm: String(box.lengthCm), widthCm: String(box.widthCm), heightCm: String(box.heightCm), grossWeightKg: String(box.grossWeightKg) }) }
+</script>
+<template>
+  <div class="admin-density">
+    <template v-if="command === 'labels'">
+      <el-form-item label="面单运输段" required><el-radio-group v-model="form.leg" @change="changeLeg"><el-radio value="OVERSEAS" :disabled="!!detail.purchaseFacts.overseas_shipped_at">国际段</el-radio><el-radio value="DOMESTIC" :disabled="!detail.purchaseFacts.domestic_received_at">寄客户段</el-radio></el-radio-group></el-form-item>
+      <p>寄件资料：{{ sender ? `${sender.name} · ${sender.phone} · ${sender.address}` : '由实际海外收货仓主档提供，保存时核对。' }}</p>
+      <div class="transport-grid"><el-form-item :label="form.leg === 'OVERSEAS' ? '国内接收人' : '最终收件人'" required><el-input v-model="form.receiver.name" maxlength="128" placeholder="填写快递收件人" /></el-form-item><el-form-item label="联系电话" required><el-input v-model="form.receiver.phone" maxlength="64" placeholder="填写真实快递联系电话" /></el-form-item></div>
+      <el-form-item label="完整收件地址" required><el-input v-model="form.receiver.address" maxlength="1000" placeholder="填写完整快递收件地址" /></el-form-item>
+      <el-form-item v-if="changedReceiver" label="客户确认收件信息变更凭证" required><el-select v-model="form.addressVoucherFileId" placeholder="选择本单已上传的客户确认凭证"><el-option v-for="file in files.filter(item => item.category === 'EXCEPTION')" :key="file.fileId" :label="file.fileName" :value="file.fileId" /></el-select></el-form-item>
+      <section v-for="row in form.labels" :key="row.cartonId" class="label-row">
+        <strong>{{ cargo.find(box => box.cartonId === row.cartonId)?.cartonNo || '未关联箱' }}</strong>
+        <div class="label-grid"><el-form-item label="本单面单文件" required><el-select v-model="row.fileId" placeholder="选择 PDF、JPG 或 PNG"><el-option v-for="file in files.filter(item => item.category === 'LABEL')" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select></el-form-item><el-form-item label="对应页码" required><el-input-number v-model="row.page" :min="1" :precision="0" controls-position="right" placeholder="图片填 1" /></el-form-item><el-form-item label="承运商" required><el-input v-model="row.carrier" maxlength="128" placeholder="填写实际承运商" /></el-form-item><el-form-item label="本箱运单号" required><el-input v-model="row.trackingNo" maxlength="128" placeholder="填写本箱主/子运单号" /></el-form-item></div>
+      </section>
+    </template>
+    <template v-if="command === 'international-estimate'">
+      <el-alert title="本次只冻结预估国际运费，不直接扣款。变价时先释放原冻结，释放完成后再次核对并提交新预估；同价也需核对当前面单版本。" type="info" :closable="false" />
+      <p>当前面单：第 {{ labelSet?.version || '—' }} 版；有效原预估：{{ estimate ? money(estimate.amount, estimate.currency) : '尚未核定' }}</p>
+      <div class="transport-grid"><el-form-item label="预估国际运费（CNY）" required><el-input v-model="form.amount" placeholder="明确填写金额，包括零元" /></el-form-item><el-form-item label="业务日期" required><el-date-picker v-model="form.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item></div>
+    </template>
+    <template v-if="command === 'labels/apply'">
+      <p>国际面单第 {{ labelSet?.version || '—' }} 版，逐箱记录实际贴单。</p>
+      <el-form-item label="本次已贴面单的箱" required><el-checkbox-group v-model="form.cartonIds"><el-checkbox v-for="row in labelSet?.labels || []" :key="row.cartonId" :value="row.cartonId" :disabled="!!row.appliedAt">{{ cargo.find(box => box.cartonId === row.cartonId)?.cartonNo || '未关联箱' }} · {{ row.appliedAt ? `已贴单 ${dateTime(row.appliedAt)}` : '待贴单' }}</el-checkbox></el-checkbox-group></el-form-item>
+      <el-form-item label="实际贴单时间" required><el-date-picker v-model="form.occurredAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
+    </template>
+    <template v-if="command === 'domestic-repack'">
+      <el-alert title="只允许原箱一对一换包装，不改变货物来源和件数。保存后旧国内面单失效，须重新制单并核对国内费用。" type="warning" :closable="false" />
+      <el-form-item label="换包装原箱" required><el-select v-model="form.cartonId" placeholder="选择国内可寄原箱" @change="selectCarton"><el-option v-for="box in cargo" :key="box.cartonId" :value="box.cartonId" :label="`${box.cartonNo} · ${box.quantity} 件`" /></el-select></el-form-item>
+      <div class="measure-grid"><el-form-item label="新长度（cm）" required><el-input v-model="form.lengthCm" placeholder="最多两位小数" /></el-form-item><el-form-item label="新宽度（cm）" required><el-input v-model="form.widthCm" placeholder="最多两位小数" /></el-form-item><el-form-item label="新高度（cm）" required><el-input v-model="form.heightCm" placeholder="最多两位小数" /></el-form-item><el-form-item label="新毛重（kg）" required><el-input v-model="form.grossWeightKg" placeholder="最多三位小数" /></el-form-item></div>
+    </template>
+    <template v-if="['overseas-shipment', 'customer-shipment'].includes(command)">
+      <el-alert title="仅在货物实际交给承运方后确认。本次将整批交寄全部可寄原箱，不能拆批或重复交寄。" type="warning" :closable="false" />
+      <p>面单第 {{ labelSet?.version || '—' }} 版；收件信息：{{ labelSet ? `${labelSet.receiver.name} · ${labelSet.receiver.phone} · ${labelSet.receiver.address}` : '未建立' }}</p>
+      <el-form-item label="实际交承运方时间" required><el-date-picker v-model="form.occurredAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
+    </template>
+    <table class="density-table"><thead><tr><th>原箱</th><th>当前可寄件数</th><th>长 × 宽 × 高（cm）</th><th>毛重（kg）</th></tr></thead><tbody><tr v-for="box in cargo" :key="box.cartonId"><td>{{ box.cartonNo }}</td><td>{{ box.quantity }}</td><td>{{ [box.lengthCm, box.widthCm, box.heightCm].map(value => measurement(value, 2)).join(' × ') }}</td><td>{{ measurement(box.grossWeightKg, 3) }}</td></tr><tr v-if="!cargo.length"><td colspan="4">当前没有可寄货物</td></tr></tbody></table>
+  </div>
+</template>
+<style scoped>
+.transport-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-3); }
+.label-grid { display: grid; grid-template-columns: minmax(0, 2fr) minmax(0, 1fr) minmax(0, 1.2fr) minmax(0, 1.8fr); gap: var(--admin-space-3); }
+.measure-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: var(--admin-space-3); }
+.label-row { padding-top: var(--admin-space-3); border-top: 1px solid var(--cc-border); }
+:deep(.el-select), :deep(.el-input-number), :deep(.el-date-editor) { width: 100%; }
+@media (max-width: 760px) { .transport-grid, .label-grid, .measure-grid { grid-template-columns: 1fr; } }
+</style>
diff --git a/src/modules/overseas-business/contract.test.ts b/src/modules/overseas-business/contract.test.ts
index 55d60820..ff61663b 100644
--- a/src/modules/overseas-business/contract.test.ts
+++ b/src/modules/overseas-business/contract.test.ts
@@ -14,14 +14,14 @@ describe('overseas business real contract pages', () => {
     expect(`${purchase}${transport}`).not.toMatch(/OPO\d|TK\d|LB\d/)
   })
 
-  it('loads procurement candidates, operations and three-state PATCH fields', () => {
+  it('keeps procurement general editing limited to internal remarks', () => {
     const list = read('pages/PurchaseOrdersView.vue'); const detail = read('pages/PurchaseOrderDetailView.vue'); const edit = read('pages/PurchaseOrderEditView.vue')
     expect(list).toContain('listOverseasPurchaseCustomerOptions')
-    expect(edit).toContain('listOverseasPurchaseWarehouseOptions')
-    expect(detail).toContain('detail?.histories || []')
+    expect(edit).toContain('getOverseasPurchaseEditor')
+    expect(detail).toContain('detail.reviewHistory')
     expect(detail).not.toContain('outbounds')
-    expect(edit).toContain('estimatedArrivalAt: form.estimatedArrivalAt || null')
-    expect(edit).toContain('purchaseWarehouseId: form.purchaseWarehouseId || null')
+    expect(edit).toContain('remark: form.remark.trim() || null')
+    expect(edit).not.toMatch(/v-model="form\.(inboundQuantity|purchaseWarehouseId|outboundDetails|productName)/)
     expect(edit).not.toContain('入库量不能小于 0')
     expect(edit).not.toMatch(/payload[^\n]*(outboundQuantity|status):/)
   })
diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index 38939f20..bc6163fb 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -1,3 +1,4 @@
+import AppDialog from '@/shared/components/AppDialog.vue'
 import ElementPlus from 'element-plus'
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
@@ -8,13 +9,13 @@ import { ApiResponseError } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import { listPlatformTenants } from '@/modules/iam'
-import AppDialog from '@/shared/components/AppDialog.vue'
+import type { PlatformProcurement } from '../procurementTypes'
 import type { FleetArrangement } from '../fleetArrangement'
-import type { LocalLooseboardDetail, LocalLooseboardOrder, LocalTransportDetail, LocalTransportOrder, OverseasPurchaseDetail } from '../types'
+import type { LocalLooseboardDetail, LocalLooseboardOrder, LocalTransportDetail, LocalTransportOrder } from '../types'
 import {
-  createOverseasPurchaseFee, uploadOverseasPurchaseFile, createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getUsTruckOrder,
+  createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getOverseasPurchaseEditor, getUsTruckOrder,
   listLocalLooseboardOrders, listOverseasPurchaseCustomerOptions, listOverseasPurchaseWarehouseOptions,
-  listOverseasPurchases, listUsTruckOrders, reviewOverseasPurchase, updateLocalLooseboardOrder, updateOverseasPurchase, updateUsTruckOrder,
+  listOverseasPurchases, listUsTruckOrders, updateLocalLooseboardOrder, updateOverseasPurchase, updateUsTruckOrder,
 } from '../api/platformOverseasBusiness'
 import PurchaseOrdersView from './PurchaseOrdersView.vue'
 import PurchaseOrderDetailView from './PurchaseOrderDetailView.vue'
@@ -29,7 +30,7 @@ const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: {} as Record
 vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
 vi.mock('../api/platformOverseasBusiness', () => ({
-  listOverseasPurchases: vi.fn(), getOverseasPurchase: vi.fn(), updateOverseasPurchase: vi.fn(), reviewOverseasPurchase: vi.fn(), uploadOverseasPurchaseFile: vi.fn(), createOverseasPurchaseFee: vi.fn(), listOverseasPurchaseCustomerOptions: vi.fn(), listOverseasPurchaseWarehouseOptions: vi.fn(),
+  listOverseasPurchases: vi.fn(), getOverseasPurchase: vi.fn(), getOverseasPurchaseEditor: vi.fn(), updateOverseasPurchase: vi.fn(), listOverseasPurchaseCustomerOptions: vi.fn(), listOverseasPurchaseWarehouseOptions: vi.fn(),
   listUsTruckOrders: vi.fn(), getUsTruckOrder: vi.fn(), createUsTruckOrder: vi.fn(), updateUsTruckOrder: vi.fn(),
   listLocalLooseboardOrders: vi.fn(), getLocalLooseboardOrder: vi.fn(), createLocalLooseboardOrder: vi.fn(), updateLocalLooseboardOrder: vi.fn(),
 }))
@@ -38,20 +39,24 @@ vi.mock('@/core/unsaved-work/useUnsavedWorkRegistration', () => ({ useUnsavedWor
 class ResizeObserverStub implements ResizeObserver { observe() {} unobserve() {} disconnect() {} }
 function memoryStorage(): Storage { const values = new Map<string, string>(); return { get length() { return values.size }, clear: () => values.clear(), getItem: (key) => values.get(key) ?? null, key: (index) => [...values.keys()][index] ?? null, removeItem: (key) => values.delete(key), setItem: (key, value) => values.set(key, value) } }
 
-const purchase: OverseasPurchaseDetail = {
+const purchase = {
   id: '9007199254740993', orderNo: 'OP-100', customerId: '10001', customerName: '客户甲', purchaseCategory: '家居', productName: '置物架', productSpecification: '黑色', productUrl: 'https://example.test/product',
-  purchaseQuantity: 20, budgetUnitPrice: '12.50', currency: 'USD', purchaseWarehouseId: '20001', purchaseWarehouseName: '洛杉矶采购仓', inboundQuantity: 10, outboundQuantity: 0, inventoryQuantity: 10, status: 'PENDING_OUTBOUND', version: 3,
-  createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-02T10:00:00', receivingAddress: 'LA', contactName: 'Alice', contactPhone: '10086', domesticCarrier: null, domesticTrackingNo: null,
-  overseasCarrier: 'UPS', overseasTrackingNo: 'UPS-1', estimatedArrivalAt: '2026-08-25T12:00:00', remark: '采购备注', createdBy: '7', reviewedBy: '8', reviewRemark: null, reviewedAt: '2026-08-02T09:00:00',
-  histories: [{ operationType: 'UPDATE', fromStatus: 'APPROVED', toStatus: 'APPROVED', operatorId: 'INTERNAL-OPERATOR-7', changeDetail: '{"remark":"采购备注"}', remark: null, createdAt: '2026-08-02T10:00:00' }], files: [], fees: [],
+  purchaseQuantity: 20, budgetUnitPrice: '12.50', currency: 'USD', purchaseWarehouseId: '20001', purchaseWarehouseName: '洛杉矶采购仓', status: 'WAIT_PACKING' as const, version: 3,
+  createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-02T10:00:00', receivingAddress: 'LA', contactName: 'Alice', contactPhone: '10086',
+  estimatedArrivalAt: '2026-08-25T12:00:00', remark: '采购备注', createdBy: '7', reviewedBy: '8', reviewRemark: null, reviewedAt: '2026-08-02T09:00:00',
+  histories: [{ operationType: 'UPDATE', fromStatus: 'WAIT_PURCHASE', toStatus: 'WAIT_PURCHASE', operatorId: 'INTERNAL-OPERATOR-7', changeDetail: '{"remark":"采购备注"}', remark: null, createdAt: '2026-08-02T10:00:00' }], files: [], fees: [],
 }
+const procurementDetail = (): PlatformProcurement => ({
+  customerView: { order: { ...purchase, status: 'WAIT_PURCHASE', plannedWarehouseName: '洛杉矶采购仓', actualWarehouseCode: null, actualWarehouseName: null, receivingAddress: '深圳收件地址', contactName: 'Alice', contactPhone: '13800000000' }, budget: { totalAmount: '250.00', currency: 'USD', authorizedAt: null }, purchased: false, purchaseConfirmed: false, purchaseNeedsAttention: false, progress: [{ key: 'CREATED', title: '客户下单', completedAt: purchase.createdAt }], boxes: [], shipments: [], fees: [], exceptionSummaries: [] },
+  purchaseFacts: {}, physical: { dispositions: [], receipts: [], packingVersion: null, packingStatus: null, cartons: [] }, transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], reviewHistory: purchase.histories, operations: [], actions: [], internalRemark: '采购备注',
+})
 const truck: LocalTransportOrder = { fleetArrangement: null, id: '9007199254740995', customerId: '10002', orderNo: 'TK-200', transportType: 'PORT_PICKUP', origin: 'Long Beach', destination: 'Ontario', containerType: '40HQ', palletCount: 2, packageCount: 20, receivedPalletCount: 0, allocatedPalletCount: 0, shippedPalletCount: 0, totalWeightKg: '1200.000', totalVolumeCbm: '16.500', budgetAmount: '850.00', currency: 'USD', contactName: 'Bob', contactInfo: '10010', requestedDate: '2026-08-28', status: 'PENDING_REVIEW', version: 1, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-02T10:00:00' }
 const truckDetail: LocalTransportDetail = { ...truck, originAddress: 'Pier A', destinationAddress: 'Warehouse B', remark: null, createdBy: '7', pallets: [], histories: [] }
 const looseboard: LocalLooseboardOrder = { fleetArrangement: null, id: '9007199254740997', customerId: '10003', orderNo: 'LB-300', transportMode: 'SHARED_TRUCK', palletRequired: 'YES', transportType: 'WAREHOUSE_TO_WAREHOUSE', origin: 'LA', destination: 'ONT', containerType: '40HQ', packageCount: 8, totalWeightKg: '80.5', totalVolumeCbm: '3.2', budgetAmount: '50.00', currency: 'USD', contactName: null, contactInfo: null, requestedDate: null, status: 'PENDING_ACCEPTANCE', version: 0, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-01T10:00:00' }
 const looseboardDetail: LocalLooseboardDetail = { ...looseboard, originAddress: null, destinationAddress: null, remark: null, createdBy: '7', histories: [] }
 const arrangement: FleetArrangement = { sourceType: 'FLEET_CAPACITY_OFFER', businessType: 'US_TRUCK', businessOrderNo: 'TR-200', bookingNo: 'FB-TEST', tripNo: 'TRIP-TEST', plannedDepartureAt: null, originWarehouseName: '我仓', destinationLabel: 'ONT8', deliveryMode: 'SELF_DELIVERY', deliveryInstructions: null, fulfillmentStage: 'WAITING_INBOUND', stageOccurredAt: null, agreedFreightAmount: null, currency: 'USD', incomingNo: null, dispatchNo: null, deliveryNo: null, signedPackages: null, unsignedPackages: null, returnedPackages: null, exceptionSummary: null, readOnlyReason: '池来源订单按实际运输履约推进' }
 
-function activatePermissions() { const pinia = createPinia(); setActivePinia(pinia); const auth = useAuthStore(); auth.token = 'test-token'; auth.permissions = ['platform:overseas-business:purchase:list', 'platform:overseas-business:purchase:edit', 'platform:overseas-business:purchase:review', 'platform:overseas-business:truck:list', 'platform:overseas-business:truck:create', 'platform:overseas-business:truck:edit', 'platform:overseas-business:looseboard:list', 'platform:overseas-business:looseboard:create', 'platform:overseas-business:looseboard:edit']; useAccessPreviewStore().initializeAfterLogin(); return pinia }
+function activatePermissions() { const pinia = createPinia(); setActivePinia(pinia); const auth = useAuthStore(); auth.token = 'test-token'; auth.user = { id: '7', name: '测试操作员', account: 'tester', roles: [] }; auth.permissions = ['platform:overseas-business:purchase:list', 'platform:overseas-business:purchase:edit', 'platform:overseas-business:purchase:review', 'platform:overseas-business:truck:list', 'platform:overseas-business:truck:create', 'platform:overseas-business:truck:edit', 'platform:overseas-business:looseboard:list', 'platform:overseas-business:looseboard:create', 'platform:overseas-business:looseboard:edit']; useAccessPreviewStore().initializeAfterLogin(); return pinia }
 function mountPage(component: Parameters<typeof mount>[0], props?: Record<string, unknown>) { const pinia = activatePermissions(); return mount(component, { attachTo: document.body, props, global: { plugins: [pinia, ElementPlus] } }) }
 enableAutoUnmount(afterEach); afterAll(() => vi.unstubAllGlobals())
 
@@ -59,7 +64,8 @@ describe('overseas business mounted pages', () => {
   beforeEach(() => {
     vi.stubGlobal('ResizeObserver', ResizeObserverStub); vi.stubGlobal('localStorage', memoryStorage()); vi.stubGlobal('sessionStorage', memoryStorage()); document.body.innerHTML = ''
     routing.push.mockReset(); routing.route.params = {}; routing.route.query = {}
-    vi.mocked(listOverseasPurchases).mockReset().mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getOverseasPurchase).mockReset().mockResolvedValue(purchase); vi.mocked(updateOverseasPurchase).mockReset().mockResolvedValue({ ...purchase, version: 4 }); vi.mocked(reviewOverseasPurchase).mockReset().mockResolvedValue({ ...purchase, status: 'APPROVED', version: 4 })
+    vi.mocked(listOverseasPurchases).mockReset().mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getOverseasPurchase).mockReset().mockResolvedValue(procurementDetail()); vi.mocked(updateOverseasPurchase).mockReset().mockResolvedValue({ ...purchase, version: 4 })
+    vi.mocked(getOverseasPurchaseEditor).mockReset().mockResolvedValue({ customerView: { order: { orderNo: purchase.orderNo, customerId: purchase.customerId, productName: purchase.productName, purchaseQuantity: purchase.purchaseQuantity, version: purchase.version } }, internalRemark: purchase.remark })
     vi.mocked(listOverseasPurchaseCustomerOptions).mockReset().mockResolvedValue([{ customerId: '10001', customerName: '客户甲' }]); vi.mocked(listOverseasPurchaseWarehouseOptions).mockReset().mockResolvedValue([{ warehouseId: '20001', warehouseCode: 'LAX', warehouseName: '洛杉矶采购仓', countryCode: 'US' }])
     vi.mocked(listUsTruckOrders).mockReset().mockResolvedValue({ records: [truck], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getUsTruckOrder).mockReset().mockResolvedValue(truckDetail); vi.mocked(createUsTruckOrder).mockReset().mockResolvedValue(truckDetail); vi.mocked(updateUsTruckOrder).mockReset().mockResolvedValue(truckDetail)
     vi.mocked(listLocalLooseboardOrders).mockReset().mockResolvedValue({ records: [looseboard], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getLocalLooseboardOrder).mockReset().mockResolvedValue(looseboardDetail); vi.mocked(createLocalLooseboardOrder).mockReset().mockResolvedValue(looseboardDetail); vi.mocked(updateLocalLooseboardOrder).mockReset().mockResolvedValue(looseboardDetail)
@@ -150,46 +156,79 @@ describe('overseas business mounted pages', () => {
     await flushPromises()
     expect(wrapper.get('.density-detail-title').text()).toBe('OP-100')
     expect(wrapper.get('[aria-label="采购订单概览"]').text()).toContain('洛杉矶采购仓')
-    expect(wrapper.findAll('.density-fields')).toHaveLength(4)
-    expect(wrapper.findAll('.density-fields dt')).toHaveLength(23)
-    expect(wrapper.findAll('.density-fields .wide')).toHaveLength(4)
+    expect(wrapper.findAll('.density-fields')).toHaveLength(3)
+    expect(wrapper.text()).toContain('预算单价')
+    expect(wrapper.text()).toContain('两段实际交寄')
+    expect(wrapper.text()).not.toContain('库存信息')
+    expect(wrapper.findAll('.density-fields .wide')).toHaveLength(2)
     expect(wrapper.text()).not.toContain('internal-purchase-route')
     await wrapper.get('.density-back').trigger('click')
     expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-purchases' })
   })
 
-  it('retains the voucher upload and fee dialog workflow with teleported density', async () => {
+  it('renders estimate holds separately from actual payment without claiming inbound settlement', async () => {
     routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
-    const voucher = { id: 'voucher-1', fileId: 'file-1', fileName: 'voucher.pdf', category: 'VOUCHER' as const, contentType: 'application/pdf', sizeBytes: 3, createdAt: '2026-09-14T10:00:00' }
-    vi.mocked(uploadOverseasPurchaseFile).mockReset().mockResolvedValue(voucher)
-    vi.mocked(createOverseasPurchaseFee).mockReset().mockResolvedValue({ id: 'fee-1', feeNo: 'FEE-1', feeItemCode: 'COURIER', feeItemName: '快递费', amount: '25', currency: 'CNY', voucherFileId: 'file-1', voucherFileName: 'voucher.pdf', remark: null, walletStatus: 'FREEZE_PENDING', walletErrorMessage: null, createdAt: '2026-09-14T10:00:00' })
-    const wrapper = mountPage(PurchaseOrderDetailView)
-    await flushPromises()
-    const input = wrapper.findAll('input[type="file"]')[1]!
-    const file = new File(['pdf'], 'voucher.pdf', { type: 'application/pdf' })
-    Object.defineProperty(input.element, 'files', { value: [file], configurable: true })
-    await input.trigger('change'); await flushPromises()
-    expect(uploadOverseasPurchaseFile).toHaveBeenCalledWith('OP-100', '10001', 'VOUCHER', file)
-    const dialog = wrapper.findAllComponents(AppDialog)[1]!
-    expect(dialog.props('modelValue')).toBe(true)
-    expect(document.querySelector('.admin-density-dialog .density-form')).not.toBeNull()
-    dialog.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 25)
-    await wrapper.vm.$nextTick()
-    dialog.vm.$emit('confirm'); await flushPromises()
-    expect(createOverseasPurchaseFee).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ amount: 25, voucherFileId: 'file-1' }))
-    expect(dialog.props('modelValue')).toBe(false)
+    const result = procurementDetail()
+    result.customerView.fees = [{ feeNo: 'FEE-1', purpose: 'INTERNATIONAL_ESTIMATE', name: '国际运费预估', version: 1, active: true, determination: 'POSITIVE', amount: '25.00', currency: 'CNY', originalAmount: '25.00', originalCurrency: 'CNY', exchangeRate: '1', exchangeRateMonth: '2026-10', businessDate: '2026-10-09', parentFeeNo: null, walletStatus: 'FROZEN', sourceLinked: false }]
+    vi.mocked(getOverseasPurchase).mockResolvedValue(result)
+    const wrapper = mountPage(PurchaseOrderDetailView); await flushPromises()
+    expect(wrapper.text()).toContain('已冻结，未扣款')
+    expect(wrapper.text()).toContain('预估不入池')
+    expect(wrapper.text()).not.toContain('订单全部入库后结算')
   })
 
-  it('mounts procurement list with customer candidates and real data', async () => { const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchaseCustomerOptions).toHaveBeenCalled(); expect(listOverseasPurchases).toHaveBeenCalledWith({ page: 1, size: 20, customerId: '', orderNo: '', purchaseCategory: '', productName: '' }); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).toContain('待出库'); expect(wrapper.text()).toContain('2026-08-01 10:00') })
+  it('mounts procurement list with customer candidates and real data', async () => { const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchaseCustomerOptions).toHaveBeenCalled(); expect(listOverseasPurchases).toHaveBeenCalledWith({ page: 1, size: 20, customerId: '', orderNo: '', purchaseCategory: '', productName: '', status: '' }); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).toContain('待装箱'); expect(wrapper.text()).toContain('2026-08-01 10:00') })
   it('refreshes the cached procurement list after returning from detail or edit', () => { expect(purchaseListSource).toContain('onActivated'); expect(purchaseListSource).toMatch(/onActivated\(\(\) => \{ if \(activatedOnce\) void load\(\)/) })
   it('refreshes the cached procurement detail after an edit completes', () => { expect(purchaseDetailSource).toContain('onActivated'); expect(purchaseDetailSource).toMatch(/onActivated\(\(\) => \{ if \(activatedOnce\) void load\(\)/) })
   it('paginates procurement results', async () => { vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 40, pages: 2 }); const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); await wrapper.find('button[aria-label="第 2 页"]').trigger('click'); await flushPromises(); expect(listOverseasPurchases).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2 })) })
   it('renders procurement empty and traceable 403 states', async () => { vi.mocked(listOverseasPurchases).mockResolvedValueOnce({ records: [], page: 1, size: 20, total: 0, pages: 0 }); let wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(wrapper.text()).toContain('暂无符合筛选条件的海外采购订单'); wrapper.unmount(); vi.mocked(listOverseasPurchases).mockRejectedValue(new ApiResponseError('forbidden', 'A0403', 403, null, 'REQ-403')); wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(wrapper.text()).toContain('当前账号无权访问该数据'); expect(wrapper.text()).toContain('REQ-403') })
   it('mounts procurement detail operation history without exposing internal operator ids', async () => { routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; const wrapper = mountPage(PurchaseOrderDetailView); await flushPromises(); expect(getOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001'); expect(wrapper.text()).toContain('操作流水'); expect(wrapper.text()).toContain('编辑'); expect(wrapper.text()).not.toContain('INTERNAL-OPERATOR-7') })
-  it('reviews a pending procurement from its detail page', async () => { const pending = { ...purchase, status: 'PENDING_REVIEW' as const, inboundQuantity: 0, inventoryQuantity: 0, version: 2 }; routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(getOverseasPurchase).mockResolvedValue(pending); vi.mocked(reviewOverseasPurchase).mockResolvedValue({ ...pending, status: 'APPROVED', version: 3 }); const wrapper = mountPage(PurchaseOrderDetailView); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('通过'))?.trigger('click'); await wrapper.vm.$nextTick(); const reviewDialog = wrapper.findAllComponents(AppDialog)[0]; expect(reviewDialog.props('modelValue')).toBe(true); reviewDialog.vm.$emit('confirm'); await flushPromises(); expect(reviewOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ version: 2, decision: 'APPROVE', idempotencyKey: expect.any(String) })); expect(wrapper.text()).toContain('已通过'); expect(wrapper.find('.header-actions').exists()).toBe(false); expect(wrapper.get('.density-back').text()).toBe('返回列表') })
-  it('submits procurement explicit null clears and keeps a 409 visible without local overwrite', async () => { routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(updateOverseasPurchase).mockRejectedValue(new ApiResponseError('订单版本冲突，请刷新后重试', 'B0409', 409)); const wrapper = mountPage(PurchaseOrderEditView); await flushPromises(); const productUrl = wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('商品链接'))!.find('input'); const domesticCarrier = wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('国内承运商'))!.find('input'); await productUrl.setValue(''); await domesticCarrier.setValue(''); wrapper.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', null); wrapper.findComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', null); await wrapper.vm.$nextTick(); await wrapper.findAll('button').find((button) => button.text().trim() === '保存')?.trigger('click'); await flushPromises(); expect(updateOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ version: 3, productUrl: null, domesticCarrier: null, estimatedArrivalAt: null, purchaseWarehouseId: null })); expect(document.body.textContent).toContain('订单版本冲突，请刷新后重试'); expect((productUrl.element as HTMLInputElement).value).toBe(''); expect((domesticCarrier.element as HTMLInputElement).value).toBe(''); expect(routing.push).not.toHaveBeenCalled() })
+
+  it('submits only the internal remark and preserves input after a version conflict', async () => {
+    routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
+    vi.mocked(updateOverseasPurchase).mockRejectedValue(new ApiResponseError('订单版本冲突，请刷新后重试', 'B0409', 409))
+    const wrapper = mountPage(PurchaseOrderEditView); await flushPromises()
+    await wrapper.find('textarea').setValue('新备注')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '保存')!.trigger('click'); await flushPromises()
+    expect(updateOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', { version: 3, remark: '新备注' })
+    expect(document.body.textContent).toContain('订单版本冲突，请刷新后重试')
+    expect((wrapper.find('textarea').element as HTMLTextAreaElement).value).toBe('新备注')
+    expect(routing.push).not.toHaveBeenCalled()
+  })
   it('keeps procurement list usable when customer candidates fail', async () => { vi.mocked(listOverseasPurchaseCustomerOptions).mockRejectedValue(new Error('candidate unavailable')); const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchases).toHaveBeenCalled(); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).not.toContain('candidate unavailable') })
-  it('loads procurement edit data but blocks unsafe warehouse selection when candidates fail', async () => { routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(listOverseasPurchaseWarehouseOptions).mockRejectedValue(new Error('candidate unavailable')); const wrapper = mountPage(PurchaseOrderEditView); await flushPromises(); expect(getOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001'); expect(wrapper.text()).toContain('采购仓候选加载失败'); expect(wrapper.text()).toContain('OP-100') })
+  it('blocks saving until the aggregate context has loaded successfully', async () => {
+    routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
+    vi.mocked(getOverseasPurchaseEditor).mockRejectedValue(new Error('unavailable'))
+    const wrapper = mountPage(PurchaseOrderEditView); await flushPromises()
+    expect(wrapper.text()).toContain('采购订单暂时无法编辑')
+    expect(wrapper.find('textarea').exists()).toBe(false)
+    expect(updateOverseasPurchase).not.toHaveBeenCalled()
+  })
+
+  it('sends only one remark mutation while a save is pending', async () => {
+    routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
+    let complete!: (result: Awaited<ReturnType<typeof updateOverseasPurchase>>) => void
+    vi.mocked(updateOverseasPurchase).mockImplementation(() => new Promise(resolve => { complete = resolve }))
+    const wrapper = mountPage(PurchaseOrderEditView); await flushPromises()
+    const button = wrapper.findAll('button').find((item) => item.text().trim() === '保存')!
+    await button.trigger('click'); await button.trigger('click')
+    expect(updateOverseasPurchase).toHaveBeenCalledTimes(1)
+    complete({ ...purchase, version: 4 }); await flushPromises()
+    expect(routing.push).toHaveBeenCalledTimes(1)
+  })
+
+  it('loads one aggregate editor request without warehouse queries and explicitly clears a remark', async () => {
+    routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
+    const wrapper = mountPage(PurchaseOrderEditView); await flushPromises()
+    expect(getOverseasPurchaseEditor).toHaveBeenCalledTimes(1)
+    expect(listOverseasPurchaseWarehouseOptions).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain('OP-100')
+    expect(wrapper.text()).not.toContain('出库明细')
+    await wrapper.find('textarea').setValue('')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '保存')!.trigger('click'); await flushPromises()
+    expect(updateOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', { version: 3, remark: null })
+    expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-purchase-detail', params: { purchaseId: 'OP-100' }, query: { customerId: '10001' } })
+  })
   it('mounts truck list with enabled create and supported types', async () => { const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises(); expect(listUsTruckOrders).toHaveBeenCalled(); expect(wrapper.text()).toContain('TK-200'); expect(wrapper.text()).toContain('港口提柜'); expect(wrapper.text()).toContain('2026-08-01 10:00'); expect(wrapper.findAll('button').find((button) => button.text().includes('新增订单'))?.attributes('disabled')).toBeUndefined() })
   it('renders truck load failure without samples', async () => { vi.mocked(listUsTruckOrders).mockRejectedValue(new Error('hidden')); const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises(); expect(wrapper.text()).toContain('本土卡车订单加载失败'); expect(wrapper.text()).not.toContain('TK-200') })
   it('loads and submits pending-review truck edit', async () => { routing.route.params = { orderId: 'TK-200' }; routing.route.query = { customerId: '10002' }; const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(getUsTruckOrder).toHaveBeenCalledWith('TK-200', '10002'); expect(updateUsTruckOrder).toHaveBeenCalledWith('TK-200', '10002', expect.objectContaining({ version: 1, transportType: 'PORT_PICKUP', palletCount: 2 })) })
diff --git a/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue b/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
index f6745f59..75e43af1 100644
--- a/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
+++ b/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
@@ -1,136 +1,187 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { computed, onActivated, reactive, ref, watch } from 'vue'
+import { computed, onActivated, onBeforeUnmount, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { ArrowLeft, Check, Upload, X } from '@lucide/vue'
-import { ElMessage } from 'element-plus'
+import { ArrowLeft } from '@lucide/vue'
+import { useAuthStore } from '@/core/auth/auth'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
-import AppDialog from '@/shared/components/AppDialog.vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { createOverseasPurchaseFee, getOverseasPurchase, reviewOverseasPurchase, uploadOverseasPurchaseFile } from '../api/platformOverseasBusiness'
+import { getOverseasPurchase } from '../api/platformOverseasBusiness'
+import { downloadProcurementFile } from '../api/procurementCommands'
+import ProcurementNodeActions from '../components/ProcurementNodeActions.vue'
+import { remainingLabels, decisionLabels } from '../procurementControlForm'
 import { overseasBusinessPermissions } from '../permissions'
-import type { OverseasBusinessHistory, OverseasPurchaseDetail, OverseasPurchaseFile, OverseasPurchaseFee, OverseasPurchaseStatus } from '../types'
+import { statusLabel, money, dateTime, text, measurement, feeStatus, feePurposes } from '../procurementPresentation'
+import type { PlatformProcurement, ProcurementFile, ProcurementFee, ProcurementReceipt, ProcurementCarton, ProcurementShipment } from '../procurementTypes'
 
-const route = useRoute(); const router = useRouter()
-const access = useAccessPreviewStore()
+const route = useRoute(); const router = useRouter(); const auth = useAuthStore(); const access = useAccessPreviewStore()
 const purchaseId = computed(() => typeof route.params.purchaseId === 'string' ? route.params.purchaseId : '')
 const customerId = computed(() => typeof route.query.customerId === 'string' ? route.query.customerId : '')
-const detail = ref<OverseasPurchaseDetail | null>(null); const loading = ref(false); const loadError = ref<ApiErrorDetails | null>(null)
-const statusLabels: Record<OverseasPurchaseStatus, string> = { PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_OUTBOUND: '待出库', PARTIALLY_OUTBOUND: '部分出库', OUTBOUNDED: '全部出库' }
-const productFields = computed(() => [['客户名称', detail.value?.customerName], ['采购仓库', detail.value?.purchaseWarehouseName], ['采购品类', detail.value?.purchaseCategory], ['商品名称', detail.value?.productName], ['商品规格', detail.value?.productSpecification], ['商品链接', detail.value?.productUrl]] as const)
-const stockFields = computed(() => [['入库量', detail.value?.inboundQuantity], ['出库量', detail.value?.outboundQuantity], ['库存量', detail.value?.inventoryQuantity], ['库存状态', detail.value ? (detail.value.inventoryQuantity > 0 ? '在库' : '无库存') : null]] as const)
-const orderFields = computed(() => [['订单编号', detail.value?.orderNo], ['采购数量', detail.value?.purchaseQuantity], ['预算单价', detail.value ? formatAmount(detail.value.budgetUnitPrice, detail.value.currency) : null], ['订单状态', detail.value ? statusLabels[detail.value.status] : null], ['联系人', detail.value?.contactName], ['联系电话', detail.value?.contactPhone], ['收货地址', detail.value?.receivingAddress], ['订单备注', detail.value?.remark]] as const)
-const courierFields = computed(() => [['国内承运商', detail.value?.domesticCarrier], ['国内运单号', detail.value?.domesticTrackingNo], ['海外承运商', detail.value?.overseasCarrier], ['海外运单号', detail.value?.overseasTrackingNo], ['预计到达时间', formatDateTime(detail.value?.estimatedArrivalAt)]] as const)
-const outboundDetails = computed(() => detail.value?.outboundDetails || [])
-const receiptInput = ref<HTMLInputElement | null>(null); const voucherInput = ref<HTMLInputElement | null>(null)
-const uploading = ref(false); const feeDialogOpen = ref(false); const savingFee = ref(false); const voucher = ref<OverseasPurchaseFile | null>(null)
-const feeForm = reactive({ feeItemCode: 'COURIER', feeItemName: '快递费', amount: 0, remark: '' })
-const reviewDialogOpen = ref(false); const reviewing = ref(false); const reviewDecision = ref<'APPROVE' | 'REJECT'>('APPROVE'); const reviewRemark = ref(''); const reviewKey = ref('')
-const fileColumns: DataTableColumn[] = [{ key: 'category', label: '类型', width: 100, formatter: (row: OverseasPurchaseFile) => row.category === 'RECEIPT' ? '签收文件' : '费用凭证' }, { key: 'fileName', prop: 'fileName', label: '文件名', minWidth: 220 }, { key: 'createdAt', label: '上传时间', minWidth: 155, formatter: (row: OverseasPurchaseFile) => formatDateTime(row.createdAt) }]
-const feeColumns: DataTableColumn[] = [{ key: 'feeNo', prop: 'feeNo', label: '费用编号', minWidth: 170 }, { key: 'feeItemName', prop: 'feeItemName', label: '费用项', minWidth: 120 }, { key: 'amount', label: '金额', width: 120, formatter: (row: OverseasPurchaseFee) => formatAmount(row.amount, row.currency) }, { key: 'voucherFileName', prop: 'voucherFileName', label: '凭证', minWidth: 180 }, { key: 'walletStatus', label: '资金状态', minWidth: 130, formatter: (row: OverseasPurchaseFee) => walletStatus(row.walletStatus) }, { key: 'walletErrorMessage', label: '异常说明', minWidth: 180, formatter: (row: OverseasPurchaseFee) => row.walletErrorMessage || '—' }]
-const historyColumns: DataTableColumn[] = [
-  { key: 'createdAt', label: '时间', minWidth: 155, formatter: (row: OverseasBusinessHistory) => formatDateTime(row.createdAt) },
-  { key: 'operationType', label: '操作类型', width: 110, formatter: (row: OverseasBusinessHistory) => operationLabels[row.operationType || ''] || row.operationType || '—' },
-  { key: 'status', label: '状态变化', minWidth: 150, formatter: (row: OverseasBusinessHistory) => row.fromStatus ? `${statusLabel(row.fromStatus)} → ${statusLabel(row.toStatus)}` : statusLabel(row.toStatus) },
-  { key: 'changeDetail', prop: 'changeDetail', label: '变更明细', minWidth: 260 },
-  { key: 'operator', label: '操作人', minWidth: 120, formatter: () => '—' },
-  { key: 'remark', prop: 'remark', label: '备注', minWidth: 180 },
+const detail = ref<PlatformProcurement | null>(null); const loading = ref(false)
+const loadError = ref<ApiErrorDetails | null>(null); const operationError = ref<ApiErrorDetails | null>(null)
+const downloading = ref<string | null>(null)
+const order = computed(() => detail.value?.customerView.order)
+const fields = computed(() => [
+  ['采购品类', order.value?.purchaseCategory], ['商品名称', order.value?.productName], ['商品规格', order.value?.productSpecification], ['采购数量', order.value?.purchaseQuantity],
+  ['预算单价', money(order.value?.budgetUnitPrice, order.value?.currency)], ['有效预算总额', money(detail.value?.customerView.budget.totalAmount, detail.value?.customerView.budget.currency)],
+  ['预计到海外仓', dateTime(order.value?.estimatedArrivalAt)], ['实际收货仓', order.value?.actualWarehouseName],
+  ['收件人', order.value?.contactName], ['联系电话', order.value?.contactPhone], ['下单收货地址', order.value?.receivingAddress], ['内部备注', detail.value?.internalRemark],
+] as const)
+const purchaseFields = computed(() => [
+  ['实际购买时间', dateTime(detail.value?.purchaseFacts.purchased_at)], ['实购商品', detail.value?.purchaseFacts.purchased_product_name],
+  ['实购数量', detail.value?.purchaseFacts.purchased_quantity], ['原登记实付总额', money(detail.value?.purchaseFacts.purchase_amount, detail.value?.purchaseFacts.purchase_currency)],
+  ['货款核定时间', dateTime(detail.value?.purchaseFacts.purchase_confirmed_at)], ['待处理事项', detail.value?.purchaseFacts.purchase_issue],
+] as const)
+const receiptColumns: DataTableColumn[] = [
+  { key: 'receiptNo', prop: 'receiptNo', label: '实收编号', minWidth: 180 },
+  { key: 'leg', label: '收货段', width: 100, formatter: (row: ProcurementReceipt) => row.leg === 'OVERSEAS' ? '海外' : '国内' },
+  { key: 'source', label: '来源箱', minWidth: 160, formatter: (row: ProcurementReceipt) => detail.value?.physical.cartons.find(box => box.id === row.sourceCartonId)?.cartonNo || '—' },
+  { key: 'goodQuantity', prop: 'goodQuantity', label: '合格件数', width: 100 }, { key: 'damagedQuantity', prop: 'damagedQuantity', label: '破损件数', width: 100 }, { key: 'extraQuantity', prop: 'extraQuantity', label: '多货件数', width: 100 },
+  { key: 'receivedAt', label: '实收时间', minWidth: 160, formatter: (row: ProcurementReceipt) => dateTime(row.receivedAt) },
+  { key: 'active', label: '记录状态', width: 100, formatter: (row: ProcurementReceipt) => row.active ? '有效' : '已更正' },
 ]
-const operationLabels: Record<string, string> = { CREATE: '创建', REVIEW: '审核', UPDATE: '编辑' }
-function statusLabel(status?: string | null) { return status ? (statusLabels[status as OverseasPurchaseStatus] || status) : '—' }
-function display(value: unknown) { return value === null || value === undefined || value === '' ? '—' : String(value) }
-function formatDateTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 16) : '—' }
-function formatAmount(value: string | null, currency: string) { return value == null ? '—' : `${Number(value).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })} ${currency}` }
-function walletStatus(value: string) { return ({ FREEZE_PENDING: '冻结中', FROZEN: '已冻结', SETTLE_PENDING: '结算中', SETTLED: '已结算', RELEASE_PENDING: '释放中', RELEASED: '已释放', FREEZE_FAILED: '冻结失败', SETTLE_FAILED: '结算失败', RELEASE_FAILED: '释放失败' } as Record<string,string>)[value] || value }
-function idempotencyKey() { return globalThis.crypto?.randomUUID?.() || `purchase-review-${Date.now()}-${Math.random().toString(16).slice(2)}` }
-function openReview(decision: 'APPROVE' | 'REJECT') {
-  reviewDecision.value = decision; reviewRemark.value = ''; reviewKey.value = idempotencyKey(); reviewDialogOpen.value = true
+const dispositionColumns: DataTableColumn[] = [
+  { key: 'leg', label: '发生段', width: 100, formatter: (row: PlatformProcurement['physical']['dispositions'][number]) => row.leg === 'OVERSEAS' ? '海外' : '国内' },
+  { key: 'source', label: '实收或原箱来源', minWidth: 180, formatter: (row: PlatformProcurement['physical']['dispositions'][number]) => (row.receipt_id ? detail.value?.physical.receipts.find(receipt => receipt.id === row.receipt_id)?.receiptNo : row.source_carton_id ? detail.value?.physical.cartons.find(box => box.id === row.source_carton_id)?.cartonNo : order.value?.orderNo) || '—' },
+  { key: 'kind', label: '差异', width: 100, formatter: (row: PlatformProcurement['physical']['dispositions'][number]) => ({ SHORTAGE: '短少', DAMAGED: '破损', EXTRA: '多货' })[row.kind] },
+  { key: 'quantity', prop: 'quantity', label: '处置件数', width: 100 }, { key: 'reason', prop: 'reason', label: '处置依据', minWidth: 220 },
+  { key: 'active', label: '状态', width: 110, formatter: (row: PlatformProcurement['physical']['dispositions'][number]) => row.active ? '有效' : '已撤销或更正' },
+]
+const cartonColumns: DataTableColumn[] = [
+  { key: 'cartonNo', prop: 'cartonNo', label: '箱号', minWidth: 160 }, { key: 'quantity', prop: 'quantity', label: '件数', width: 85 },
+  { key: 'measurements', label: '长 × 宽 × 高（cm）', minWidth: 220, formatter: (row: ProcurementCarton) => [row.lengthCm, row.widthCm, row.heightCm].map(value => measurement(value, 2)).join(' × ') },
+  { key: 'weight', label: '毛重（kg）', width: 120, formatter: (row: ProcurementCarton) => measurement(row.grossWeightKg, 3) },
+  { key: 'sources', label: '装货来源', minWidth: 240, formatter: (row: ProcurementCarton) => row.sources.map(source => `${detail.value?.physical.receipts.find(receipt => receipt.id === source.receiptId)?.receiptNo || '未关联实收'}：${source.quantity} 件`).join('；') },
+]
+const shipmentColumns: DataTableColumn[] = [
+  { key: 'shipmentNo', prop: 'shipmentNo', label: '交寄编号', minWidth: 180 }, { key: 'leg', label: '运输段', width: 110, formatter: (row: ProcurementShipment) => row.leg === 'OVERSEAS' ? '国际交寄' : '寄客户' },
+  { key: 'cartonNo', prop: 'cartonNo', label: '箱号', minWidth: 150 }, { key: 'quantity', prop: 'quantity', label: '件数', width: 85 }, { key: 'carrier', prop: 'carrier', label: '承运商', minWidth: 100 }, { key: 'trackingNo', prop: 'trackingNo', label: '实际运单', minWidth: 180 },
+  { key: 'shippedAt', label: '交寄时间', minWidth: 160, formatter: (row: ProcurementShipment) => dateTime(row.shippedAt) },
+]
+const feeColumns: DataTableColumn[] = [
+  { key: 'feeNo', prop: 'feeNo', label: '费用编号', minWidth: 170 }, { key: 'purpose', label: '用途', minWidth: 140, formatter: (row: ProcurementFee) => feePurposes[row.purpose] || '待核对' },
+  { key: 'name', prop: 'name', label: '费用项目', minWidth: 120 }, { key: 'original', label: '原币金额', minWidth: 140, formatter: (row: ProcurementFee) => money(row.originalAmount, row.originalCurrency) },
+  { key: 'amount', label: '人民币金额', minWidth: 140, formatter: (row: ProcurementFee) => money(row.amount, row.currency) },
+  { key: 'rate', label: '汇率 / 月份', minWidth: 150, formatter: (row: ProcurementFee) => `${text(row.exchangeRate)} / ${text(row.exchangeRateMonth)}` },
+  { key: 'walletStatus', label: '资金状态', minWidth: 150, formatter: (row: ProcurementFee) => feeStatus(row) },
+  { key: 'sourceLinked', label: '费用来源关联', width: 130, formatter: (row: ProcurementFee) => row.purpose === 'INTERNATIONAL_ESTIMATE' ? '预估不入池' : row.purpose === 'REFUND' ? '退款不入应收' : ['ZERO', 'NOT_APPLICABLE'].includes(row.determination) ? '无需入池' : row.sourceLinked ? '已完成' : '待完成' },
+  { key: 'active', label: '版本状态', width: 100, formatter: (row: ProcurementFee) => row.active ? '有效' : '历史版本' },
+]
+const labelGroups = computed(() => detail.value ? [
+  { leg: 'OVERSEAS', title: '国际段', value: detail.value.transport.overseasLabels },
+  { leg: 'DOMESTIC', title: '寄客户段', value: detail.value.transport.domesticLabels },
+].filter(group => group.value) : [])
+const labelColumns: DataTableColumn[] = [
+  { key: 'cartonId', label: '原箱', minWidth: 150, formatter: (row: { cartonId: string }) => detail.value?.physical.cartons.find(box => box.id === row.cartonId)?.cartonNo || '未关联箱' },
+  { key: 'fileId', label: '面单文件', minWidth: 200, formatter: (row: { fileId: string }) => detail.value?.files.find(file => file.fileId === row.fileId)?.fileName || '未关联文件' },
+  { key: 'page', prop: 'page', label: '页码', width: 75 }, { key: 'carrier', prop: 'carrier', label: '承运商', minWidth: 120 }, { key: 'trackingNo', prop: 'trackingNo', label: '运单号', minWidth: 180 },
+  { key: 'appliedAt', label: '实际贴单时间', minWidth: 160, formatter: (row: { appliedAt: string | null }) => dateTime(row.appliedAt) },
+]
+const fileLabels: Record<string, string> = { PURCHASE: '购买凭证', BUDGET: '预算授权', LABEL: '快递面单', EXCEPTION: '异常证据', RECEIPT: '收货凭证', VOUCHER: '费用凭证' }
+const noteColumns: DataTableColumn[] = [
+  { key: 'note_no', prop: 'note_no', label: '说明编号', minWidth: 180 },
+  { key: 'target', label: '关联事实', minWidth: 180, formatter: (row: PlatformProcurement['controls']['notes'][number]) => row.target_type === 'PURCHASE' ? order.value?.orderNo || '—' : row.target_type === 'WAREHOUSE' ? row.original_value_json?.name || '实际仓记录' : row.target_type === 'RECEIPT' ? detail.value?.physical.receipts.find(item => item.id === row.target_id)?.receiptNo || '未关联实收' : detail.value?.transport.shipments.find(item => item.id === row.target_id)?.shipmentNo || '未关联交寄' },
+  { key: 'reason', prop: 'reason', label: '内部事实说明', minWidth: 260 },
+  { key: 'warehouseCorrection', label: '仓库更正留痕', minWidth: 190, formatter: (row: PlatformProcurement['controls']['notes'][number]) => row.corrected_value_json ? `${row.original_value_json?.name || '—'} → ${row.corrected_value_json.warehouseName || '—'}` : '—' },
+  { key: 'block', label: '阻断状态', width: 140, formatter: (row: PlatformProcurement['controls']['notes'][number]) => !row.blocking ? '仅说明' : row.resolved_at ? '已解除阻断' : '待处理阻断' },
+  { key: 'resolution_reason', prop: 'resolution_reason', label: '解除依据', minWidth: 220 },
+  { key: 'client_summary', prop: 'client_summary', label: '客户可见摘要', minWidth: 220 },
+]
+const remainingColumns: DataTableColumn[] = [{ key: 'businessNo', prop: 'businessNo', label: '货物来源', minWidth: 180 }, { key: 'kind', label: '剩余类型', minWidth: 130, formatter: (row: PlatformProcurement['controls']['remaining'][number]) => remainingLabels[row.kind] }, { key: 'quantity', prop: 'quantity', label: '待处理件数', width: 130 }]
+const closureColumns: DataTableColumn[] = [{ key: 'closure_no', prop: 'closure_no', label: '关闭编号', minWidth: 180 }, { key: 'financial_conclusion', prop: 'financial_conclusion', label: '内部财务结论', minWidth: 250 }, { key: 'reason', prop: 'reason', label: '内部关闭原因', minWidth: 220 }, { key: 'client_summary', prop: 'client_summary', label: '客户可见摘要', minWidth: 250 }, { key: 'created_at', label: '关闭时间', minWidth: 170, formatter: (row: PlatformProcurement['controls']['closures'][number]) => dateTime(row.created_at) }]
+const closureItemColumns: DataTableColumn[] = [
+  { key: 'source', label: '处置来源', minWidth: 180, formatter: (row: PlatformProcurement['controls']['closureItems'][number]) => row.source_kind === 'PURCHASE_REMAINDER' ? order.value?.orderNo || '—' : row.source_kind === 'TRANSIT_REMAINDER' ? detail.value?.physical.cartons.find(item => item.id === row.source_id)?.cartonNo || '未关联原箱' : detail.value?.physical.receipts.find(item => item.id === row.source_id)?.receiptNo || '未关联实收' },
+  { key: 'source_kind', label: '来源类型', width: 130, formatter: (row: PlatformProcurement['controls']['closureItems'][number]) => remainingLabels[row.source_kind] },
+  { key: 'quantity', prop: 'quantity', label: '件数', width: 90 }, { key: 'decision', label: '实际处置', minWidth: 150, formatter: (row: PlatformProcurement['controls']['closureItems'][number]) => decisionLabels[row.decision] || '待核对' }, { key: 'destination', prop: 'destination', label: '实际去向与接收方', minWidth: 260 },
+]
+const correctionColumns: DataTableColumn[] = [
+  { key: 'correctionNo', prop: 'correctionNo', label: '更正编号', minWidth: 190 }, { key: 'rootFeeNo', prop: 'rootFeeNo', label: '原费用编号', minWidth: 170 },
+  { key: 'targetOriginalAmount', label: '正确原币总额', minWidth: 150, formatter: (row: PlatformProcurement['feeCorrections'][number]) => money(row.targetOriginalAmount, row.originalCurrency) },
+  { key: 'targetAmount', label: '目标人民币', minWidth: 140, formatter: (row: PlatformProcurement['feeCorrections'][number]) => money(row.targetAmount, 'CNY') },
+  { key: 'previousNetAmount', label: '更正前净实扣', minWidth: 140, formatter: (row: PlatformProcurement['feeCorrections'][number]) => money(row.previousNetAmount, 'CNY') },
+  { key: 'differenceAmount', label: '本次差额', minWidth: 140, formatter: (row: PlatformProcurement['feeCorrections'][number]) => money(row.differenceAmount, 'CNY') },
+  { key: 'feeNos', label: '关联实际费用或调整', minWidth: 240, formatter: (row: PlatformProcurement['feeCorrections'][number]) => row.feeNos.join('；') || '无资金差额' },
+]
+const fileColumns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', width: 90, fixed: 'left' }, { key: 'fileName', prop: 'fileName', label: '文件名', minWidth: 250 },
+  { key: 'category', label: '用途', width: 120, formatter: (row: ProcurementFile) => fileLabels[row.category] || '待核对' },
+  { key: 'createdAt', label: '上传时间', minWidth: 160, formatter: (row: ProcurementFile) => dateTime(row.createdAt) },
+]
+const historyColumns: DataTableColumn[] = [{ key: 'createdAt', label: '时间', minWidth: 160, formatter: (row: PlatformProcurement['reviewHistory'][number]) => dateTime(row.createdAt) }, { key: 'operation', label: '操作', width: 120, formatter: (row: PlatformProcurement['reviewHistory'][number]) => ({ CREATE: '创建', REVIEW: '审核', UPDATE: '编辑备注' } as Record<string, string>)[row.operationType || ''] || '采购变更' }, { key: 'remark', prop: 'remark', label: '说明', minWidth: 250 }]
+const commandColumns: DataTableColumn[] = [{ key: 'created_at', label: '时间', minWidth: 160, formatter: (row: PlatformProcurement['operations'][number]) => dateTime(row.created_at) }, { key: 'reason', prop: 'reason', label: '履约操作说明', minWidth: 400 }]
+let generation = 0; let inFlight: Promise<void> | null = null; let inFlightScope = ''
+const scope = computed(() => `${auth.user?.id || ''}:${customerId.value}:${purchaseId.value}`)
+onBeforeUnmount(() => { generation++ })
+function load() {
+  const currentScope = scope.value
+  if (inFlight && inFlightScope === currentScope) return inFlight
+  const current = ++generation; const number = purchaseId.value; const customer = customerId.value
+  detail.value = null; loadError.value = null; loading.value = false
+  if (!number || !customer) { loadError.value = { message: '缺少采购订单号或客户标识，请从采购订单列表重新进入' }; return Promise.resolve() }
+  loading.value = true; inFlightScope = currentScope
+  const promise = getOverseasPurchase(number, customer).then(result => { if (current === generation) detail.value = result }).catch(error => { if (current === generation) loadError.value = getApiErrorDetails(error, '采购详情加载失败') }).finally(() => {
+    if (current === generation) loading.value = false
+    if (inFlight === promise) inFlight = null
+  })
+  inFlight = promise; return promise
 }
-function closeReview() {
-  if (reviewing.value) return
-  reviewDialogOpen.value = false; reviewRemark.value = ''; reviewKey.value = ''
-}
-async function submitReview() {
-  if (!detail.value) return
-  reviewing.value = true
+async function download(fileId: unknown) {
+  const file = detail.value?.files.find(item => item.fileId === fileId)
+  if (!file || !order.value || downloading.value) return
+  downloading.value = file.fileId; operationError.value = null; const current = scope.value
   try {
-    detail.value = await reviewOverseasPurchase(detail.value.orderNo, customerId.value, {
-      version: detail.value.version,
-      decision: reviewDecision.value,
-      idempotencyKey: reviewKey.value || (reviewKey.value = idempotencyKey()),
-      remark: reviewRemark.value.trim() || undefined,
-    })
-    reviewDialogOpen.value = false; reviewRemark.value = ''; reviewKey.value = ''
-    ElMessage.success(reviewDecision.value === 'APPROVE' ? '采购订单审核已通过' : '采购订单已拒绝')
-  } catch (error) { ElMessage.error(getApiErrorDetails(error, '采购订单审核失败').message) }
-  finally { reviewing.value = false }
-}
-async function upload(category: 'RECEIPT' | 'VOUCHER', event: Event) {
-  const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''
-  if (!file || !detail.value) return
-  uploading.value = true
-  try { const saved = await uploadOverseasPurchaseFile(detail.value.orderNo, customerId.value, category, file); if (category === 'VOUCHER') { voucher.value = saved; feeDialogOpen.value = true } else { ElMessage.success('签收文件已上传'); await load() } }
-  catch (error) { ElMessage.error(getApiErrorDetails(error, '文件上传失败').message) } finally { uploading.value = false }
-}
-async function saveFee() {
-  if (!detail.value || !voucher.value || feeForm.amount <= 0 || !feeForm.feeItemName.trim()) { ElMessage.warning('请填写正确的费用名称和金额'); return }
-  savingFee.value = true
-  try { await createOverseasPurchaseFee(detail.value.orderNo, customerId.value, { feeItemCode: feeForm.feeItemCode.trim(), feeItemName: feeForm.feeItemName.trim(), amount: feeForm.amount, voucherFileId: voucher.value.fileId, remark: feeForm.remark.trim() || undefined }); feeDialogOpen.value = false; voucher.value = null; ElMessage.success('费用已登记并提交资金冻结'); await load() }
-  catch (error) { ElMessage.error(getApiErrorDetails(error, '费用登记失败').message) } finally { savingFee.value = false }
-}
-async function load() {
-  detail.value = null; loadError.value = null
-  if (!purchaseId.value || !customerId.value) { loadError.value = { message: '缺少采购订单号或客户标识，请从采购订单列表重新进入' }; return }
-  loading.value = true
-  try { detail.value = await getOverseasPurchase(purchaseId.value, customerId.value) } catch (error) { loadError.value = getApiErrorDetails(error, '海外采购订单详情加载失败') } finally { loading.value = false }
+    const blob = await downloadProcurementFile(order.value.orderNo, customerId.value, file.fileId)
+    if (scope.value !== current) return
+    const url = URL.createObjectURL(blob); const link = document.createElement('a'); link.href = url; link.download = file.fileName; link.click(); setTimeout(() => URL.revokeObjectURL(url), 1000)
+  } catch (error) { if (scope.value === current) operationError.value = getApiErrorDetails(error, '文件下载失败') }
+  finally { downloading.value = null }
 }
 let activatedOnce = false
-watch([purchaseId, customerId], () => { void load() }, { immediate: true })
+watch(scope, () => { void load() }, { immediate: true })
 onActivated(() => { if (activatedOnce) void load(); else activatedOnce = true })
 </script>
-
 <template>
-  <AdminPage class="admin-density"><DetailPageLayout class="purchase-detail" aria-label="海外采购订单详情">
-    <template #header>
-      <div class="density-detail-header">
-        <div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-business-purchases' })"><ArrowLeft :size="16" />返回列表</el-button><h1 class="density-detail-title">{{ detail?.orderNo || '—' }}</h1><StatusBadge v-if="detail" :status="statusLabels[detail.status]" /></div>
-        <div v-if="detail?.status === 'PENDING_REVIEW' && access.can(overseasBusinessPermissions.purchaseReview)" class="header-actions"><el-button type="danger" plain @click="openReview('REJECT')"><X :size="16" />拒绝</el-button><el-button type="primary" @click="openReview('APPROVE')"><Check :size="16" />通过</el-button></div>
+  <AdminPage class="admin-density"><OperationErrorToast :details="operationError" />
+    <DetailPageLayout class="purchase-detail density-detail-layout" aria-label="采购订单履约详情">
+      <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-business-purchases' })"><ArrowLeft :size="16" />返回列表</el-button><h1 class="density-detail-title">{{ order?.orderNo || '—' }}</h1><StatusBadge v-if="order" :status="statusLabel(order.status)" /></div><div class="density-actions"><el-button :loading="loading" @click="load">刷新</el-button><el-button v-if="order && access.can(overseasBusinessPermissions.purchaseEdit)" @click="router.push({ name: 'overseas-business-purchase-edit', params: { purchaseId: order.orderNo }, query: { customerId } })">编辑内部备注</el-button></div></div></template>
+      <template v-if="order" #summary><dl class="density-detail-overview" aria-label="采购订单概览"><div><dt>客户</dt><dd>{{ text(order.customerName) }}</dd></div><div><dt>计划采购仓</dt><dd>{{ text(order.plannedWarehouseName) }}</dd></div><div><dt>采购数量</dt><dd>{{ order.purchaseQuantity }}</dd></div></dl></template>
+      <LoadErrorState v-if="loadError" title="采购详情暂时无法加载" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
+      <div v-else v-loading="loading" class="detail-grid">
+        <template v-if="detail">
+          <ProcurementNodeActions :detail="detail" :customer-id="customerId" @changed="load" />
+          <section><h3>订单及预算</h3><dl class="density-fields"><div v-for="field in fields" :key="field[0]" :class="{ wide: ['下单收货地址', '内部备注'].includes(field[0]) }"><dt>{{ field[0] }}</dt><dd>{{ text(field[1]) }}</dd></div></dl></section>
+          <section><h3>购买事实</h3><dl class="density-fields"><div v-for="field in purchaseFields" :key="field[0]"><dt>{{ field[0] }}</dt><dd>{{ text(field[1]) }}</dd></div></dl></section>
+          <section><h3>履约进度</h3><dl class="density-fields"><div v-for="step in detail.customerView.progress" :key="step.key"><dt>{{ step.title }}</dt><dd>{{ step.completedAt ? dateTime(step.completedAt) : '未完成' }}</dd></div></dl></section>
+          <section><h3>分次实收记录</h3><DataTable :data="detail.physical.receipts" :columns="receiptColumns" row-key="id" empty-text="暂无实收记录" /></section>
+          <section><h3>差异处置记录</h3><DataTable :data="detail.physical.dispositions" :columns="dispositionColumns" row-key="id" empty-text="暂无差异处置" /></section>
+          <section><h3>逐箱装货清单 · {{ detail.physical.packingStatus === 'CONFIRMED' ? '已确认' : detail.physical.packingStatus === 'DRAFT' ? '草稿' : '未建立' }}<span v-if="detail.physical.packingVersion">（第 {{ detail.physical.packingVersion }} 版）</span></h3><DataTable :data="detail.physical.cartons" :columns="cartonColumns" row-key="id" empty-text="暂无箱明细" /></section>
+          <section v-if="detail.transport.domesticCargo.length"><h3>国内包装与可寄货物核对</h3><DataTable :data="detail.transport.domesticCargo" :columns="cartonColumns" row-key="cartonId" /></section>
+          <section v-for="group in labelGroups" :key="group.leg"><h3>{{ group.title }}最近保存面单 · 第 {{ group.value?.version }} 版</h3><p>包装或实收变化后须重新核对面单；是否可交寄以节点校验结果为准。</p><dl v-if="group.value" class="density-fields"><div class="wide"><dt>寄件信息</dt><dd>{{ group.value.sender.name }} · {{ group.value.sender.phone }} · {{ group.value.sender.address }}</dd></div><div class="wide"><dt>收件信息</dt><dd>{{ group.value.receiver.name }} · {{ group.value.receiver.phone }} · {{ group.value.receiver.address }}</dd></div></dl><DataTable :data="group.value?.labels || []" :columns="labelColumns" row-key="cartonId" /></section>
+          <section><h3>两段实际交寄</h3><DataTable :data="detail.customerView.shipments" :columns="shipmentColumns" empty-text="暂无实际交寄记录" /></section>
+          <section><h3>费用与资金结果</h3><p>样品货款与实际费用独立结算；预估国际运费仅冻结。资金结果和费用来源关联分别核对。</p><DataTable :data="detail.customerView.fees" :columns="feeColumns" row-key="feeNo" empty-text="暂无核定费用" /></section>
+          <section><h3>费用更正记录</h3><p>本表记录核定目标、差额及未实扣费用的替代版本；实际扣款、退款结果见费用与资金明细。</p><DataTable :data="detail.feeCorrections" :columns="correctionColumns" row-key="correctionNo" empty-text="暂无费用目标更正" /></section>
+          <section><h3>事实说明与阻断</h3><DataTable :data="detail.controls.notes" :columns="noteColumns" row-key="id" empty-text="暂无事实说明或阻断" /></section>
+          <section><h3>剩余货物去向核对</h3><DataTable :data="detail.controls.remaining" :columns="remainingColumns" empty-text="当前无待处置的剩余货物" /></section>
+          <section v-if="detail.controls.closures.length"><h3>异常关闭记录</h3><DataTable :data="detail.controls.closures" :columns="closureColumns" row-key="id" /><DataTable :data="detail.controls.closureItems" :columns="closureItemColumns" row-key="id" empty-text="关闭时无剩余实物" /></section>
+          <section><h3>本单文件</h3><DataTable :data="detail.files" :columns="fileColumns" row-key="fileId" empty-text="暂无文件"><template #actions="{ row }"><el-button class="density-action" :loading="downloading === row.fileId" :disabled="!!downloading" @click="download(row.fileId)">下载</el-button></template></DataTable></section>
+          <section><h3>操作流水</h3><DataTable :data="detail.reviewHistory" :columns="historyColumns" empty-text="暂无基础操作记录" /><DataTable :data="detail.operations" :columns="commandColumns" empty-text="暂无履约操作记录" /></section>
+        </template>
       </div>
-    </template>
-    <template v-if="detail" #summary><dl class="density-detail-overview" aria-label="采购订单概览"><div><dt>客户</dt><dd>{{ display(detail.customerName) }}</dd></div><div><dt>采购仓库</dt><dd>{{ display(detail.purchaseWarehouseName) }}</dd></div><div><dt>采购数量</dt><dd>{{ display(detail.purchaseQuantity) }}</dd></div><div><dt>入库量</dt><dd>{{ display(detail.inboundQuantity) }}</dd></div><div><dt>出库量</dt><dd>{{ display(detail.outboundQuantity) }}</dd></div><div><dt>库存量</dt><dd>{{ display(detail.inventoryQuantity) }}</dd></div></dl></template>
-    <LoadErrorState v-if="loadError" title="采购订单详情暂时无法加载" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
-    <div v-else v-loading="loading" class="detail-surface">
-      <div class="detail-grid">
-        <section><h3>商品信息</h3><dl class="density-fields"><div v-for="field in productFields" :key="field[0]" :class="{ wide: ['商品规格', '商品链接', '收货地址', '订单备注'].includes(field[0]) }"><dt>{{ field[0] }}</dt><dd>{{ display(field[1]) }}</dd></div></dl></section>
-        <section><h3>库存信息</h3><dl class="density-fields"><div v-for="field in stockFields" :key="field[0]" :class="{ wide: ['商品规格', '商品链接', '收货地址', '订单备注'].includes(field[0]) }"><dt>{{ field[0] }}</dt><dd>{{ display(field[1]) }}</dd></div></dl></section>
-        <section><h3>订单信息</h3><dl class="density-fields"><div v-for="field in orderFields" :key="field[0]" :class="{ wide: ['商品规格', '商品链接', '收货地址', '订单备注'].includes(field[0]) }"><dt>{{ field[0] }}</dt><dd>{{ display(field[1]) }}</dd></div></dl></section>
-        <section><h3>快递信息</h3><dl class="density-fields"><div v-for="field in courierFields" :key="field[0]" :class="{ wide: ['商品规格', '商品链接', '收货地址', '订单备注'].includes(field[0]) }"><dt>{{ field[0] }}</dt><dd>{{ display(field[1]) }}</dd></div></dl></section>
-        <section class="full"><div class="section-heading"><h3>出库明细</h3><span>共 {{ outboundDetails.length }} 条，出库量 {{ outboundDetails.reduce((sum, item) => sum + item.quantity, 0) }}</span></div><DataTable :data="outboundDetails" :columns="[{ key: 'quantity', label: '出库数量', width: 110 }, { key: 'carrier', label: '承运商', minWidth: 140 }, { key: 'trackingNo', label: '运单号', minWidth: 160 }, { key: 'shippedAt', label: '出库时间', minWidth: 155, formatter: (row: any) => formatDateTime(row.shippedAt) }, { key: 'remark', label: '备注', minWidth: 180 }]" row-key="id" empty-text="暂无出库明细" /></section>
-        <section class="full"><div class="section-heading"><h3>签收文件与费用凭证</h3><div v-if="access.can(overseasBusinessPermissions.purchaseEdit)" class="section-actions"><input ref="receiptInput" hidden type="file" @change="upload('RECEIPT', $event)"><input ref="voucherInput" hidden type="file" @change="upload('VOUCHER', $event)"><el-button :loading="uploading" @click="receiptInput?.click()"><Upload :size="15" />上传签收文件</el-button><el-button type="primary" :loading="uploading" :disabled="!detail || ['PENDING_REVIEW', 'REJECTED'].includes(detail.status)" @click="voucherInput?.click()"><Upload :size="15" />登记费用</el-button></div></div><DataTable :data="detail?.files || []" :columns="fileColumns" row-key="id" empty-text="暂无签收文件或费用凭证" /></section>
-        <section class="full"><div class="section-heading"><h3>费用明细</h3><span>每条费用独立冻结，订单全部入库后结算。</span></div><DataTable :data="detail?.fees || []" :columns="feeColumns" row-key="id" empty-text="暂无费用明细" /></section>
-        <section class="full"><div class="section-heading"><h3>操作流水</h3><span>展示创建、审核、入库与出库明细变更。</span></div><DataTable :data="detail?.histories || []" :columns="historyColumns" row-key="createdAt" empty-text="暂无操作流水" /></section>
-      </div>
-    </div>
-  </DetailPageLayout><AppDialog class="admin-density-dialog" v-model="reviewDialogOpen" :title="reviewDecision === 'APPROVE' ? '通过采购订单' : '拒绝采购订单'" width="min(520px, calc(100vw - 28px))" :confirm-text="reviewDecision === 'APPROVE' ? '确认通过' : '确认拒绝'" :confirm-loading="reviewing" @confirm="submitReview" @cancel="closeReview"><el-alert :title="reviewDecision === 'APPROVE' ? '通过后平台可维护采购入库、出库和费用信息。' : '拒绝后该采购订单将结束审核流程。'" :type="reviewDecision === 'APPROVE' ? 'success' : 'warning'" show-icon :closable="false" /><p class="review-reference">订单编号：{{ detail?.orderNo || '—' }}</p><el-form class="density-form review-form" label-position="top"><el-form-item label="审核备注"><el-input v-model="reviewRemark" type="textarea" :rows="4" maxlength="1000" show-word-limit :placeholder="reviewDecision === 'APPROVE' ? '请输入通过说明（选填）' : '请输入拒绝原因（选填）'" /></el-form-item></el-form></AppDialog><AppDialog class="admin-density-dialog" v-model="feeDialogOpen" title="登记采购费用" width="min(560px, calc(100vw - 28px))" confirm-text="确认登记" :confirm-loading="savingFee" @confirm="saveFee"><el-form class="density-form" label-position="top"><el-form-item label="费用项" required><el-input v-model="feeForm.feeItemName" maxlength="64" placeholder="请输入费用名称" /></el-form-item><el-form-item label="费用代码" required><el-input v-model="feeForm.feeItemCode" maxlength="64" placeholder="请输入费用代码" /></el-form-item><el-form-item label="费用金额（CNY）" required><el-input-number v-model="feeForm.amount" :min="0.01" :precision="2" controls-position="right" placeholder="请输入费用金额" /></el-form-item><el-form-item label="费用凭证"><el-input :model-value="voucher?.fileName" disabled /></el-form-item><el-form-item label="备注"><el-input v-model="feeForm.remark" type="textarea" :rows="3" maxlength="500" placeholder="请输入费用说明（选填）" /></el-form-item></el-form></AppDialog></AdminPage>
+    </DetailPageLayout>
+  </AdminPage>
 </template>
-
 <style scoped>
-.purchase-detail { gap: 0; border: 1px solid var(--cc-border); border-radius: var(--admin-radius); background: var(--admin-surface); }
-.header-actions, .section-actions { display: flex; align-items: center; gap: var(--admin-space-3); }
-.detail-surface { min-width: 0; padding: var(--admin-space-5); }
+.purchase-detail { border: 1px solid var(--cc-border); border-radius: var(--admin-radius); background: var(--admin-surface); }
 .detail-grid { display: grid; min-width: 0; gap: var(--admin-space-5); }
 .detail-grid section { min-width: 0; }
 .detail-grid h3 { margin: 0 0 var(--admin-space-3); font-size: var(--admin-font-section); }
-.detail-grid .density-fields > .wide { grid-column: span 2; }
-.section-heading { display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-3); margin-bottom: var(--admin-space-3); }
-.section-heading h3 { margin: 0; }
-.section-heading span, .review-reference { color: var(--cc-muted); font-size: var(--admin-font-caption); }
-.review-reference { margin: var(--admin-space-3) 0; }
-:deep(.el-input-number) { width: 100%; }
+.detail-grid p { color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.density-fields > .wide { grid-column: span 2; }
 </style>
diff --git a/src/modules/overseas-business/pages/PurchaseOrderEditView.vue b/src/modules/overseas-business/pages/PurchaseOrderEditView.vue
index 289c047b..16cc6de5 100644
--- a/src/modules/overseas-business/pages/PurchaseOrderEditView.vue
+++ b/src/modules/overseas-business/pages/PurchaseOrderEditView.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
 import '../overseasBusinessDensity.css'
-import { computed, reactive, ref, watch } from 'vue'
+import { computed, reactive, ref, watch, onBeforeUnmount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ArrowLeft, Save } from '@lucide/vue'
-import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
@@ -13,87 +13,78 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
-import { getOverseasPurchase, listOverseasPurchaseWarehouseOptions, updateOverseasPurchase } from '../api/platformOverseasBusiness'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { getOverseasPurchaseEditor, updateOverseasPurchase } from '../api/platformOverseasBusiness'
 import { overseasBusinessPermissions } from '../permissions'
-import type { OverseasPurchaseOutboundDetail, OverseasPurchaseStatus, OverseasPurchaseWarehouseOption, UpdateOverseasPurchaseRequest } from '../types'
 
-interface PurchaseEditModel {
-  orderNo: string; purchaseCategory: string; productName: string; productSpecification: string | null; productUrl: string | null
-  inboundQuantity: number; status: OverseasPurchaseStatus; purchaseWarehouseId: string | null
-  domesticCarrier: string | null; domesticTrackingNo: string | null; overseasCarrier: string | null; overseasTrackingNo: string | null
-  estimatedArrivalAt: string | null; remark: string | null; version: number
-  outboundDetails: OverseasPurchaseOutboundDetail[]
-}
-const route = useRoute(); const router = useRouter()
+const route = useRoute(); const router = useRouter(); const access = useAccessPreviewStore()
 const purchaseId = computed(() => typeof route.params.purchaseId === 'string' ? route.params.purchaseId : '')
 const customerId = computed(() => typeof route.query.customerId === 'string' ? route.query.customerId : '')
-const formRef = ref<FormInstance>(); const loading = ref(false); const saving = ref(false)
+const loading = ref(false); const saving = ref(false); const loaded = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null); const submitError = ref<ApiErrorDetails | null>(null)
-const warehouses = ref<OverseasPurchaseWarehouseOption[]>([]); const warehousesLoading = ref(false); const warehousesError = ref('')
-const initial = (): PurchaseEditModel => ({ orderNo: '', purchaseCategory: '', productName: '', productSpecification: null, productUrl: null, inboundQuantity: 0, status: 'PENDING_REVIEW', purchaseWarehouseId: null, domesticCarrier: null, domesticTrackingNo: null, overseasCarrier: null, overseasTrackingNo: null, estimatedArrivalAt: null, remark: null, version: 0, outboundDetails: [] })
-const form = reactive<PurchaseEditModel>(initial())
-const rules: FormRules<PurchaseEditModel> = {
-  purchaseCategory: [{ required: true, message: '请输入采购品类', trigger: 'blur' }],
-  productName: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
-}
-const statusLabels: Record<OverseasPurchaseStatus, string> = { PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_OUTBOUND: '待出库', PARTIALLY_OUTBOUND: '部分出库', OUTBOUNDED: '全部出库' }
-const inboundEditable = computed(() => ['APPROVED', 'PENDING_OUTBOUND', 'PARTIALLY_OUTBOUND', 'OUTBOUNDED'].includes(form.status))
-const outboundQuantity = computed(() => form.outboundDetails.reduce((sum, item) => sum + (Number(item.quantity) || 0), 0))
-function addOutbound() { form.outboundDetails.push({ id: `new-${Date.now()}-${form.outboundDetails.length}`, quantity: 0, carrier: null, trackingNo: null, shippedAt: null, remark: null }) }
-function removeOutbound(index: number) { form.outboundDetails.splice(index, 1) }
-const { captureBaseline } = useUnsavedWorkRegistration({ key: 'overseas-purchase-editor', label: computed(() => '编辑海外采购订单'), isOpen: computed(() => true), model: form, requiredPermission: computed(() => overseasBusinessPermissions.purchaseEdit) })
-async function loadWarehouses() {
-  warehousesLoading.value = true; warehousesError.value = ''
-  try { warehouses.value = await listOverseasPurchaseWarehouseOptions() }
-  catch { warehouses.value = []; warehousesError.value = '采购仓候选加载失败，请稍后重试' }
-  finally { warehousesLoading.value = false }
-}
+const initial = () => ({ orderNo: '', productName: '', purchaseQuantity: 0, remark: '', version: 0 })
+const form = reactive(initial())
+const canSave = computed(() => loaded.value && !loading.value && !saving.value && access.can(overseasBusinessPermissions.purchaseEdit))
+const { captureBaseline } = useUnsavedWorkRegistration({ key: 'overseas-purchase-editor', label: computed(() => '编辑采购内部备注'), isOpen: computed(() => true), model: form, requiredPermission: computed(() => overseasBusinessPermissions.purchaseEdit) })
+let generation = 0
+onBeforeUnmount(() => { generation++ })
+function back() { return router.push({ name: 'overseas-business-purchase-detail', params: { purchaseId: purchaseId.value }, query: { customerId: customerId.value } }) }
 async function load() {
-  Object.assign(form, initial()); loadError.value = null; submitError.value = null
-  if (!purchaseId.value || !customerId.value) { loadError.value = { message: '缺少采购订单号或客户标识，请从采购订单列表重新进入' }; captureBaseline(); return }
+  const current = ++generation; const orderNo = purchaseId.value; const customer = customerId.value
+  loaded.value = false; loading.value = false; Object.assign(form, initial()); captureBaseline()
+  loadError.value = null; submitError.value = null
+  if (!orderNo || !customer) { loadError.value = { message: '缺少采购订单号或客户标识，请从采购订单列表重新进入' }; return }
   loading.value = true
   try {
-    const detail = await getOverseasPurchase(purchaseId.value, customerId.value)
-    Object.assign(form, { orderNo: detail.orderNo, purchaseCategory: detail.purchaseCategory, productName: detail.productName, productSpecification: detail.productSpecification, productUrl: detail.productUrl, inboundQuantity: detail.inboundQuantity, status: detail.status, purchaseWarehouseId: detail.purchaseWarehouseId, domesticCarrier: detail.domesticCarrier, domesticTrackingNo: detail.domesticTrackingNo, overseasCarrier: detail.overseasCarrier, overseasTrackingNo: detail.overseasTrackingNo, estimatedArrivalAt: detail.estimatedArrivalAt, remark: detail.remark, version: detail.version, outboundDetails: (detail.outboundDetails || []).map((item) => ({ ...item })) })
-    if (detail.purchaseWarehouseId && !warehouses.value.some((item) => item.warehouseId === detail.purchaseWarehouseId)) warehouses.value.push({ warehouseId: detail.purchaseWarehouseId, warehouseCode: '', warehouseName: detail.purchaseWarehouseName || '当前采购仓', countryCode: '' })
-    captureBaseline()
-  } catch (error) { loadError.value = getApiErrorDetails(error, '海外采购订单加载失败') } finally { loading.value = false }
+    const detail = await getOverseasPurchaseEditor(orderNo, customer)
+    if (current !== generation) return
+    const order = detail.customerView.order
+    Object.assign(form, { orderNo: order.orderNo, productName: order.productName, purchaseQuantity: order.purchaseQuantity, version: order.version, remark: detail.internalRemark ?? '' })
+    loaded.value = true; captureBaseline()
+  } catch (error) { if (current === generation) loadError.value = getApiErrorDetails(error, '采购订单加载失败') }
+  finally { if (current === generation) loading.value = false }
 }
 async function save() {
-  if (!await formRef.value?.validate().catch(() => false)) return
-  if (outboundQuantity.value > form.inboundQuantity) { ElMessage.error('出库总量不能超过入库量'); return }
+  if (!canSave.value) return
   saving.value = true; submitError.value = null
-  const payload: UpdateOverseasPurchaseRequest = { version: form.version, purchaseCategory: form.purchaseCategory.trim(), productName: form.productName.trim(), productSpecification: form.productSpecification?.trim() || null, productUrl: form.productUrl?.trim() || null, inboundQuantity: inboundEditable.value ? form.inboundQuantity : undefined, purchaseWarehouseId: form.purchaseWarehouseId || null, domesticCarrier: form.domesticCarrier?.trim() || null, domesticTrackingNo: form.domesticTrackingNo?.trim() || null, overseasCarrier: form.overseasCarrier?.trim() || null, overseasTrackingNo: form.overseasTrackingNo?.trim() || null, estimatedArrivalAt: form.estimatedArrivalAt || null, remark: form.remark?.trim() || null, outboundDetails: form.outboundDetails.map((item) => ({ ...item, quantity: Number(item.quantity) || 0, carrier: item.carrier?.trim() || null, trackingNo: item.trackingNo?.trim() || null, remark: item.remark?.trim() || null })) }
+  const current = generation; const orderNo = purchaseId.value; const customer = customerId.value
   try {
-    const updated = await updateOverseasPurchase(purchaseId.value, customerId.value, payload)
-    form.version = updated.version; captureBaseline(); ElMessage.success('海外采购订单已保存')
-    await router.push({ name: 'overseas-business-purchase-detail', params: { purchaseId: updated.orderNo }, query: { customerId: updated.customerId } })
-  } catch (error) { submitError.value = getApiErrorDetails(error, '海外采购订单保存失败') } finally { saving.value = false }
+    const updated = await updateOverseasPurchase(orderNo, customer, { version: form.version, remark: form.remark.trim() || null })
+    if (current !== generation) return
+    form.version = updated.version; captureBaseline(); ElMessage.success('内部备注已保存')
+    await back()
+  } catch (error) { if (current === generation) submitError.value = getApiErrorDetails(error, '内部备注保存失败') }
+  finally { saving.value = false }
 }
-watch([purchaseId, customerId], () => { void loadWarehouses().then(load) }, { immediate: true })
+watch([purchaseId, customerId], () => { void load() }, { immediate: true })
 </script>
 
 <template>
-  <AdminPage class="admin-density overseas-business-editor"><OperationErrorToast :details="submitError" /><DetailPageLayout class="overseas-business-form-layout" aria-label="编辑海外采购订单">
-    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-business-purchase-detail', params: { purchaseId }, query: { customerId } })"><ArrowLeft :size="16" />返回详情</el-button><h1 class="density-detail-title">编辑海外采购订单</h1><span class="form-reference">{{ form.orderNo || '—' }}</span></div></div></template>
-    <LoadErrorState v-if="loadError" title="采购订单暂时无法编辑" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
-    <section v-else v-loading="loading" class="form-panel"><el-form class="density-form" ref="formRef" :model="form" :rules="rules" label-position="top" :disabled="saving">
-      <FormSection class="density-form-section" title="商品信息"><div class="form-grid three"><el-form-item label="订单编号"><el-input v-model="form.orderNo" disabled /></el-form-item><el-form-item label="采购品类" prop="purchaseCategory"><el-input v-model="form.purchaseCategory" maxlength="128" placeholder="请输入采购品类" /></el-form-item><el-form-item label="商品名称" prop="productName"><el-input v-model="form.productName" maxlength="255" placeholder="请输入商品名称" /></el-form-item><el-form-item class="span-2" label="商品规格"><el-input v-model="form.productSpecification" maxlength="500" placeholder="请输入商品规格" /></el-form-item><el-form-item class="span-3" label="商品链接"><el-input v-model="form.productUrl" maxlength="2000" placeholder="请输入商品链接" /></el-form-item></div></FormSection>
-      <FormSection class="density-form-section" title="库存与快递信息"><div class="form-grid three"><el-form-item label="入库量"><el-input-number v-model="form.inboundQuantity" :min="0" :disabled="!inboundEditable" controls-position="right" placeholder="请输入入库数量" /><small v-if="!inboundEditable">服务端仅允许已通过订单修改入库量</small></el-form-item><el-form-item label="出库量"><el-input :model-value="outboundQuantity" disabled /></el-form-item><el-form-item label="状态"><el-input :model-value="statusLabels[form.status]" disabled /></el-form-item><el-form-item label="采购仓库"><el-select v-model="form.purchaseWarehouseId" clearable filterable :loading="warehousesLoading" :disabled="Boolean(warehousesError)" placeholder="请选择采购仓"><el-option v-for="item in warehouses" :key="item.warehouseId" :label="`${item.warehouseName}${item.warehouseCode ? ` · ${item.warehouseCode}` : ''}`" :value="item.warehouseId" /></el-select><small v-if="warehousesError" class="field-error">{{ warehousesError }}</small></el-form-item><el-form-item label="预计到达时间"><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" clearable /></el-form-item><el-form-item label="国内承运商"><el-input v-model="form.domesticCarrier" maxlength="128" placeholder="请输入国内承运商" /></el-form-item><el-form-item label="国内运单号"><el-input v-model="form.domesticTrackingNo" maxlength="128" placeholder="请输入国内物流单号" /></el-form-item><el-form-item label="海外承运商"><el-input v-model="form.overseasCarrier" maxlength="128" placeholder="请输入海外承运商" /></el-form-item><el-form-item label="海外运单号"><el-input v-model="form.overseasTrackingNo" maxlength="128" placeholder="请输入海外物流单号" /></el-form-item><el-form-item class="span-3" label="备注"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="请输入备注（选填）" /></el-form-item></div></FormSection>
-      <FormSection class="density-form-section" title="出库明细"><div class="outbound-head"><span>出库总量：<b>{{ outboundQuantity }}</b> / {{ form.inboundQuantity }}</span><el-button class="density-action" data-tone="primary" size="small" @click="addOutbound">添加出库明细</el-button></div><div v-if="!form.outboundDetails.length" class="empty-outbound">暂无出库明细，可添加多条出库记录</div><div v-for="(item, index) in form.outboundDetails" :key="item.id" class="outbound-row"><el-form-item label="出库数量"><el-input-number v-model="item.quantity" :min="0" :max="form.inboundQuantity" controls-position="right" placeholder="请输入出库数量" /></el-form-item><el-form-item label="承运商"><el-input v-model="item.carrier" maxlength="128" placeholder="请输入快递或物流名称" /></el-form-item><el-form-item label="运单号"><el-input v-model="item.trackingNo" maxlength="128" placeholder="请输入物流单号" /></el-form-item><el-form-item label="出库时间"><el-date-picker v-model="item.shippedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" clearable /></el-form-item><el-form-item class="outbound-remark" label="备注"><el-input v-model="item.remark" maxlength="500" placeholder="请输入本次出库备注（选填）" /></el-form-item><el-button class="remove-outbound density-action" data-tone="danger" @click="removeOutbound(index)" :aria-label="`删除第 ${index + 1} 条出库明细`">删除</el-button></div></FormSection>
-    </el-form><footer class="form-actions"><el-button type="primary" :loading="saving" @click="save"><Save :size="16" />保存</el-button><el-button :disabled="saving" @click="router.push({ name: 'overseas-business-purchase-detail', params: { purchaseId }, query: { customerId } })">取消</el-button></footer></section>
-  </DetailPageLayout></AdminPage>
+  <AdminPage class="admin-density overseas-business-editor">
+    <OperationErrorToast :details="submitError" />
+    <DetailPageLayout class="overseas-business-form-layout" aria-label="编辑采购内部备注">
+      <template #header><div class="density-detail-header"><div class="density-detail-heading">
+        <el-button link class="density-back" @click="back"><ArrowLeft :size="16" />返回详情</el-button>
+        <h1 class="density-detail-title">编辑采购内部备注</h1><span class="form-reference">{{ form.orderNo || '—' }}</span>
+      </div></div></template>
+      <LoadErrorState v-if="loadError" title="采购订单暂时无法编辑" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
+      <section v-else v-loading="loading" class="form-panel">
+        <el-form class="density-form" :model="form" label-position="top" :disabled="!canSave">
+          <FormSection class="density-form-section" title="采购订单"><div class="form-grid">
+            <el-form-item label="订单编号"><el-input :model-value="form.orderNo || '—'" readonly /></el-form-item>
+            <el-form-item label="商品名称"><el-input :model-value="form.productName || '—'" readonly /></el-form-item>
+            <el-form-item label="采购数量"><el-input :model-value="loaded ? form.purchaseQuantity : '—'" readonly /></el-form-item>
+            <el-form-item class="span-3" label="内部备注"><el-input v-model="form.remark" type="textarea" :rows="4" maxlength="1000" show-word-limit placeholder="仅供平台内部使用" /></el-form-item>
+          </div></FormSection>
+        </el-form>
+        <footer class="form-actions"><el-button type="primary" :disabled="!canSave" :loading="saving" @click="save"><Save :size="16" />保存</el-button><el-button :disabled="saving" @click="back">取消</el-button></footer>
+      </section>
+    </DetailPageLayout>
+  </AdminPage>
 </template>
 
 <style scoped>
 .form-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
-.span-2 { grid-column: span 2; }
 .span-3 { grid-column: 1 / -1; }
-.outbound-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: var(--admin-space-3); color: var(--cc-muted); font-size: var(--admin-font-body); }
-.outbound-head b { color: var(--cc-text); }
-.empty-outbound { padding: var(--admin-space-5); color: var(--cc-muted); text-align: center; }
-.outbound-row { display: grid; grid-template-columns: 110px minmax(0,1fr) minmax(0,1fr) 190px minmax(0,1fr) 60px; gap: var(--admin-space-3); align-items: start; padding: var(--admin-space-3) 0; border-bottom: 1px solid var(--cc-border); }
-.outbound-row :deep(.el-form-item) { margin-bottom: 0; }
-.outbound-row :deep(.el-input-number), .outbound-row :deep(.el-date-editor) { width: 100%; }
-.remove-outbound { align-self: end; }
+@media (max-width: 760px) { .form-grid { grid-template-columns: 1fr; } }
 </style>
diff --git a/src/modules/overseas-business/pages/PurchaseOrdersView.vue b/src/modules/overseas-business/pages/PurchaseOrdersView.vue
index 14480e3a..2f664b51 100644
--- a/src/modules/overseas-business/pages/PurchaseOrdersView.vue
+++ b/src/modules/overseas-business/pages/PurchaseOrdersView.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { computed, onActivated, onMounted, ref, watch } from 'vue'
+import { computed, onActivated, onMounted, onBeforeUnmount, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
+import { useAuthStore } from '@/core/auth/auth'
+import { procurementStatuses, statusLabel, money } from '../procurementPresentation'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -14,16 +16,17 @@ import { listOverseasPurchaseCustomerOptions, listOverseasPurchases } from '../a
 import { overseasBusinessPermissions } from '../permissions'
 import type { OverseasPurchaseCustomerOption, OverseasPurchaseQuery, OverseasPurchaseStatus, OverseasPurchaseSummary } from '../types'
 
-const router = useRouter(); const access = useAccessPreviewStore()
+const router = useRouter(); const access = useAccessPreviewStore(); const auth = useAuthStore()
 const rows = ref<OverseasPurchaseSummary[]>([]); const loading = ref(false); const loadError = ref<ApiErrorDetails | null>(null)
 const page = ref(1); const pageSize = ref(20); const total = ref(0)
-const filters = ref<QueryModel>({ orderNo: '', customerId: '', purchaseCategory: '', productName: '' }); const applied = ref({ ...filters.value })
+const filters = ref<QueryModel>({ orderNo: '', customerId: '', purchaseCategory: '', productName: '', status: '' }); const applied = ref({ ...filters.value })
 const customerOptions = ref<OverseasPurchaseCustomerOption[]>([]); const customersLoading = ref(false)
 const fields = computed<QueryField[]>(() => [
   { key: 'orderNo', type: 'input', label: '订单编号', placeholder: '请输入订单编号', width: 210 },
   { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 210, options: customerOptions.value.map((item) => ({ label: item.customerName, value: item.customerId })), props: { filterable: true, loading: customersLoading.value } },
   { key: 'purchaseCategory', type: 'input', label: '采购品类', placeholder: '请输入采购品类', width: 190 },
   { key: 'productName', type: 'input', label: '商品名称', placeholder: '请输入商品名称', width: 210 },
+  { key: 'status', type: 'select', label: '履约状态', placeholder: '全部状态', width: 190, options: Object.entries(procurementStatuses).map(([value, label]) => ({ value, label })) },
 ])
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 176, fixed: 'left', slotName: 'actions' },
@@ -33,24 +36,30 @@ const columns: DataTableColumn[] = [
   { key: 'purchaseCategory', prop: 'purchaseCategory', label: '采购品类', minWidth: 130 },
   { key: 'productName', prop: 'productName', label: '商品名称', minWidth: 160 },
   { key: 'productSpecification', prop: 'productSpecification', label: '商品规格', minWidth: 180, formatter: (row: OverseasPurchaseSummary) => row.productSpecification || '—' },
-  { key: 'budgetUnitPrice', label: '采购单价', width: 120, align: 'right', formatter: (row: OverseasPurchaseSummary) => formatAmount(row.budgetUnitPrice, row.currency) },
-  { key: 'inboundQuantity', prop: 'inboundQuantity', label: '入库量', width: 95, align: 'right' },
-  { key: 'outboundQuantity', prop: 'outboundQuantity', label: '出库量', width: 95, align: 'right' },
-  { key: 'inventoryQuantity', prop: 'inventoryQuantity', label: '库存量', width: 95, align: 'right' },
-  { key: 'status', label: '状态', width: 105, formatter: (row: OverseasPurchaseSummary) => purchaseStatusLabel(row.status) },
+  { key: 'budgetUnitPrice', label: '预算单价', width: 120, align: 'right', formatter: (row: OverseasPurchaseSummary) => money(row.budgetUnitPrice, row.currency) },
+  { key: 'purchaseQuantity', prop: 'purchaseQuantity', label: '采购数量', width: 100, align: 'right' },
+  { key: 'status', label: '状态', minWidth: 145, formatter: (row: OverseasPurchaseSummary) => statusLabel(row.status) },
   { key: 'createdAt', prop: 'createdAt', label: '创建时间', minWidth: 165, formatter: (row: OverseasPurchaseSummary) => formatDateTime(row.createdAt) },
 ]
-const statusLabels: Record<OverseasPurchaseStatus, string> = { PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_OUTBOUND: '待出库', PARTIALLY_OUTBOUND: '部分出库', OUTBOUNDED: '全部出库' }
-function purchaseStatusLabel(status: OverseasPurchaseStatus) { return statusLabels[status] || status }
-function formatAmount(value: string | null, currency: string) { if (value == null) return '—'; const amount = Number(value); return `${Number.isFinite(amount) ? amount.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) : value} ${currency}` }
 function formatDateTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 16) : '—' }
-async function load() {
+let generation = 0; let inFlight: Promise<void> | null = null; let requestKey = ''
+onBeforeUnmount(() => { generation++ })
+function load() {
+  const query: OverseasPurchaseQuery = { page: page.value, size: pageSize.value, customerId: String(applied.value.customerId || ''), orderNo: String(applied.value.orderNo || ''), purchaseCategory: String(applied.value.purchaseCategory || ''), productName: String(applied.value.productName || ''), status: String(applied.value.status || '') as OverseasPurchaseStatus | '' }
+  const key = JSON.stringify([auth.user?.id, query])
+  if (inFlight && key === requestKey) return inFlight
+  requestKey = key; const current = ++generation
   loading.value = true; loadError.value = null
-  try {
-    const result = await listOverseasPurchases({ page: page.value, size: pageSize.value, customerId: String(applied.value.customerId || ''), orderNo: String(applied.value.orderNo || ''), purchaseCategory: String(applied.value.purchaseCategory || ''), productName: String(applied.value.productName || '') } satisfies OverseasPurchaseQuery)
+  const promise = listOverseasPurchases(query).then(result => {
+    if (current !== generation) return
     rows.value = result.records; total.value = result.total
-  } catch (error) { rows.value = []; total.value = 0; loadError.value = getApiErrorDetails(error, '海外采购订单加载失败，请稍后重试') } finally { loading.value = false }
+  }).catch(error => { if (current === generation) { rows.value = []; total.value = 0; loadError.value = getApiErrorDetails(error, '采购订单加载失败，请稍后重试') } }).finally(() => {
+    if (current === generation) loading.value = false
+    if (inFlight === promise) inFlight = null
+  })
+  inFlight = promise; return promise
 }
+watch(() => auth.user?.id, () => { rows.value = []; total.value = 0; void load() })
 function search(model: QueryModel) { applied.value = { ...model }; if (page.value === 1) void load(); else page.value = 1 }
 function open(row: OverseasPurchaseSummary, edit = false) { void router.push({ name: edit ? 'overseas-business-purchase-edit' : 'overseas-business-purchase-detail', params: { purchaseId: row.orderNo }, query: { customerId: row.customerId } }) }
 async function loadCustomerOptions() { customersLoading.value = true; try { customerOptions.value = await listOverseasPurchaseCustomerOptions() } catch { customerOptions.value = [] } finally { customersLoading.value = false } }
diff --git a/src/modules/overseas-business/procurementControlForm.test.ts b/src/modules/overseas-business/procurementControlForm.test.ts
new file mode 100644
index 00000000..ddd5bc54
--- /dev/null
+++ b/src/modules/overseas-business/procurementControlForm.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, it } from 'vitest'
+import { buildControl, controlForm } from './procurementControlForm'
+import { readPendingProcurement } from './procurementPending'
+import type { PlatformProcurement, ProcurementControlNote, ProcurementFile } from './procurementTypes'
+const base = { version: 7, idempotencyKey: 'control-one', reason: '内部处理依据' }
+const proof: ProcurementFile = { id: '51', fileId: '501', category: 'EXCEPTION', fileName: 'agreement.pdf', contentType: 'application/pdf', sizeBytes: 10, createdAt: '' }
+function detail(): PlatformProcurement {
+  return {
+    customerView: { order: { id: '1', orderNo: 'OP-1', customerId: '10001', customerName: '客户', purchaseCategory: '样品', productName: '外套', productSpecification: null, productUrl: null, purchaseQuantity: 10, budgetUnitPrice: '1.00', currency: 'CNY', receivingAddress: '深圳', contactName: '收件人', contactPhone: '13800000000', estimatedArrivalAt: null, plannedWarehouseName: '海外仓', actualWarehouseName: '海外仓', actualWarehouseCode: 'LAX', status: 'OVERSEAS_RECEIVING', version: 7, createdAt: '', updatedAt: '' }, budget: { totalAmount: '10.00', currency: 'CNY', authorizedAt: null }, purchased: true, purchaseConfirmed: true, purchaseNeedsAttention: false, progress: [], boxes: [], shipments: [{ shipmentNo: 'PS-1', leg: 'OVERSEAS', cartonNo: 'C1', quantity: 5, shippedAt: '2020-01-03T10:00:00', carrier: 'UPS', trackingNo: 'TRACK-1' }], fees: [], exceptionSummaries: [] },
+    purchaseFacts: { actual_warehouse_id: '20', purchased_quantity: 10, purchased_at: '2020-01-01T10:00:00', overseas_shipped_at: '2020-01-03T10:00:00' },
+    physical: { receipts: [{ id: '11', receiptNo: 'PR-11', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 6, damagedQuantity: 1, extraQuantity: 2, receivedAt: '2020-01-02T10:00:00', active: true }, { id: '12', receiptNo: 'PR-12', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 3, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-02T12:00:00', active: true }], dispositions: [], packingVersion: 2, packingStatus: 'DRAFT', cartons: [{ id: '31', cartonNo: 'C1', quantity: 5, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.234', sources: [{ receiptId: '11', quantity: 5 }] }, { id: '32', cartonNo: 'C2', quantity: 4, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.234', sources: [{ receiptId: '11', quantity: 1 }, { receiptId: '12', quantity: 3 }] }] },
+    transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], reviewHistory: [], operations: [], actions: [{ key: 'EXCEPTION_CLOSE', label: '异常关闭', permission: 'platform:overseas-business:purchase:manage', allowed: true, reason: null }], internalRemark: null,
+  }
+}
+function note(): ProcurementControlNote { return { id: '71', note_no: 'PN-71', target_type: 'PURCHASE', target_id: null, blocking: true, reason: '待处理', client_summary: null, created_at: '', resolved_at: null, resolution_reason: null, voucher_file_id: '501', resolution_voucher_id: null, original_value_json: null, corrected_value_json: null } }
+function closure() { const value = detail(); value.controls.remaining = [{ kind: 'PURCHASE_REMAINDER', sourceId: null, businessNo: 'OP-1', quantity: 3 }, { kind: 'GOOD', sourceId: '11', businessNo: 'PR-11', quantity: 6 }]; const form = controlForm(value); form.customerVoucherFileId = '501'; form.clientSummary = '客户同意停止寄送'; form.financialConclusion = '所有资金处理已结束'; for (const row of form.resolutions) Object.assign(row, { decision: row.kind === 'PURCHASE_REMAINDER' ? 'SUPPLIER_RETAINED' : 'CUSTOMER_AUTHORIZED_RETENTION', destination: '明确的接收方与留存地点', voucherFileId: '501' }); return { value, form } }
+describe('procurement exception control requests', () => {
+  it('adds a purchase note without leaking the internal reason into a customer summary', () => {
+    const value = detail(); const form = controlForm(value); form.targetId = 'stale-receipt'
+    const payload = buildControl('control-notes', form, value, [proof], base, '', '501')
+    expect(payload).toEqual({ ...base, targetType: 'PURCHASE', blocking: true, voucherFileId: '501' })
+    expect(payload).not.toHaveProperty('clientSummary'); expect(payload).not.toHaveProperty('targetId')
+    expect(readPendingProcurement(JSON.stringify({ command: 'control-notes', payload }))).not.toBeNull()
+  })
+  it('requires actual order-owned facts and allows notes against historical receipts', () => {
+    const value = detail(); const form = controlForm(value); form.targetType = 'RECEIPT'; form.targetId = 'other'
+    expect(() => buildControl('control-notes', form, value, [proof], base, '', '501')).toThrow('本单实收')
+    form.targetId = '11'; value.physical.receipts[0].active = false; expect(buildControl('control-notes', form, value, [proof], base, '', '501').targetId).toBe('11')
+    value.transport.shipments = [{ id: '41', shipmentNo: 'PS-41', leg: 'OVERSEAS', shippedAt: '2020-01-03T10:00:00' }]; form.targetType = 'SHIPMENT'; form.targetId = '41'
+    expect(buildControl('control-notes', form, value, [proof], base, '', '501').targetId).toBe('41')
+    form.targetId = '42'; expect(() => buildControl('control-notes', form, value, [proof], base, '', '501')).toThrow('本单实际交寄')
+  })
+  it('only resolves a still-active blocker with order evidence', () => {
+    const value = detail(); value.controls.notes = [note()]; const form = controlForm(value); form.noteId = '71'
+    expect(buildControl('control-notes/resolve', form, value, [proof], base, '', '501')).toEqual({ ...base, noteId: '71', voucherFileId: '501' })
+    value.controls.notes[0].resolved_at = '2020-01-03T10:00:00'; expect(() => buildControl('control-notes/resolve', form, value, [proof], base, '', '501')).toThrow('尚未处理')
+  })
+  it('requires a distinct actual warehouse and sends no direct inventory mutation', () => {
+    const value = detail(); const form = controlForm(value)
+    expect(() => buildControl('actual-warehouse/correct', form, value, [proof], base, '20', '501')).toThrow('不同')
+    expect(buildControl('actual-warehouse/correct', form, value, [proof], base, '30', '501')).toEqual({ ...base, warehouseId: '30', voucherFileId: '501' })
+  })
+  it('closes with exact remaining sources, explicit destinations and separate private/public conclusions', () => {
+    const { value, form } = closure(); const payload = buildControl('exception-close', form, value, [proof], base, '', '')
+    expect(payload.resolutions?.map(row => [row.kind, row.sourceId, row.quantity])).toEqual([['PURCHASE_REMAINDER', null, 3], ['GOOD', '11', 6]])
+    expect(payload).toMatchObject({ customerVoucherFileId: '501', financialConclusion: '所有资金处理已结束', clientSummary: '客户同意停止寄送' })
+    expect(payload).not.toHaveProperty('amount'); expect(payload).not.toHaveProperty('status')
+    expect(readPendingProcurement(JSON.stringify({ command: 'exception-close', payload }))).toEqual({ command: 'exception-close', payload })
+  })
+  it('rejects omitted, duplicated or changed remaining quantities instead of forcing closure', () => {
+    let { value, form } = closure(); form.resolutions.pop(); expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('去向未明确')
+    ;({ value, form } = closure()); form.resolutions.push({ ...form.resolutions[0] }); expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('不可重复')
+    ;({ value, form } = closure()); form.resolutions[0].quantity = 2; expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('改数量')
+  })
+  it('rejects wrong source dispositions, missing evidence and financial blockers', () => {
+    let { value, form } = closure(); form.resolutions[0].decision = 'DISPOSED'; expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('来源不匹配')
+    ;({ value, form } = closure()); form.customerVoucherFileId = ''; expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('客户确认凭证')
+    ;({ value, form } = closure()); value.actions[0].allowed = false; value.actions[0].reason = '未决资金请求'; expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('未决资金请求')
+    ;({ value, form } = closure()); value.controls.notes = [note()]; expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('未解除')
+  })
+  it('allows an empty remaining list only with the required customer and financial conclusions', () => {
+    const value = detail(); const form = controlForm(value); form.customerVoucherFileId = '501'; form.financialConclusion = '无未决费用或冻结'; form.clientSummary = '履约已停止'
+    expect(buildControl('exception-close', form, value, [proof], base, '', '').resolutions).toEqual([])
+    form.financialConclusion = ''; expect(() => buildControl('exception-close', form, value, [proof], base, '', '')).toThrow('财务处理结论')
+  })
+})
diff --git a/src/modules/overseas-business/procurementControlForm.ts b/src/modules/overseas-business/procurementControlForm.ts
new file mode 100644
index 00000000..9fa3a5bc
--- /dev/null
+++ b/src/modules/overseas-business/procurementControlForm.ts
@@ -0,0 +1,51 @@
+import type { PlatformProcurement, ProcurementFile, ProcurementRemaining, ProcurementRemainingKind } from './procurementTypes'
+import type { ProcurementCommand, ProcurementCommandBody } from './api/procurementCommands'
+export const controlCommands = new Set<ProcurementCommand>(['control-notes', 'control-notes/resolve', 'actual-warehouse/correct', 'exception-close'])
+export const remainingLabels: Record<ProcurementRemainingKind, string> = { PURCHASE_REMAINDER: '采购未到货', TRANSIT_REMAINDER: '国际段未到货', GOOD: '合格货物', DAMAGED: '破损货物', EXTRA: '多到货物' }
+export const decisionLabels: Record<string, string> = { SUPPLIER_RETAINED: '供应商保留', RETURNED_TO_SUPPLIER: '已退回供应商', RETURNED_TO_SENDER: '已退回寄件方', LOSS_CONFIRMED: '已确认丢失', CUSTOMER_AUTHORIZED_RETENTION: '客户授权留存', DISPOSED: '已处置' }
+export const allowedDecisions: Record<ProcurementRemainingKind, string[]> = { PURCHASE_REMAINDER: ['SUPPLIER_RETAINED', 'RETURNED_TO_SUPPLIER', 'LOSS_CONFIRMED'], TRANSIT_REMAINDER: ['LOSS_CONFIRMED', 'RETURNED_TO_SENDER'], GOOD: ['RETURNED_TO_SUPPLIER', 'CUSTOMER_AUTHORIZED_RETENTION', 'DISPOSED'], DAMAGED: ['DISPOSED', 'RETURNED_TO_SUPPLIER'], EXTRA: ['RETURNED_TO_SUPPLIER'] }
+export interface ResolutionDraft extends ProcurementRemaining { decision: string; destination: string; voucherFileId: string }
+export interface ControlForm { targetType: 'PURCHASE' | 'WAREHOUSE' | 'RECEIPT' | 'SHIPMENT'; targetId: string; blocking: boolean; clientSummary: string; noteId: string; customerVoucherFileId: string; financialConclusion: string; resolutions: ResolutionDraft[] }
+export function controlForm(detail: PlatformProcurement): ControlForm { return { targetType: 'PURCHASE', targetId: '', blocking: true, clientSummary: '', noteId: '', customerVoucherFileId: '', financialConclusion: '', resolutions: detail.controls.remaining.map(row => ({ ...row, decision: '', destination: '', voucherFileId: '' })) } }
+function proof(files: ProcurementFile[], id: string) { if (!files.some(row => row.fileId === id && row.category === 'EXCEPTION')) throw new Error('请选择本单异常或客户确认凭证') }
+function sourceKey(row: { kind: string; sourceId: string | null }) { return `${row.kind}:${row.sourceId ?? ''}` }
+export function buildControl(command: ProcurementCommand, form: ControlForm, detail: PlatformProcurement, files: ProcurementFile[], base: ProcurementCommandBody, warehouseId: string, voucherFileId: string): ProcurementCommandBody {
+  if (command === 'control-notes') {
+    let targetId: string | undefined
+    if (form.targetType === 'PURCHASE') { if (!detail.purchaseFacts.purchased_at) throw new Error('尚无真实购买事实，不能关联购买说明') }
+    else if (form.targetType === 'WAREHOUSE') { if (!detail.purchaseFacts.actual_warehouse_id) throw new Error('尚无实际收货仓'); targetId = detail.purchaseFacts.actual_warehouse_id }
+    else if (form.targetType === 'RECEIPT') { if (!detail.physical.receipts.some(row => row.id === form.targetId)) throw new Error('请选择本单实收记录'); targetId = form.targetId }
+    else { if (!detail.transport.shipments.some(row => row.id === form.targetId)) throw new Error('请选择本单实际交寄记录'); targetId = form.targetId }
+    proof(files, voucherFileId)
+    if (form.clientSummary.trim().length > 500) throw new Error('对客摘要最多 500 字')
+    return { ...base, targetType: form.targetType, ...(targetId ? { targetId } : {}), blocking: form.blocking, voucherFileId, ...(form.clientSummary.trim() ? { clientSummary: form.clientSummary.trim() } : {}) }
+  }
+  if (command === 'control-notes/resolve') {
+    if (!detail.controls.notes.some(note => note.id === form.noteId && note.blocking && !note.resolved_at)) throw new Error('请选择本单尚未处理的阻断异常')
+    proof(files, voucherFileId); return { ...base, noteId: form.noteId, voucherFileId }
+  }
+  if (command === 'actual-warehouse/correct') {
+    if (!detail.purchaseFacts.actual_warehouse_id) throw new Error('尚无实际仓，请使用计划仓调整')
+    if (!warehouseId || warehouseId === detail.purchaseFacts.actual_warehouse_id) throw new Error('请选择与原实际仓不同的有效海外收货仓')
+    proof(files, voucherFileId); return { ...base, warehouseId, voucherFileId }
+  }
+  const action = detail.actions.find(row => row.key === 'EXCEPTION_CLOSE')
+  if (!action?.allowed) throw new Error(action?.reason || '尚不满足异常关闭条件')
+  if (!detail.purchaseFacts.purchased_at) throw new Error('购买前请使用取消订单')
+  if (detail.controls.notes.some(note => note.blocking && !note.resolved_at)) throw new Error('请先处理本单未解除的阻断异常')
+  proof(files, form.customerVoucherFileId)
+  const expected = new Map(detail.controls.remaining.map(row => [sourceKey(row), row]))
+  const resolutions = form.resolutions.map(row => {
+    const source = expected.get(sourceKey(row))
+    if (!source || !Number.isSafeInteger(row.quantity) || row.quantity <= 0 || source.quantity !== row.quantity) throw new Error('处置必须恰好覆盖每份剩余来源，不可重复、跨单或改数量')
+    expected.delete(sourceKey(row))
+    if (!allowedDecisions[row.kind].includes(row.decision)) throw new Error('处置方式与剩余货物来源不匹配')
+    if (!row.destination.trim() || row.destination.trim().length > 500) throw new Error('请填写每份货物的实际去向及接收方，最多 500 字')
+    proof(files, row.voucherFileId)
+    return { kind: row.kind, sourceId: row.sourceId, quantity: row.quantity, decision: row.decision, destination: row.destination.trim(), voucherFileId: row.voucherFileId }
+  })
+  if (expected.size) throw new Error('仍有剩余货物去向未明确')
+  if (!form.financialConclusion.trim() || form.financialConclusion.trim().length > 1000) throw new Error('请填写财务处理结论，最多 1000 字')
+  if (!form.clientSummary.trim() || form.clientSummary.trim().length > 500) throw new Error('请填写对客关闭摘要，最多 500 字')
+  return { ...base, resolutions, customerVoucherFileId: form.customerVoucherFileId, financialConclusion: form.financialConclusion.trim(), clientSummary: form.clientSummary.trim() }
+}
diff --git a/src/modules/overseas-business/procurementFinanceForm.test.ts b/src/modules/overseas-business/procurementFinanceForm.test.ts
new file mode 100644
index 00000000..c67ce393
--- /dev/null
+++ b/src/modules/overseas-business/procurementFinanceForm.test.ts
@@ -0,0 +1,119 @@
+import { describe, expect, it } from 'vitest'
+import { buildFinance, financeForm, feeRetryPermission, refundAvailable, targetPreview, replacementCandidates, replacementPreview } from './procurementFinanceForm'
+import { readPendingProcurement } from './procurementPending'
+import type { PlatformProcurement, ProcurementInternalFee, ProcurementFile } from './procurementTypes'
+const base = { version: 7, idempotencyKey: 'finance-one', reason: '凭证核对完成' }
+const proof: ProcurementFile = { id: '51', fileId: '501', category: 'VOUCHER', fileName: 'invoice.pdf', contentType: 'application/pdf', sizeBytes: 10, createdAt: '' }
+function fee(id = '1', purpose = 'DUTY'): ProcurementInternalFee { return { id, feeNo: `PF-${id}`, purpose, confirmationOrigin: 'BUSINESS', feeItemCode: purpose, feeItemName: purpose, feeVersion: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7.000000', exchangeRateMonth: '2020-01', businessDate: '2020-01-02', parentFeeId: null, sourceFeeId: null, voucherFileId: '501', voucherFileName: 'invoice.pdf', walletStatus: 'SETTLED', walletLedgerId: `900${id}`, walletErrorCode: null, walletErrorMessage: null, remark: null } }
+function detail(fees: ProcurementInternalFee[] = []): PlatformProcurement {
+  return { customerView: { order: { id: '1', orderNo: 'OP-1', customerId: '9', customerName: '客户', purchaseCategory: '样品', productName: '外套', productSpecification: null, productUrl: null, purchaseQuantity: 10, budgetUnitPrice: '1.00', currency: 'CNY', receivingAddress: '深圳', contactName: '收件人', contactPhone: '13800000000', estimatedArrivalAt: null, plannedWarehouseName: null, actualWarehouseName: null, actualWarehouseCode: null, status: 'WAIT_CHARGES', version: 7, createdAt: '', updatedAt: '' }, budget: { totalAmount: '10.00', currency: 'CNY', authorizedAt: null }, purchased: true, purchaseConfirmed: true, purchaseNeedsAttention: false, progress: [], boxes: [], shipments: [], fees: fees.map(row => ({ feeNo: row.feeNo, purpose: row.purpose, name: row.feeItemName, version: row.feeVersion, active: row.active, determination: row.determination, amount: row.amount, currency: row.currency, originalAmount: row.originalAmount, originalCurrency: row.originalCurrency, exchangeRate: row.exchangeRate, exchangeRateMonth: row.exchangeRateMonth, businessDate: row.businessDate, parentFeeNo: null, walletStatus: row.walletStatus, sourceLinked: ['SETTLED', 'REFUNDED', 'ZERO', 'NOT_APPLICABLE'].includes(row.walletStatus) })), exceptionSummaries: [] }, purchaseFacts: { domestic_received_at: '2020-01-04T10:00:00' }, physical: { receipts: [], dispositions: [], packingVersion: 1, packingStatus: 'CONFIRMED', cartons: [] }, transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] }, files: [proof], fees, feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, reviewHistory: [], operations: [], actions: [], internalRemark: null }
+}
+function chain() { const root = fee(); const extra = { ...fee('2', 'ADJUSTMENT'), amount: '20.00', originalAmount: '20.00', originalCurrency: 'CNY', exchangeRate: '1', parentFeeId: '1' }; const refund = { ...fee('3', 'REFUND'), amount: '10.00', originalAmount: '10.00', originalCurrency: 'CNY', exchangeRate: '1', parentFeeId: '1', walletStatus: 'REFUNDED' }; return detail([root, extra, refund]) }
+describe('procurement fee determination and correction rules', () => {
+  it('builds independent additional fees with a scoped voucher and recoverable payload', () => {
+    const value = detail(); value.purchaseFacts.purchased_at = '2020-01-02T10:00:00'
+    const form = financeForm(value)
+    Object.assign(form.additional, { name: '保管费', amount: '3.25', currency: 'USD', businessDate: '2020-01-03', voucherFileId: '501' })
+    const payload = buildFinance('fees/additional', form, value, [proof], base, '')
+    expect(payload).toEqual({ ...base, name: '保管费', amount: '3.25', currency: 'USD', businessDate: '2020-01-03', voucherFileId: '501' })
+    expect(readPendingProcurement(JSON.stringify({ command: 'fees/additional', payload }))).toEqual({ command: 'fees/additional', payload })
+    expect(() => buildFinance('fees/additional', form, value, [], base, '')).toThrow('凭证')
+    form.additional.businessDate = '2999-01-01'
+    expect(() => buildFinance('fees/additional', form, value, [proof], base, '')).toThrow('真实业务日期')
+    delete value.purchaseFacts.purchased_at
+    expect(() => buildFinance('fees/additional', form, value, [proof], base, '')).toThrow('已发生购买')
+  })
+  it('prevents ordinary creation after initial confirmation', () => {
+    const value = detail(); value.operations.push({ action: 'CONFIRM_CHARGES' } as PlatformProcurement['operations'][number])
+    expect(() => buildFinance('charges/confirm', financeForm(value), value, [proof], base, '')).toThrow('首次核费后')
+    expect(feeRetryPermission({ ...fee(), confirmationOrigin: 'FINANCIAL' })).toContain('finance-adjust')
+  })
+
+  it('requires every fixed determination and does not treat missing values as zero', () => {
+    const value = detail(); const form = financeForm(value)
+    expect(() => buildFinance('charges/confirm', form, value, [proof], base, '')).toThrow('未知不能视为零元')
+    for (const row of form.fixed) Object.assign(row, { determination: 'ZERO', amount: '0.00', businessDate: '2020-01-04', reason: '明确免收' })
+    const payload = buildFinance('charges/confirm', form, value, [proof], base, '')
+    expect(payload.internationalFreight?.value?.determination).toBe('ZERO'); expect(payload.otherDetermination).toBe('NOT_APPLICABLE'); expect(payload.otherFees).toEqual([])
+    expect(readPendingProcurement(JSON.stringify({ command: 'charges/confirm', payload }))).toEqual({ command: 'charges/confirm', payload })
+  })
+  it('requires evidence for a positive amount and validates zero and not-applicable amounts', () => {
+    const value = detail(); const form = financeForm(value)
+    for (const row of form.fixed) Object.assign(row, { determination: 'NOT_APPLICABLE', amount: '0.00', businessDate: '2020-01-04', reason: '不适用' })
+    Object.assign(form.fixed[0], { determination: 'POSITIVE', amount: '10.01' })
+    expect(() => buildFinance('charges/confirm', form, value, [], base, '')).toThrow('费用凭证')
+    form.fixed[0].voucherFileId = '501'; const payload = buildFinance('charges/confirm', form, value, [proof], base, '')
+    expect(payload.internationalFreight?.value).toMatchObject({ amount: '10.01', voucherFileId: '501' })
+    form.fixed[1].amount = '2.00'; expect(() => buildFinance('charges/confirm', form, value, [proof], base, '')).toThrow('0.00')
+  })
+  it('reuses immutable existing fee versions without sending new charge values', () => {
+    const value = detail([fee('1', 'INTERNATIONAL_FREIGHT'), fee('2', 'DUTY'), fee('3', 'DOMESTIC_FREIGHT'), fee('4', 'OTHER')]); const form = financeForm(value)
+    const payload = buildFinance('charges/confirm', form, value, [proof], base, '')
+    expect(payload.internationalFreight).toEqual({ feeId: '1' }); expect(payload.duty).toEqual({ feeId: '2' }); expect(payload.domesticFreight).toEqual({ feeId: '3' }); expect(payload.otherFees?.[0].selection).toEqual({ feeId: '4' })
+    form.others = []; form.otherDetermination = 'NOT_APPLICABLE'; expect(() => buildFinance('charges/confirm', form, value, [proof], base, '')).toThrow('省略有效费用')
+  })
+  it('calculates a target using the original frozen rate and net successful chain only', () => {
+    const value = chain(); expect(targetPreview(value, value.fees[0], '12.00')).toEqual({ target: '84.00', net: '80.00', difference: '4.00' })
+    const form = financeForm(value); form.feeId = '1'; form.targetOriginalAmount = '12.00'
+    expect(buildFinance('fees/correct-target', form, value, [proof], base, '501')).toEqual({ ...base, feeId: '1', targetOriginalAmount: '12.00', voucherFileId: '501' })
+    expect(() => targetPreview(value, value.fees[1], '12.00')).toThrow('原实际费用')
+  })
+  it('treats actual international freight as the correction root even when it references the original estimate', () => {
+    const actual = { ...fee('2', 'INTERNATIONAL_FREIGHT'), parentFeeId: '1' }
+    const estimate = { ...fee('1', 'INTERNATIONAL_ESTIMATE'), amount: '100.00', walletStatus: 'SETTLED' }
+    const value = detail([estimate, actual]); const form = financeForm(value); form.feeId = '2'; form.targetOriginalAmount = '12.00'
+    expect(targetPreview(value, actual, '12.00')).toEqual({ target: '84.00', net: '70.00', difference: '14.00' })
+    expect(buildFinance('fees/correct-target', form, value, [proof], base, '501').feeId).toBe('2')
+  })
+  it('replaces only the latest terminated unpaid version using its frozen rate and preserves original amounts', () => {
+    const original = { ...fee('1', 'INTERNATIONAL_FREIGHT'), active: false, walletStatus: 'TERMINATED', walletLedgerId: null }
+    const value = detail([original]); const form = financeForm(value); form.feeId = '1'; form.targetOriginalAmount = '12.00'
+    expect(replacementPreview(value, original, '12.00')).toEqual({ target: '84.00', net: '0.00', difference: '84.00' })
+    const payload = buildFinance('fees/replace-failed', form, value, [proof], base, '501')
+    expect(payload).toEqual({ ...base, feeId: '1', targetOriginalAmount: '12.00', voucherFileId: '501' }); expect(readPendingProcurement(JSON.stringify({ command: 'fees/replace-failed', payload }))).not.toBeNull()
+    value.fees.push({ ...fee('2', 'INTERNATIONAL_FREIGHT'), feeVersion: 2, walletStatus: 'FREEZE_PENDING' })
+    expect(replacementCandidates(value)).toEqual([]); expect(original.amount).toBe('70.00')
+  })
+  it('keeps sample replacement within customer authorization and makes financial replacements retry under finance permission', () => {
+    const original = { ...fee('1', 'SAMPLE_PAYMENT'), active: false, walletStatus: 'RELEASED' }; const value = detail([original])
+    expect(() => replacementPreview(value, original, '12.00')).toThrow('客户授权预算')
+    value.customerView.budget.totalAmount = '100.00'; expect(replacementPreview(value, original, '12.00').target).toBe('84.00')
+    const replacement = { ...fee('2', 'SAMPLE_PAYMENT'), confirmationOrigin: 'FINANCIAL' as const, walletStatus: 'FREEZE_FAILED', feeVersion: 2 }; value.fees.push(replacement)
+    value.feeCorrections = [{ correctionNo: 'PC-1', rootFeeNo: 'PF-1', targetOriginalAmount: '12.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', targetAmount: '84.00', previousNetAmount: '0.00', differenceAmount: '84.00', feeNos: ['PF-2'] }]
+    expect(feeRetryPermission(replacement)).toBe('platform:overseas-business:purchase:finance-adjust')
+  })
+  it('preserves cent accuracy beyond JavaScript safe integers and rounds half up', () => {
+    const value = detail([fee()]); value.fees[0].exchangeRate = '1.000000'
+    expect(targetPreview(value, value.fees[0], '90071992547409.93')).toEqual({ target: '90071992547409.93', net: '70.00', difference: '90071992547339.93' })
+    value.fees[0].exchangeRate = '7.000000'; expect(() => targetPreview(value, value.fees[0], '90071992547409.93')).toThrow('超出支持范围')
+    value.fees[0].exchangeRate = '0.500000'; expect(targetPreview(value, value.fees[0], '0.01').target).toBe('0.01')
+  })
+  it('blocks a new target while any related adjustment remains unsettled or unlinked', () => {
+    const value = chain(); value.customerView.fees[1].sourceLinked = false
+    expect(() => targetPreview(value, value.fees[0], '12.00')).toThrow('未完成的调整')
+  })
+  it('caps refunds against the selected original consumption without borrowing another charge balance', () => {
+    const value = chain(); expect(refundAvailable(value, value.fees[0])).toBe(6000n); expect(refundAvailable(value, value.fees[1])).toBe(2000n)
+    const form = financeForm(value); form.feeId = '1'; form.refundAmount = '60.00'
+    const payload = buildFinance('fees/refund', form, value, [proof], base, '501'); expect(payload.amount).toBe('60.00')
+    expect(readPendingProcurement(JSON.stringify({ command: 'fees/refund', payload }))).not.toBeNull()
+    form.refundAmount = '60.01'; expect(() => buildFinance('fees/refund', form, value, [proof], base, '501')).toThrow('剩余可退')
+    form.refundAmount = '0.00'; expect(() => buildFinance('fees/refund', form, value, [proof], base, '501')).toThrow('正额')
+  })
+  it('selects retry permission by fee purpose and rejects unknown outcomes', () => {
+    const value = detail([{ ...fee('1', 'SAMPLE_PAYMENT'), walletStatus: 'FREEZE_FAILED' }]); const form = financeForm(value); form.feeId = '1'
+    expect(feeRetryPermission(value.fees[0])).toBe('platform:overseas-business:purchase:buy')
+    expect(buildFinance('fees/retry', form, value, [], base, '')).toEqual({ ...base, feeId: '1' })
+    value.fees[0].walletStatus = 'FREEZE_PENDING'; expect(() => buildFinance('fees/retry', form, value, [], base, '')).toThrow('未知结果')
+    expect(feeRetryPermission(fee('2', 'INTERNATIONAL_ESTIMATE'))).toContain(':estimate'); expect(feeRetryPermission(fee('3', 'REFUND'))).toContain(':finance-adjust')
+  })
+  it('only releases an effective estimate and does not construct a refund request', () => {
+    const value = detail([{ ...fee('1', 'INTERNATIONAL_ESTIMATE'), walletStatus: 'FROZEN' }]); const form = financeForm(value); form.feeId = '1'
+    expect(buildFinance('fees/release-estimate', form, value, [], base, '')).toEqual({ ...base, feeId: '1' })
+    value.fees[0].walletStatus = 'SETTLED'; expect(() => buildFinance('fees/release-estimate', form, value, [], base, '')).toThrow('有效预估')
+  })
+  it('rejects a persisted selection that mixes an existing reference and a new amount', () => {
+    const selection = { feeId: '1', value: { determination: 'ZERO', amount: '0.00', currency: 'CNY', businessDate: '2020-01-04', reason: '免费' } }
+    expect(() => readPendingProcurement(JSON.stringify({ command: 'charges/confirm', payload: { ...base, internationalFreight: selection, duty: selection, domesticFreight: selection, otherDetermination: 'NOT_APPLICABLE', otherFees: [] } }))).toThrow('ambiguous')
+  })
+})
diff --git a/src/modules/overseas-business/procurementFinanceForm.ts b/src/modules/overseas-business/procurementFinanceForm.ts
new file mode 100644
index 00000000..6eed7002
--- /dev/null
+++ b/src/modules/overseas-business/procurementFinanceForm.ts
@@ -0,0 +1,113 @@
+import type { PlatformProcurement, ProcurementInternalFee, ProcurementFile } from './procurementTypes'
+import type { ProcurementCommand, ProcurementCommandBody, ProcurementFeeSelection } from './api/procurementCommands'
+import { cents, decimal } from './procurementPresentation'
+export const financeCommands = new Set<ProcurementCommand>(['charges/confirm', 'fees/retry', 'fees/terminate', 'fees/release-estimate', 'fees/correct-target', 'fees/refund', 'fees/replace-failed', 'fees/additional'])
+export type ChargePurpose = 'INTERNATIONAL_FREIGHT' | 'DUTY' | 'DOMESTIC_FREIGHT' | 'OTHER'
+export interface ChargeDraft { purpose: ChargePurpose; code: string; name: string; mode: 'NEW' | 'EXISTING'; feeId: string; determination: '' | 'POSITIVE' | 'ZERO' | 'NOT_APPLICABLE'; amount: string; currency: 'CNY' | 'USD'; businessDate: string; voucherFileId: string; reason: string }
+export interface AdditionalDraft { name: string; amount: string; currency: 'CNY' | 'USD'; businessDate: string; voucherFileId: string }
+export interface FinanceForm { additional: AdditionalDraft; fixed: ChargeDraft[]; otherDetermination: 'NOT_APPLICABLE' | 'ITEMIZED'; others: ChargeDraft[]; feeId: string; targetOriginalAmount: string; refundAmount: string }
+const titles: Record<ChargePurpose, string> = { INTERNATIONAL_FREIGHT: '实际国际运费', DUTY: '关税', DOMESTIC_FREIGHT: '国内运费', OTHER: '其他费用' }
+export function chargeDraft(purpose: ChargePurpose, fee?: ProcurementInternalFee, code = ''): ChargeDraft { return { purpose, code: fee?.feeItemCode || code || purpose, name: fee?.feeItemName || titles[purpose], mode: fee ? 'EXISTING' : 'NEW', feeId: fee?.id || '', determination: '', amount: '', currency: 'CNY', businessDate: '', voucherFileId: '', reason: '' } }
+export function financeForm(detail: PlatformProcurement): FinanceForm { const fees = detail.fees.filter(row => row.active); const others = fees.filter(row => row.purpose === 'OTHER').map(row => chargeDraft('OTHER', row)); return { additional: { name: '', amount: '', currency: 'CNY', businessDate: '', voucherFileId: '' }, fixed: (['INTERNATIONAL_FREIGHT', 'DUTY', 'DOMESTIC_FREIGHT'] as const).map(purpose => chargeDraft(purpose, fees.find(row => row.purpose === purpose))), otherDetermination: others.length ? 'ITEMIZED' : 'NOT_APPLICABLE', others, feeId: '', targetOriginalAmount: '', refundAmount: '' } }
+export function feeRetryPermission(fee: ProcurementInternalFee) { return `platform:overseas-business:purchase:${fee.confirmationOrigin === 'FINANCIAL' ? 'finance-adjust' : fee.purpose === 'SAMPLE_PAYMENT' ? 'buy' : fee.purpose === 'INTERNATIONAL_ESTIMATE' ? 'estimate' : ['ADJUSTMENT', 'REFUND'].includes(fee.purpose) ? 'finance-adjust' : 'charge'}` }
+export function linked(detail: PlatformProcurement, fee: ProcurementInternalFee) { return detail.customerView.fees.some(row => row.feeNo === fee.feeNo && row.sourceLinked) }
+function feeAmount(fee: ProcurementInternalFee) { const amount = cents(fee.amount); if (amount === null || amount < 0n || fee.currency !== 'CNY') throw new Error('原费用人民币金额缺失，请先核对'); return amount }
+export function feeChain(detail: PlatformProcurement, selected: ProcurementInternalFee) {
+  const root = selected.purpose === 'ADJUSTMENT' ? detail.fees.find(row => row.id === selected.parentFeeId) : selected
+  if (!root || ['REFUND', 'ADJUSTMENT', 'INTERNATIONAL_ESTIMATE'].includes(root.purpose) || !root.active || !linked(detail, root)) throw new Error('原实际费用及来源关联尚未完成')
+  const originals = new Set([root.id, ...detail.fees.filter(row => row.purpose === 'ADJUSTMENT' && row.parentFeeId === root.id).map(row => row.id)])
+  const chain = detail.fees.filter(row => originals.has(row.id) || (row.purpose === 'REFUND' && !!row.parentFeeId && originals.has(row.parentFeeId)))
+  if (chain.some(row => row.active && !linked(detail, row))) throw new Error('该费用链仍有未完成的调整或退款，请先完成或终止原请求')
+  return chain
+}
+export function refundAvailable(detail: PlatformProcurement, fee: ProcurementInternalFee) {
+  feeChain(detail, fee)
+  if (fee.walletStatus !== 'SETTLED' || !fee.walletLedgerId || fee.purpose === 'INTERNATIONAL_ESTIMATE') throw new Error('退款必须关联已成功实扣的实际费用')
+  return feeAmount(fee) - detail.fees.filter(row => row.purpose === 'REFUND' && row.parentFeeId === fee.id && row.walletStatus === 'REFUNDED').reduce((sum, row) => sum + feeAmount(row), 0n)
+}
+export function replacementCandidates(detail: PlatformProcurement) {
+  return detail.fees.filter(fee => !fee.active && ['TERMINATED', 'RELEASED'].includes(fee.walletStatus) && !fee.sourceFeeId && !['INTERNATIONAL_ESTIMATE', 'ADJUSTMENT', 'REFUND'].includes(fee.purpose)
+    && !detail.fees.some(other => other.purpose === fee.purpose && other.feeItemCode === fee.feeItemCode && (other.active || other.feeVersion > fee.feeVersion)))
+}
+function frozenTarget(fee: ProcurementInternalFee, amount: string) {
+  const original = cents(amount); const rate = /^(\d+)(?:\.(\d{1,12}))?$/.exec(String(fee.exchangeRate))
+  if (original === null || original < 0n || !rate) throw new Error('请填写正确原币总额，并核对原汇率快照')
+  const denominator = 10n ** BigInt((rate[2] || '').length); const numerator = BigInt(rate[1] + (rate[2] || ''))
+  if (numerator <= 0n) throw new Error('原汇率快照无效')
+  const target = (original * numerator * 2n + denominator) / (2n * denominator)
+  if (target > 99999999999999999999n) throw new Error('折算人民币金额超出支持范围')
+  return target
+}
+export function replacementPreview(detail: PlatformProcurement, fee: ProcurementInternalFee, amount: string) {
+  if (!replacementCandidates(detail).some(row => row.id === fee.id)) throw new Error('须选择最新、已终止或释放且未实扣的实际费用')
+  const target = frozenTarget(fee, amount)
+  if (target > 9999999999999999n || cents(amount)! > 9999999999999999n) throw new Error('折算人民币或原币金额超出支持范围')
+  if (fee.purpose === 'SAMPLE_PAYMENT') {
+    const budget = detail.customerView.budget; const limit = cents(budget.totalAmount)
+    if (limit === null) throw new Error('客户预算尚未明确')
+    if ((budget.currency === fee.originalCurrency && cents(amount)! > limit) || (budget.currency === 'CNY' && target > limit)) throw new Error('替代货款超过客户授权预算，请先完成预算核验')
+  }
+  return { target: decimal(target), net: '0.00', difference: decimal(target) }
+}
+export function targetPreview(detail: PlatformProcurement, fee: ProcurementInternalFee, amount: string) {
+  if (['ADJUSTMENT', 'REFUND', 'INTERNATIONAL_ESTIMATE'].includes(fee.purpose)) throw new Error('目标更正须选择原实际费用')
+  const chain = feeChain(detail, fee); const target = frozenTarget(fee, amount)
+  const net = chain.reduce((sum, row) => row.walletStatus === 'SETTLED' ? sum + feeAmount(row) : row.walletStatus === 'REFUNDED' ? sum - feeAmount(row) : sum, 0n)
+  if (target - net > 9999999999999999n) throw new Error('追加人民币金额超出支持范围')
+  return { target: decimal(target), net: decimal(net), difference: decimal(target - net) }
+}
+function amount(value: string, positive = false) { const parsed = cents(value.trim()); if (!/^\d{1,16}(?:\.\d{1,2})?$/.test(value.trim()) || parsed === null || (positive ? parsed <= 0n : parsed < 0n)) throw new Error(positive ? '请填写正额金额，最多两位小数' : '请明确填写非负金额，最多两位小数'); return value.trim() }
+function select(draft: ChargeDraft, detail: PlatformProcurement, files: ProcurementFile[]): ProcurementFeeSelection {
+  if (draft.mode === 'NEW' && detail.operations.some(row => row.action === 'CONFIRM_CHARGES')) throw new Error('首次核费后只可引用已有费用，新发生或替代费用请使用财务操作')
+  if (draft.mode === 'EXISTING') {
+    if (!detail.fees.some(row => row.id === draft.feeId && row.active && row.purpose === draft.purpose && (draft.purpose !== 'OTHER' || row.feeItemCode === draft.code))) throw new Error(`${draft.name}引用的费用不是本单该用途的有效版本`)
+    return { feeId: draft.feeId }
+  }
+  if (detail.fees.some(row => row.active && row.purpose === draft.purpose && (draft.purpose !== 'OTHER' || row.feeItemCode === draft.code))) throw new Error(`${draft.name}已有有效费用，请引用原版本或先按权限更正`)
+  if (!draft.determination) throw new Error(`${draft.name}尚未明确核定，未知不能视为零元`)
+  const value = amount(draft.amount, draft.determination === 'POSITIVE')
+  if (draft.determination !== 'POSITIVE' && cents(value) !== 0n) throw new Error('零元或不适用必须明确记为 0.00')
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(draft.businessDate) || !Number.isFinite(Date.parse(draft.businessDate))) throw new Error(`请选择${draft.name}的业务日期`)
+  if (!draft.reason.trim() || draft.reason.trim().length > 500) throw new Error(`请填写${draft.name}的核定说明，最多 500 字`)
+  if (draft.determination === 'POSITIVE' && !files.some(file => file.fileId === draft.voucherFileId && file.category === 'VOUCHER')) throw new Error(`${draft.name}须关联本单费用凭证`)
+  return { value: { determination: draft.determination, amount: value, currency: draft.currency, businessDate: draft.businessDate, ...(draft.voucherFileId ? { voucherFileId: draft.voucherFileId } : {}), reason: draft.reason.trim() } }
+}
+export function buildFinance(command: ProcurementCommand, form: FinanceForm, detail: PlatformProcurement, files: ProcurementFile[], base: ProcurementCommandBody, voucherFileId: string): ProcurementCommandBody {
+  if (command === 'fees/additional') {
+    if (!detail.purchaseFacts.purchased_at) throw new Error('独立新增费用须关联已发生购买的订单')
+    const row = form.additional; const value = amount(row.amount, true)
+    if (!row.name.trim() || row.name.trim().length > 128) throw new Error('请填写独立费用名称，最多 128 字')
+    const now = new Date(); const today = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(row.businessDate) || !Number.isFinite(Date.parse(row.businessDate)) || row.businessDate > today) throw new Error('请选择已发生费用的真实业务日期')
+    if (!files.some(file => file.fileId === row.voucherFileId && file.category === 'VOUCHER')) throw new Error('请关联本单新增费用凭证')
+    if ((base.reason?.length || 0) > 500) throw new Error('新增费用说明最多 500 字')
+    return { ...base, name: row.name.trim(), amount: value, currency: row.currency, businessDate: row.businessDate, voucherFileId: row.voucherFileId }
+  }
+  if (command === 'charges/confirm') {
+    if (!detail.purchaseFacts.domestic_received_at) throw new Error('须完成国内收货后确认费用')
+    const fixed = (['INTERNATIONAL_FREIGHT', 'DUTY', 'DOMESTIC_FREIGHT'] as const).map(purpose => { const rows = form.fixed.filter(row => row.purpose === purpose); if (rows.length !== 1) throw new Error('固定费用项目不完整'); return select(rows[0], detail, files) })
+    if ((form.otherDetermination === 'NOT_APPLICABLE') !== (form.others.length === 0)) throw new Error('其他费用适用时须逐项核定，不适用时不保留收费行')
+    const codes = new Set<string>()
+    const otherFees = form.others.map(row => { if (!/^[A-Z][A-Z0-9_]{0,31}$/.test(row.code) || codes.has(row.code) || !row.name.trim() || row.name.trim().length > 128) throw new Error('其他费用名称必填且项目不可重复'); codes.add(row.code); return { code: row.code, name: row.name.trim(), selection: select(row, detail, files) } })
+    const selected = new Set([...fixed, ...otherFees.map(row => row.selection)].map(row => row.feeId).filter(Boolean))
+    if (detail.fees.some(row => row.active && ['INTERNATIONAL_FREIGHT', 'DUTY', 'DOMESTIC_FREIGHT', 'OTHER'].includes(row.purpose) && !selected.has(row.id))) throw new Error('不能通过省略有效费用隐藏原收费')
+    return { ...base, internationalFreight: fixed[0], duty: fixed[1], domesticFreight: fixed[2], otherDetermination: form.otherDetermination, otherFees }
+  }
+  const fee = detail.fees.find(row => row.id === form.feeId); if (!fee) throw new Error('请选择本单费用')
+  const common = { ...base, feeId: fee.id }
+  if (command === 'fees/retry' || command === 'fees/terminate') {
+    if (!fee.active || !fee.walletStatus.endsWith('_FAILED')) throw new Error('仅能处理资金结果已明确失败的有效费用，未知结果不能新建重试')
+    return common
+  }
+  if (command === 'fees/release-estimate') {
+    if (!fee.active || fee.purpose !== 'INTERNATIONAL_ESTIMATE' || !['FROZEN', 'ZERO'].includes(fee.walletStatus)) throw new Error('仅能释放已冻结或已确认零元的有效预估')
+    return common
+  }
+  if (!files.some(file => file.fileId === voucherFileId && file.category === 'VOUCHER')) throw new Error('请关联本单财务更正凭证')
+  if ((base.reason?.length || 0) > 500) throw new Error('财务更正说明最多 500 字')
+  if (command === 'fees/replace-failed') { const targetOriginalAmount = amount(form.targetOriginalAmount); replacementPreview(detail, fee, targetOriginalAmount); return { ...common, targetOriginalAmount, voucherFileId } }
+  if (command === 'fees/correct-target') { const targetOriginalAmount = amount(form.targetOriginalAmount); targetPreview(detail, fee, targetOriginalAmount); return { ...common, targetOriginalAmount, voucherFileId } }
+  const refund = amount(form.refundAmount, true)
+  if (cents(refund)! > refundAvailable(detail, fee)) throw new Error('退款超过该原扣款的剩余可退金额')
+  return { ...common, amount: refund, voucherFileId }
+}
diff --git a/src/modules/overseas-business/procurementPending.ts b/src/modules/overseas-business/procurementPending.ts
new file mode 100644
index 00000000..0c5f10e9
--- /dev/null
+++ b/src/modules/overseas-business/procurementPending.ts
@@ -0,0 +1,132 @@
+import { isAxiosError } from 'axios'
+import { ApiResponseError } from '@/shared/api/http'
+import type { ProcurementCommand, ProcurementCommandBody } from './api/procurementCommands'
+export interface PendingProcurement { command: ProcurementCommand; payload: ProcurementCommandBody }
+const commands = new Set(['review', 'purchase', 'purchase/confirm', 'budget-authorizations', 'planned-warehouse', 'cancel', 'overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'packing', 'packing/confirm', 'packing/withdraw', 'dispositions', 'receipts/correct', 'dispositions/revoke', 'labels', 'international-estimate', 'labels/apply', 'domestic-repack', 'overseas-shipment', 'customer-shipment', 'charges/confirm', 'fees/retry', 'fees/terminate', 'fees/release-estimate', 'fees/correct-target', 'fees/refund', 'fees/replace-failed', 'fees/additional', 'control-notes', 'control-notes/resolve', 'actual-warehouse/correct', 'exception-close'])
+export function commandKey() {
+  const bytes = new Uint8Array(16); globalThis.crypto.getRandomValues(bytes)
+  return Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('')
+}
+export function readPendingProcurement(raw: string | null): PendingProcurement | null {
+  if (raw === null) return null
+  const value: unknown = JSON.parse(raw)
+  if (!value || typeof value !== 'object' || !('command' in value) || !('payload' in value) || !commands.has(String(value.command))) throw new Error('invalid pending command')
+  const payload = value.payload
+  if (!payload || typeof payload !== 'object' || !('version' in payload) || !Number.isSafeInteger(payload.version) || Number(payload.version) < 0 || !('idempotencyKey' in payload) || typeof payload.idempotencyKey !== 'string' || !payload.idempotencyKey) throw new Error('invalid pending payload')
+  const fields = new Set(['version', 'idempotencyKey', 'reason', 'decision', 'remark', 'purchaseWarehouseId', 'warehouseId', 'productName', 'specification', 'quantity', 'amount', 'currency', 'purchasedAt', 'estimatedArrivalAt', 'voucherFileId', 'leg', 'sourceCartonId', 'receiptId', 'dispositionId', 'goodQuantity', 'damagedQuantity', 'extraQuantity', 'receivedAt', 'kind', 'packingVersion', 'cartons', 'labelVersion', 'receiver', 'addressVoucherFileId', 'labels', 'cartonIds', 'businessDate', 'appliedAt', 'shippedAt', 'cartonId', 'lengthCm', 'widthCm', 'heightCm', 'grossWeightKg', 'feeId', 'targetOriginalAmount', 'internationalFreight', 'duty', 'domesticFreight', 'otherDetermination', 'otherFees', 'targetType', 'targetId', 'blocking', 'clientSummary', 'noteId', 'resolutions', 'customerVoucherFileId', 'financialConclusion', 'name'])
+  const body = payload as Record<string, unknown>
+  if (Object.keys(body).some(field => !fields.has(field))) throw new Error('unexpected pending field')
+  const nonempty = (field: string) => typeof body[field] === 'string' && !!body[field].trim()
+  const positiveId = (field: string) => nonempty(field) && /^[1-9]\d*$/.test(String(body[field]))
+  if (value.command === 'review') {
+    if (!['APPROVE', 'REJECT'].includes(String(body.decision)) || (body.decision === 'APPROVE' && !positiveId('purchaseWarehouseId'))) throw new Error('invalid pending review')
+  } else if (!nonempty('reason')) throw new Error('missing pending reason')
+  if (value.command === 'planned-warehouse' && !positiveId('warehouseId')) throw new Error('invalid pending warehouse')
+  if (['purchase', 'budget-authorizations'].includes(String(value.command))) {
+    if (!/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || !['CNY', 'USD'].includes(String(body.currency)) || !positiveId('voucherFileId')) throw new Error('invalid pending amount')
+  }
+  if (value.command === 'purchase' && (!nonempty('productName') || !Number.isSafeInteger(body.quantity) || Number(body.quantity) < 1 || !nonempty('purchasedAt') || !nonempty('estimatedArrivalAt'))) throw new Error('invalid pending purchase')
+  const count = (field: string, minimum: number) => Number.isSafeInteger(body[field]) && Number(body[field]) >= minimum
+  if (['overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'receipts/correct', 'dispositions'].includes(String(value.command))) {
+    if (!['OVERSEAS', 'DOMESTIC'].includes(String(body.leg))) throw new Error('invalid receipt leg')
+    if ((String(value.command).startsWith('overseas') && body.leg !== 'OVERSEAS') || (String(value.command).startsWith('domestic') && body.leg !== 'DOMESTIC')) throw new Error('wrong receipt endpoint')
+  }
+  if (['overseas-receipts', 'domestic-receipts', 'receipts/correct'].includes(String(value.command))) {
+    if (!['goodQuantity', 'damagedQuantity', 'extraQuantity'].every(field => count(field, 0)) || Number(body.goodQuantity) + Number(body.damagedQuantity) + Number(body.extraQuantity) <= 0 || !nonempty('receivedAt')) throw new Error('invalid pending receipt')
+    if (body.leg === 'OVERSEAS' ? !positiveId('warehouseId') || body.sourceCartonId != null : !positiveId('sourceCartonId') || body.warehouseId != null) throw new Error('invalid receipt source')
+  }
+  if (['receipts/correct', 'dispositions', 'dispositions/revoke'].includes(String(value.command)) && !positiveId('voucherFileId')) throw new Error('missing correction evidence')
+  if (value.command === 'receipts/correct' && !positiveId('receiptId')) throw new Error('missing original receipt')
+  if (value.command === 'dispositions/revoke' && !positiveId('dispositionId')) throw new Error('missing original disposition')
+  if (value.command === 'dispositions') {
+    const decisions: Record<string, string> = { SHORTAGE: 'ACCEPT_SHORTAGE', DAMAGED: 'DISPOSE_DAMAGED', EXTRA: 'RETURN_EXTRA' }
+    if (!count('quantity', 1) || !decisions[String(body.kind)] || decisions[String(body.kind)] !== body.decision || (body.kind !== 'SHORTAGE' && !positiveId('receiptId')) || (body.kind === 'SHORTAGE' && body.receiptId != null) || (body.leg === 'DOMESTIC' && !positiveId('sourceCartonId'))) throw new Error('invalid pending disposition')
+  }
+  if (value.command === 'packing/confirm' && !count('packingVersion', 1)) throw new Error('invalid packing version')
+  if (value.command === 'packing') {
+    if (!Array.isArray(body.cartons) || !body.cartons.length) throw new Error('missing packing list')
+    const names = new Set<string>()
+    for (const item of body.cartons) {
+      if (!item || typeof item !== 'object' || typeof item.cartonNo !== 'string' || !item.cartonNo.trim() || names.has(item.cartonNo) || Object.keys(item).some(key => !['cartonNo', 'lengthCm', 'widthCm', 'heightCm', 'grossWeightKg', 'sources'].includes(key))) throw new Error('invalid packing carton')
+      names.add(item.cartonNo)
+      for (const field of ['lengthCm', 'widthCm', 'heightCm', 'grossWeightKg']) {
+        const pattern = field === 'grossWeightKg' ? /^\d{1,9}(?:\.\d{1,3})?$/ : /^\d{1,10}(?:\.\d{1,2})?$/
+        if (typeof item[field] !== 'string' || !pattern.test(item[field]) || Number(item[field]) <= 0) throw new Error('invalid packing measurement')
+      }
+      if (!Array.isArray(item.sources) || !item.sources.length || item.sources.some((source: unknown) => {
+        if (!source || typeof source !== 'object') return true
+        const row = source as Record<string, unknown>
+        return Object.keys(row).some(key => !['receiptId', 'quantity'].includes(key)) || typeof row.receiptId !== 'string' || !/^[1-9]\d*$/.test(row.receiptId) || !Number.isSafeInteger(row.quantity) || Number(row.quantity) < 1
+      })) throw new Error('invalid packing source')
+    }
+  }
+  if (value.command === 'labels') {
+    const receiver = body.receiver
+    if (!count('packingVersion', 1) || !['OVERSEAS', 'DOMESTIC'].includes(String(body.leg)) || !receiver || typeof receiver !== 'object' || !['name', 'phone', 'address'].every(key => typeof (receiver as Record<string, unknown>)[key] === 'string' && String((receiver as Record<string, unknown>)[key]).trim())) throw new Error('invalid label address')
+    if (!Array.isArray(body.labels) || !body.labels.length) throw new Error('missing labels')
+    const cartonIds = new Set<string>()
+    for (const row of body.labels) {
+      if (!row || typeof row !== 'object' || typeof row.cartonId !== 'string' || !/^[1-9]\d*$/.test(row.cartonId) || typeof row.fileId !== 'string' || !/^[1-9]\d*$/.test(row.fileId) || !Number.isSafeInteger(row.page) || row.page < 1 || !row.carrier?.trim() || !row.trackingNo?.trim() || cartonIds.has(row.cartonId)) throw new Error('invalid label association')
+      cartonIds.add(row.cartonId)
+    }
+  }
+  if (value.command === 'international-estimate' && (!count('labelVersion', 1) || !/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || !nonempty('businessDate'))) throw new Error('invalid pending estimate')
+  if (['labels/apply', 'overseas-shipment', 'customer-shipment'].includes(String(value.command))) {
+    if (!count('labelVersion', 1) || !Array.isArray(body.cartonIds) || !body.cartonIds.length || body.cartonIds.some(id => typeof id !== 'string' || !/^[1-9]\d*$/.test(id)) || new Set(body.cartonIds).size !== body.cartonIds.length) throw new Error('invalid transport cartons')
+    if (!nonempty(value.command === 'labels/apply' ? 'appliedAt' : 'shippedAt')) throw new Error('missing actual transport time')
+    if ((value.command === 'overseas-shipment' && body.leg !== 'OVERSEAS') || (value.command === 'customer-shipment' && body.leg !== 'DOMESTIC')) throw new Error('wrong shipment leg')
+  }
+  if (value.command === 'domestic-repack') {
+    if (!positiveId('cartonId') || !positiveId('voucherFileId')) throw new Error('invalid repack reference')
+    for (const field of ['lengthCm', 'widthCm', 'heightCm', 'grossWeightKg']) {
+      const pattern = field === 'grossWeightKg' ? /^\d{1,9}(?:\.\d{1,3})?$/ : /^\d{1,10}(?:\.\d{1,2})?$/
+      if (typeof body[field] !== 'string' || !pattern.test(String(body[field])) || Number(body[field]) <= 0) throw new Error('invalid repack measurement')
+    }
+  }
+  if (String(value.command).startsWith('fees/') && value.command !== 'fees/additional') {
+    if (!positiveId('feeId')) throw new Error('invalid original fee')
+    if (['fees/correct-target', 'fees/refund', 'fees/replace-failed'].includes(String(value.command)) && !positiveId('voucherFileId')) throw new Error('missing finance evidence')
+    if (['fees/correct-target', 'fees/replace-failed'].includes(String(value.command)) && !/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.targetOriginalAmount))) throw new Error('invalid correction target')
+    if (value.command === 'fees/refund' && (!/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || Number(body.amount) <= 0)) throw new Error('invalid refund amount')
+  }
+  if (value.command === 'charges/confirm') {
+    const selection = (input: unknown) => {
+      if (!input || typeof input !== 'object') throw new Error('missing fee determination')
+      const item = input as Record<string, unknown>
+      if ((item.feeId == null) === (item.value == null) || Object.keys(item).some(key => !['feeId', 'value'].includes(key))) throw new Error('ambiguous fee determination')
+      if (item.feeId != null) { if (typeof item.feeId !== 'string' || !/^[1-9]\d*$/.test(item.feeId)) throw new Error('invalid fee reference'); return }
+      if (!item.value || typeof item.value !== 'object') throw new Error('invalid fee amount')
+      const value = item.value as Record<string, unknown>
+      if (Object.keys(value).some(key => !['determination', 'amount', 'currency', 'businessDate', 'voucherFileId', 'reason'].includes(key))) throw new Error('unexpected fee amount field')
+      if (!['POSITIVE', 'ZERO', 'NOT_APPLICABLE'].includes(String(value.determination)) || typeof value.amount !== 'string' || !/^\d{1,16}(?:\.\d{1,2})?$/.test(value.amount) || (value.determination === 'POSITIVE' ? Number(value.amount) <= 0 : Number(value.amount) !== 0) || !['CNY', 'USD'].includes(String(value.currency)) || typeof value.businessDate !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(value.businessDate) || typeof value.reason !== 'string' || !value.reason.trim()) throw new Error('invalid fee determination value')
+      if (value.determination === 'POSITIVE' && (typeof value.voucherFileId !== 'string' || !/^[1-9]\d*$/.test(value.voucherFileId))) throw new Error('missing fee voucher')
+    }
+    for (const key of ['internationalFreight', 'duty', 'domesticFreight']) selection(body[key])
+    if (!['NOT_APPLICABLE', 'ITEMIZED'].includes(String(body.otherDetermination)) || !Array.isArray(body.otherFees) || (body.otherDetermination === 'NOT_APPLICABLE') !== (body.otherFees.length === 0)) throw new Error('invalid other fee determination')
+    const codes = new Set<string>()
+    for (const row of body.otherFees) {
+      if (!row || typeof row !== 'object' || typeof row.code !== 'string' || !/^[A-Z][A-Z0-9_]{0,31}$/.test(row.code) || codes.has(row.code) || typeof row.name !== 'string' || !row.name.trim()) throw new Error('invalid other fee')
+      codes.add(row.code); selection(row.selection)
+    }
+  }
+  if (['control-notes', 'control-notes/resolve', 'actual-warehouse/correct'].includes(String(value.command)) && !positiveId('voucherFileId')) throw new Error('missing control evidence')
+  if (value.command === 'control-notes' && (!['PURCHASE', 'WAREHOUSE', 'RECEIPT', 'SHIPMENT'].includes(String(body.targetType)) || typeof body.blocking !== 'boolean' || (body.targetType === 'PURCHASE' ? body.targetId != null : !positiveId('targetId')))) throw new Error('invalid control target')
+  if (value.command === 'control-notes/resolve' && !positiveId('noteId')) throw new Error('missing original blocker')
+  if (value.command === 'actual-warehouse/correct' && !positiveId('warehouseId')) throw new Error('invalid actual warehouse')
+  if (value.command === 'exception-close') {
+    if (!positiveId('customerVoucherFileId') || !nonempty('financialConclusion') || !nonempty('clientSummary') || !Array.isArray(body.resolutions)) throw new Error('incomplete closure facts')
+    const decisions: Record<string, string[]> = { PURCHASE_REMAINDER: ['SUPPLIER_RETAINED', 'RETURNED_TO_SUPPLIER', 'LOSS_CONFIRMED'], TRANSIT_REMAINDER: ['LOSS_CONFIRMED', 'RETURNED_TO_SENDER'], GOOD: ['RETURNED_TO_SUPPLIER', 'CUSTOMER_AUTHORIZED_RETENTION', 'DISPOSED'], DAMAGED: ['DISPOSED', 'RETURNED_TO_SUPPLIER'], EXTRA: ['RETURNED_TO_SUPPLIER'] }
+    const sources = new Set<string>()
+    for (const row of body.resolutions) {
+      if (!row || typeof row !== 'object' || !decisions[row.kind]?.includes(row.decision) || !Number.isSafeInteger(row.quantity) || row.quantity < 1 || typeof row.destination !== 'string' || !row.destination.trim() || typeof row.voucherFileId !== 'string' || !/^[1-9]\d*$/.test(row.voucherFileId) || (row.kind === 'PURCHASE_REMAINDER' ? row.sourceId != null : typeof row.sourceId !== 'string' || !/^[1-9]\d*$/.test(row.sourceId))) throw new Error('invalid closure resolution')
+      const key = `${row.kind}:${row.sourceId ?? ''}`; if (sources.has(key)) throw new Error('duplicate closure source'); sources.add(key)
+    }
+  }
+  if (value.command === 'fees/additional' && (!nonempty('name') || !nonempty('businessDate') || !['CNY', 'USD'].includes(String(body.currency)) || !/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || Number(body.amount) <= 0 || !positiveId('voucherFileId'))) throw new Error('invalid independent financial fee')
+  return value as PendingProcurement
+}
+export function definitelyRejected(error: unknown) {
+  const status = error instanceof ApiResponseError ? error.status : isAxiosError(error) ? error.response?.status : undefined
+  const code = error instanceof ApiResponseError ? error.code : ''
+  return [400, 401, 403, 404, 409, 422].includes(status ?? 0) || ['A0400', 'A0401', 'A0403', 'A0404', 'A0409', 'A0422'].includes(code)
+}
diff --git a/src/modules/overseas-business/procurementPhysicalForm.test.ts b/src/modules/overseas-business/procurementPhysicalForm.test.ts
new file mode 100644
index 00000000..8c516040
--- /dev/null
+++ b/src/modules/overseas-business/procurementPhysicalForm.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest'
+import { buildPacking, buildPhysical, physicalForm, shippedCartons } from './procurementPhysicalForm'
+import { readPendingProcurement } from './procurementPending'
+import type { PlatformProcurement } from './procurementTypes'
+const base = { version: 7, idempotencyKey: 'physical-one', reason: '现场核对' }
+function detail(): PlatformProcurement {
+  return {
+    customerView: { order: { id: '1', orderNo: 'OP-1', customerId: '10001', customerName: '客户', purchaseCategory: '样品', productName: '外套', productSpecification: null, productUrl: null, purchaseQuantity: 10, budgetUnitPrice: '1.00', currency: 'CNY', receivingAddress: '深圳', contactName: '收件人', contactPhone: '13800000000', estimatedArrivalAt: null, plannedWarehouseName: '海外仓', actualWarehouseName: '海外仓', actualWarehouseCode: 'LAX', status: 'OVERSEAS_RECEIVING', version: 7, createdAt: '', updatedAt: '' }, budget: { totalAmount: '10.00', currency: 'CNY', authorizedAt: null }, purchased: true, purchaseConfirmed: true, purchaseNeedsAttention: false, progress: [], boxes: [], shipments: [{ shipmentNo: 'PS-1', leg: 'OVERSEAS', cartonNo: 'C1', quantity: 5, shippedAt: '2020-01-03T10:00:00', carrier: 'UPS', trackingNo: 'TRACK-1' }], fees: [], exceptionSummaries: [] },
+    purchaseFacts: { actual_warehouse_id: '20', purchased_quantity: 10, purchased_at: '2020-01-01T10:00:00', overseas_shipped_at: '2020-01-03T10:00:00' },
+    physical: { receipts: [{ id: '11', receiptNo: 'PR-11', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 6, damagedQuantity: 1, extraQuantity: 2, receivedAt: '2020-01-02T10:00:00', active: true }, { id: '12', receiptNo: 'PR-12', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 3, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-02T12:00:00', active: true }], dispositions: [], packingVersion: 2, packingStatus: 'DRAFT', cartons: [{ id: '31', cartonNo: 'C1', quantity: 5, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.234', sources: [{ receiptId: '11', quantity: 5 }] }, { id: '32', cartonNo: 'C2', quantity: 4, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.234', sources: [{ receiptId: '11', quantity: 1 }, { receiptId: '12', quantity: 3 }] }] },
+    transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], reviewHistory: [], operations: [], actions: [], internalRemark: null,
+  }
+}
+describe('procurement physical request validation', () => {
+  it('builds multi-carton allocations with exact dimensions, retaining independent source references', () => {
+    const value = detail(); const form = physicalForm(value)
+    const payload = buildPhysical('packing', form, value, base, '', '')
+    expect(payload.cartons?.[1].sources).toEqual([{ receiptId: '11', quantity: 1 }, { receiptId: '12', quantity: 3 }])
+    expect(payload.cartons?.[0].grossWeightKg).toBe('1.234')
+    expect(readPendingProcurement(JSON.stringify({ command: 'packing', payload }))).toEqual({ command: 'packing', payload })
+    form.cartons[0].sources[0].quantity = 1
+    expect(payload.cartons?.[0].sources[0].quantity).toBe(5)
+  })
+  it('rejects repeated boxes, duplicate same-box sources, missing sources and cross-box over-allocation', () => {
+    const value = detail(); let boxes = physicalForm(value).cartons
+    boxes[1].cartonNo = 'C1'; expect(() => buildPacking(boxes, value)).toThrow('箱号')
+    boxes = physicalForm(value).cartons; boxes[0].sources.push({ receiptId: '11', quantity: 1 }); expect(() => buildPacking(boxes, value)).toThrow('同箱来源不可重复')
+    boxes = physicalForm(value).cartons; boxes[0].sources = []; expect(() => buildPacking(boxes, value)).toThrow('每箱必须')
+    boxes = physicalForm(value).cartons; boxes[0].sources[0].quantity = 6; expect(() => buildPacking(boxes, value)).toThrow('超过实收 PR-11')
+  })
+  it('rejects fractional pieces, inactive receipts and excessive measurement precision', () => {
+    const value = detail(); let boxes = physicalForm(value).cartons
+    boxes[0].sources[0].quantity = 1.5; expect(() => buildPacking(boxes, value)).toThrow('整数')
+    boxes = physicalForm(value).cartons; boxes[0].lengthCm = '10.001'; expect(() => buildPacking(boxes, value)).toThrow('最多 2 位')
+    boxes = physicalForm(value).cartons; boxes[0].grossWeightKg = '1.0001'; expect(() => buildPacking(boxes, value)).toThrow('最多 3 位')
+    value.physical.receipts[0].active = false; expect(() => buildPacking(physicalForm(value).cartons, value)).toThrow('有效海外实收')
+  })
+  it('requires domestic receipts to use an actually shipped original carton and excludes unshipped boxes', () => {
+    const value = detail(); const form = physicalForm(); form.leg = 'DOMESTIC'; form.receivedAt = '2020-01-04T10:00:00'; form.goodQuantity = 3
+    expect(shippedCartons(value).map(row => row.cartonNo)).toEqual(['C1'])
+    form.sourceCartonId = '32'; expect(() => buildPhysical('domestic-receipts', form, value, base, '', '')).toThrow('已国际交寄')
+    form.sourceCartonId = '31'; const payload = buildPhysical('domestic-receipts', form, value, base, '', '')
+    expect(payload).toMatchObject({ leg: 'DOMESTIC', sourceCartonId: '31', goodQuantity: 3, damagedQuantity: 0, extraQuantity: 0 }); expect(payload).not.toHaveProperty('warehouseId')
+    expect(readPendingProcurement(JSON.stringify({ command: 'domestic-receipts', payload }))).not.toBeNull()
+    value.physical.receipts.push({ id: '13', receiptNo: 'PR-13', leg: 'DOMESTIC', sourceCartonId: '31', goodQuantity: 4, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-04T10:00:00', active: true })
+    expect(() => buildPhysical('domestic-receipts', form, value, base, '', '')).toThrow('超过来源件数')
+  })
+  it('preserves the fixed overseas warehouse, rejects future receipts and keeps extras separate', () => {
+    const value = detail(); value.physical.receipts = []; const form = physicalForm(); form.goodQuantity = 8; form.damagedQuantity = 2; form.extraQuantity = 3; form.receivedAt = '2020-01-02T10:00:00'
+    expect(() => buildPhysical('overseas-receipts', form, value, base, 'other', '')).toThrow('已冻结')
+    expect(buildPhysical('overseas-receipts', form, value, base, '20', '')).toMatchObject({ goodQuantity: 8, damagedQuantity: 2, extraQuantity: 3, warehouseId: '20' })
+    form.receivedAt = '2999-01-01T10:00:00'; expect(() => buildPhysical('overseas-receipts', form, value, base, '20', '')).toThrow('真实实收时间')
+  })
+  it('binds a damaged disposition to its receipt and prevents repeat disposal', () => {
+    const value = detail(); const form = physicalForm(); form.kind = 'DAMAGED'; form.receiptId = '11'; form.quantity = 1
+    const payload = buildPhysical('dispositions', form, value, base, '', '901')
+    expect(payload).toMatchObject({ kind: 'DAMAGED', decision: 'DISPOSE_DAMAGED', receiptId: '11', quantity: 1, voucherFileId: '901' })
+    expect(readPendingProcurement(JSON.stringify({ command: 'dispositions', payload }))).not.toBeNull()
+    value.physical.dispositions.push({ id: '71', leg: 'OVERSEAS', source_carton_id: null, receipt_id: '11', kind: 'DAMAGED', decision: 'DISPOSE_DAMAGED', quantity: 1, voucher_file_id: '901', reason: '已处置', active: true, created_at: '' })
+    expect(() => buildPhysical('dispositions', form, value, base, '', '901')).toThrow('未处理差异')
+  })
+  it('binds shortage to the purchase instead of fabricating a receipt', () => {
+    const value = detail(); value.physical.receipts.pop(); const form = physicalForm(); form.kind = 'SHORTAGE'; form.quantity = 3; form.receiptId = 'stale'
+    const payload = buildPhysical('dispositions', form, value, base, '', '901')
+    expect(payload).toMatchObject({ kind: 'SHORTAGE', decision: 'ACCEPT_SHORTAGE', quantity: 3 }); expect(payload).not.toHaveProperty('receiptId')
+  })
+  it('corrects an original receipt without counting it twice or moving its origin', () => {
+    const value = detail(); const form = physicalForm(); form.receiptId = '11'; form.leg = 'DOMESTIC'; form.sourceCartonId = '31'; form.goodQuantity = 5; form.damagedQuantity = 1; form.receivedAt = '2020-01-02T10:00:00'
+    const payload = buildPhysical('receipts/correct', form, value, base, '20', '901')
+    expect(payload).toMatchObject({ receiptId: '11', leg: 'OVERSEAS', goodQuantity: 5 }); expect(payload).not.toHaveProperty('sourceCartonId')
+    expect(readPendingProcurement(JSON.stringify({ command: 'receipts/correct', payload }))).not.toBeNull()
+  })
+  it('confirms the exact draft version and rejects malformed persisted packing before replay', () => {
+    const value = detail(); const form = physicalForm(value)
+    expect(buildPhysical('packing/confirm', form, value, base, '', '')).toEqual({ ...base, packingVersion: 2 })
+    value.physical.packingStatus = 'CONFIRMED'; expect(() => buildPhysical('packing/confirm', form, value, base, '', '')).toThrow('装箱草稿')
+    const payload = { ...base, cartons: [{ cartonNo: 'C1', lengthCm: '1', widthCm: '1', heightCm: '1', grossWeightKg: '1', sources: [{ receiptId: '11', quantity: 0 }] }] }
+    expect(() => readPendingProcurement(JSON.stringify({ command: 'packing', payload }))).toThrow('packing source')
+  })
+})
diff --git a/src/modules/overseas-business/procurementPhysicalForm.ts b/src/modules/overseas-business/procurementPhysicalForm.ts
new file mode 100644
index 00000000..422b492c
--- /dev/null
+++ b/src/modules/overseas-business/procurementPhysicalForm.ts
@@ -0,0 +1,76 @@
+import type { PlatformProcurement } from './procurementTypes'
+import type { ProcurementCommand, ProcurementCommandBody, ProcurementPackingCarton } from './api/procurementCommands'
+export type Leg = 'OVERSEAS' | 'DOMESTIC'
+export const physicalCommands = new Set<ProcurementCommand>(['overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'packing', 'packing/confirm', 'packing/withdraw', 'dispositions', 'receipts/correct', 'dispositions/revoke'])
+export interface PackingDraft { cartonNo: string; lengthCm: string; widthCm: string; heightCm: string; grossWeightKg: string; sources: { receiptId: string; quantity: number | undefined }[] }
+export interface PhysicalForm { leg: Leg; sourceCartonId: string; receiptId: string; dispositionId: string; goodQuantity: number | undefined; damagedQuantity: number | undefined; extraQuantity: number | undefined; receivedAt: string; kind: 'SHORTAGE' | 'DAMAGED' | 'EXTRA'; quantity: number | undefined; cartons: PackingDraft[] }
+export function newCarton(): PackingDraft { return { cartonNo: '', lengthCm: '', widthCm: '', heightCm: '', grossWeightKg: '', sources: [{ receiptId: '', quantity: undefined }] } }
+export function physicalForm(detail?: PlatformProcurement): PhysicalForm { return { leg: 'OVERSEAS', sourceCartonId: '', receiptId: '', dispositionId: '', goodQuantity: 0, damagedQuantity: 0, extraQuantity: 0, receivedAt: '', kind: 'SHORTAGE', quantity: undefined, cartons: detail?.physical.cartons.length ? detail.physical.cartons.map(row => ({ cartonNo: row.cartonNo, lengthCm: String(row.lengthCm), widthCm: String(row.widthCm), heightCm: String(row.heightCm), grossWeightKg: String(row.grossWeightKg), sources: row.sources.map(source => ({ ...source })) })) : [newCarton()] } }
+export function shippedCartons(detail: PlatformProcurement) { const numbers = new Set(detail.customerView.shipments.filter(row => row.leg === 'OVERSEAS').map(row => row.cartonNo)); return detail.physical.cartons.filter(row => numbers.has(row.cartonNo)) }
+export function whole(value: number | undefined, label: string, min = 0): number { if (value === undefined || !Number.isSafeInteger(value) || value < min) throw new Error(`${label}必须为${min ? '正' : '非负'}整数`); return value }
+export function dimension(value: string, label: string, scale: number, digits: number) { if (!new RegExp(`^\\d{1,${digits}}(?:\\.\\d{1,${scale}})?$`).test(value.trim()) || Number(value) <= 0) throw new Error(`${label}必须为正数，最多 ${scale} 位小数`); return value.trim() }
+export function buildPacking(cartons: PackingDraft[], detail: PlatformProcurement): ProcurementPackingCarton[] {
+  if (!cartons.length) throw new Error('请至少建立一个装货箱')
+  const used = new Map<string, number>(); const names = new Set<string>()
+  return cartons.map(carton => {
+    const cartonNo = carton.cartonNo.trim(); if (!cartonNo || cartonNo.length > 64 || names.has(cartonNo)) throw new Error('箱号必填、不可重复且不超过 64 个字符'); names.add(cartonNo)
+    if (!carton.sources.length) throw new Error('每箱必须分配实收来源')
+    const inCarton = new Set<string>()
+    const sources = carton.sources.map(source => {
+      const receipt = detail.physical.receipts.find(row => row.id === source.receiptId && row.active && row.leg === 'OVERSEAS')
+      if (!receipt || inCarton.has(source.receiptId)) throw new Error('请选择有效海外实收来源，同箱来源不可重复')
+      inCarton.add(source.receiptId)
+      const quantity = whole(source.quantity, '装箱件数', 1); const total = (used.get(source.receiptId) || 0) + quantity
+      if (!Number.isSafeInteger(total) || total > receipt.goodQuantity) throw new Error(`装箱件数超过实收 ${receipt.receiptNo} 的合格数量`)
+      used.set(source.receiptId, total); return { receiptId: source.receiptId, quantity }
+    })
+    return { cartonNo, lengthCm: dimension(carton.lengthCm, '长', 2, 10), widthCm: dimension(carton.widthCm, '宽', 2, 10), heightCm: dimension(carton.heightCm, '高', 2, 10), grossWeightKg: dimension(carton.grossWeightKg, '毛重', 3, 9), sources }
+  })
+}
+export function buildPhysical(command: ProcurementCommand, form: PhysicalForm, detail: PlatformProcurement, base: ProcurementCommandBody, warehouseId: string, voucherFileId: string): ProcurementCommandBody {
+  const closed = ['REJECTED', 'CANCELLED', 'EXCEPTION_CLOSED', 'SHIPPED_TO_CUSTOMER'].includes(detail.customerView.order.status)
+  if (closed) throw new Error('订单已结束，不能改写实物记录')
+  if (command === 'packing') return { ...base, cartons: buildPacking(form.cartons, detail) }
+  if (command === 'packing/confirm') {
+    if (detail.physical.packingStatus !== 'DRAFT' || !detail.physical.packingVersion) throw new Error('请先保存当前装箱草稿')
+    return { ...base, packingVersion: detail.physical.packingVersion }
+  }
+  if (command === 'packing/withdraw') {
+    if (detail.physical.packingStatus !== 'CONFIRMED' || detail.purchaseFacts.overseas_shipped_at) throw new Error('仅允许撤回尚未交寄的已确认清单')
+    return base
+  }
+  if (command === 'dispositions/revoke') {
+    if (!detail.physical.dispositions.some(row => row.id === form.dispositionId && row.active)) throw new Error('请选择有效差异处置')
+    return { ...base, dispositionId: form.dispositionId, voucherFileId }
+  }
+  if (command.endsWith('/complete')) return { ...base, leg: command.startsWith('overseas') ? 'OVERSEAS' : 'DOMESTIC' }
+  const correction = command === 'receipts/correct'
+  const old = correction ? detail.physical.receipts.find(row => row.id === form.receiptId && row.active) : undefined
+  if (correction && !old) throw new Error('请选择有效原实收记录')
+  const leg: Leg = old?.leg ?? (command === 'overseas-receipts' ? 'OVERSEAS' : command === 'domestic-receipts' ? 'DOMESTIC' : form.leg)
+  const sourceCartonId = old?.sourceCartonId || form.sourceCartonId
+  if (leg === 'DOMESTIC' && !shippedCartons(detail).some(row => row.id === sourceCartonId)) throw new Error('请选择本单已国际交寄的原箱')
+  if (command === 'dispositions') {
+    const quantity = whole(form.quantity, '处置件数', 1)
+    const source = leg === 'DOMESTIC' ? sourceCartonId : null
+    const receipt = detail.physical.receipts.find(row => row.id === form.receiptId && row.active && row.leg === leg && row.sourceCartonId === source)
+    const records = detail.physical.receipts.filter(row => row.active && row.leg === leg && row.sourceCartonId === source)
+    const resolved = detail.physical.dispositions.filter(row => row.active && row.leg === leg && row.source_carton_id === source && row.kind === form.kind && (form.kind === 'SHORTAGE' || row.receipt_id === form.receiptId)).reduce((sum, row) => sum + row.quantity, 0)
+    const expected = leg === 'OVERSEAS' ? detail.purchaseFacts.purchased_quantity : shippedCartons(detail).find(row => row.id === source)?.quantity
+    const available = form.kind === 'SHORTAGE' ? Number(expected) - records.reduce((sum, row) => sum + row.goodQuantity + row.damagedQuantity, 0) - resolved : receipt ? (form.kind === 'DAMAGED' ? receipt.damagedQuantity : receipt.extraQuantity) - resolved : -1
+    if (!Number.isSafeInteger(available) || quantity > available) throw new Error('处置件数超过当前来源的未处理差异')
+    const decisions = { SHORTAGE: 'ACCEPT_SHORTAGE', DAMAGED: 'DISPOSE_DAMAGED', EXTRA: 'RETURN_EXTRA' } as const
+    return { ...base, leg, ...(leg === 'DOMESTIC' ? { sourceCartonId } : {}), ...(form.kind === 'SHORTAGE' ? {} : { receiptId: form.receiptId }), kind: form.kind, quantity, decision: decisions[form.kind], voucherFileId }
+  }
+  const goodQuantity = whole(form.goodQuantity, '合格件数'), damagedQuantity = whole(form.damagedQuantity, '破损件数'), extraQuantity = whole(form.extraQuantity, '多货件数')
+  if (!Number.isSafeInteger(goodQuantity + damagedQuantity + extraQuantity) || goodQuantity + damagedQuantity + extraQuantity <= 0) throw new Error('本次实收总件数必须大于零')
+  if (!form.receivedAt || !Number.isFinite(Date.parse(form.receivedAt)) || Date.parse(form.receivedAt) > Date.now()) throw new Error('请填写不晚于当前时间的真实实收时间')
+  const origin = leg === 'OVERSEAS' ? detail.purchaseFacts.purchased_at : detail.purchaseFacts.overseas_shipped_at
+  if (!origin || Date.parse(form.receivedAt) < Date.parse(origin)) throw new Error('实收时间不能早于购买或国际交寄时间')
+  const source = leg === 'DOMESTIC' ? sourceCartonId : null
+  const counted = detail.physical.receipts.filter(row => row.active && row.leg === leg && row.sourceCartonId === source && row.id !== old?.id).reduce((sum, row) => sum + row.goodQuantity + row.damagedQuantity, 0)
+  const expected = leg === 'OVERSEAS' ? detail.purchaseFacts.purchased_quantity : shippedCartons(detail).find(row => row.id === sourceCartonId)?.quantity
+  if (expected == null || goodQuantity + damagedQuantity + counted > expected) throw new Error('合格及破损实收超过来源件数，多到货物请填入多货')
+  if (leg === 'OVERSEAS' && (!warehouseId || (detail.purchaseFacts.actual_warehouse_id && detail.purchaseFacts.actual_warehouse_id !== warehouseId))) throw new Error('实际收货仓必须与本单已冻结的仓库一致')
+  return { ...base, leg, ...(leg === 'OVERSEAS' ? { warehouseId } : { sourceCartonId }), goodQuantity, damagedQuantity, extraQuantity, receivedAt: form.receivedAt, ...(correction ? { receiptId: form.receiptId, voucherFileId } : {}) }
+}
diff --git a/src/modules/overseas-business/procurementPresentation.ts b/src/modules/overseas-business/procurementPresentation.ts
new file mode 100644
index 00000000..ef400a08
--- /dev/null
+++ b/src/modules/overseas-business/procurementPresentation.ts
@@ -0,0 +1,65 @@
+import type { Amount, ProcurementFee } from './procurementTypes'
+
+export const procurementStatuses: Record<string, string> = {
+  PENDING_REVIEW: '待审核', WAIT_PURCHASE: '待购买', WAIT_OVERSEAS_RECEIPT: '待海外到仓', OVERSEAS_RECEIVING: '海外收货中',
+  WAIT_PACKING: '待装箱', WAIT_LABELS: '待面单及预估处理', WAIT_OVERSEAS_SHIPMENT: '待海外交寄', INTERNATIONAL_TRANSIT: '国际运输中',
+  DOMESTIC_RECEIVING: '国内收货中', WAIT_CHARGES: '待国内核费', WAIT_CUSTOMER_SHIPMENT: '待寄客户', SHIPPED_TO_CUSTOMER: '已寄客户',
+  REJECTED: '已拒绝', CANCELLED: '已取消', EXCEPTION_CLOSED: '异常关闭',
+}
+export const feePurposes: Record<string, string> = {
+  SAMPLE_PAYMENT: '样品货款', INTERNATIONAL_ESTIMATE: '预估国际运费', INTERNATIONAL_FREIGHT: '实际国际运费',
+  DUTY: '关税', DOMESTIC_FREIGHT: '国内运费', OTHER: '其他费用', ADJUSTMENT: '追加费用', REFUND: '退款',
+}
+export function statusLabel(status: string | null | undefined) { return status ? procurementStatuses[status] || '待核对进度' : '—' }
+export function statusTone(status: string | null | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' {
+  if (status === 'SHIPPED_TO_CUSTOMER') return 'success'
+  if (status === 'REJECTED' || status === 'EXCEPTION_CLOSED') return 'danger'
+  if (status === 'CANCELLED') return 'info'
+  if (status === 'INTERNATIONAL_TRANSIT') return 'primary'
+  return 'warning'
+}
+export function cents(value: Amount | null | undefined): bigint | null {
+  if (value === null || value === undefined) return null
+  const match = /^(-?)(\d+)(?:\.(\d{1,2}))?$/.exec(String(value).trim())
+  if (!match) return null
+  const result = BigInt(match[2]) * 100n + BigInt((match[3] || '').padEnd(2, '0'))
+  return match[1] ? -result : result
+}
+export function decimal(value: bigint) {
+  const absolute = value < 0n ? -value : value
+  return `${value < 0n ? '-' : ''}${absolute / 100n}.${String(absolute % 100n).padStart(2, '0')}`
+}
+export function money(value: Amount | null | undefined, currency: string | null | undefined = 'CNY') {
+  const amount = cents(value)
+  return amount === null ? '—' : `${currency || '—'} ${decimal(amount)}`
+}
+export function dateTime(value: string | null | undefined) { return value ? value.replace('T', ' ').replace(/\.\d+$/, '') : '—' }
+export function measurement(value: Amount | null | undefined, scale: number) {
+  if (value === null || value === undefined) return '—'
+  const parts = /^(\d+)(?:\.(\d+))?$/.exec(String(value))
+  if (!parts || (parts[2] || '').length > scale) return '待核对'
+  return `${parts[1]}.${(parts[2] || '').padEnd(scale, '0')}`
+}
+export function text(value: unknown) { return value === null || value === undefined || value === '' ? '—' : String(value) }
+export function productHref(value: string | null | undefined) {
+  if (!value) return undefined
+  try { const url = new URL(value); return ['http:', 'https:'].includes(url.protocol) ? url.href : undefined } catch { return undefined }
+}
+export function feeStatus(fee: ProcurementFee) {
+  if (fee.purpose === 'INTERNATIONAL_ESTIMATE') {
+    const label: Record<string, string> = { FROZEN: '已冻结，未扣款', ZERO: '零预估已确认', SETTLED: '原预估已结清', RELEASED: '预估已释放' }
+    if (fee.walletStatus && label[fee.walletStatus]) return label[fee.walletStatus]
+  }
+  const labels: Record<string, string> = {
+    FREEZE_PENDING: '冻结处理中', FREEZE_FAILED: '冻结未成功', FROZEN: '等待扣款', SETTLE_PENDING: '扣款处理中', SETTLE_ACTUAL_PENDING: '实际费用结算中',
+    SETTLE_FAILED: '扣款未成功', SETTLE_ACTUAL_FAILED: '实际费用未结清', SETTLED: '已扣款', RELEASE_PENDING: '释放处理中', RELEASE_FAILED: '释放未成功',
+    RELEASED: '已释放冻结', REFUND_PENDING: '退款处理中', REFUND_FAILED: '退款未成功', REFUNDED: '已退款', ZERO: '已确认零元', NOT_APPLICABLE: '不适用', TERMINATED: '已终止',
+  }
+  return fee.walletStatus ? labels[fee.walletStatus] || '待核定' : '待核定'
+}
+export function feeTone(fee: ProcurementFee): 'success' | 'warning' | 'danger' | 'info' {
+  if (fee.walletStatus?.endsWith('_FAILED')) return 'danger'
+  if (['SETTLED', 'REFUNDED', 'ZERO', 'NOT_APPLICABLE', 'RELEASED'].includes(fee.walletStatus || '')) return 'success'
+  if (fee.walletStatus === 'TERMINATED') return 'info'
+  return 'warning'
+}
diff --git a/src/modules/overseas-business/procurementTransportForm.test.ts b/src/modules/overseas-business/procurementTransportForm.test.ts
new file mode 100644
index 00000000..34b54b08
--- /dev/null
+++ b/src/modules/overseas-business/procurementTransportForm.test.ts
@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest'
+import { buildTransport, transportForm } from './procurementTransportForm'
+import { readPendingProcurement } from './procurementPending'
+import type { PlatformProcurement, ProcurementFile, ProcurementLabelSet } from './procurementTypes'
+const base = { version: 7, idempotencyKey: 'transport-one', reason: '逐箱核对' }
+const files: ProcurementFile[] = [{ id: '51', fileId: '501', category: 'LABEL', fileName: 'labels.pdf', contentType: 'application/pdf', sizeBytes: 10, createdAt: '' }, { id: '52', fileId: '502', category: 'EXCEPTION', fileName: 'customer.pdf', contentType: 'application/pdf', sizeBytes: 10, createdAt: '' }, { id: '53', fileId: '503', category: 'RECEIPT', fileName: 'repack.png', contentType: 'image/png', sizeBytes: 10, createdAt: '' }]
+function labels(): ProcurementLabelSet { return { id: '71', version: 2, manifestId: '61', cargoHash: 'cargo', sender: { name: '海外发件人', phone: '13800000000', address: 'US warehouse' }, receiver: { name: '国内收货人', phone: '13800000001', address: '上海接收地址' }, labels: [{ cartonId: '31', fileId: '501', page: 1, carrier: 'carrier', trackingNo: 'TRACK-1', appliedAt: '2020-01-02T12:00:00' }, { cartonId: '32', fileId: '501', page: 2, carrier: 'carrier', trackingNo: 'TRACK-2', appliedAt: '2020-01-02T13:00:00' }] } }
+function detail(): PlatformProcurement {
+  const cargo = [{ cartonId: '31', cartonNo: 'BOX-1', quantity: 6, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.234', packagingRecordId: null, sources: [{ receiptId: '11', quantity: 6 }] }, { cartonId: '32', cartonNo: 'BOX-2', quantity: 4, lengthCm: '10.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '1.111', packagingRecordId: null, sources: [{ receiptId: '12', quantity: 4 }] }]
+  return { customerView: { order: { id: '1', orderNo: 'OP-1', customerId: '9', customerName: '客户', purchaseCategory: '样品', productName: '外套', productSpecification: null, productUrl: null, purchaseQuantity: 10, budgetUnitPrice: '1.00', currency: 'CNY', receivingAddress: '深圳客户地址', contactName: '客户收件人', contactPhone: '13800000002', estimatedArrivalAt: null, plannedWarehouseName: '海外仓', actualWarehouseName: '海外仓', actualWarehouseCode: 'LAX', status: 'WAIT_OVERSEAS_SHIPMENT', version: 7, createdAt: '', updatedAt: '' }, budget: { totalAmount: '10.00', currency: 'CNY', authorizedAt: null }, purchased: true, purchaseConfirmed: true, purchaseNeedsAttention: false, progress: [], boxes: [], shipments: [], fees: [], exceptionSummaries: [] }, purchaseFacts: { overseas_received_at: '2020-01-02T10:00:00', domestic_received_at: '2020-01-04T10:00:00' }, physical: { receipts: [], dispositions: [], packingVersion: 3, packingStatus: 'CONFIRMED', cartons: [] }, transport: { overseasCargo: cargo, domesticCargo: [{ ...cargo[0], quantity: 5, lengthCm: '15.00', grossWeightKg: '1.987', packagingRecordId: '81', sources: [{ receiptId: '21', quantity: 5 }] }], overseasLabels: labels(), domesticLabels: null, shipments: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [...files], reviewHistory: [], operations: [], actions: [{ key: 'SHIP_OVERSEAS', label: '海外交寄', permission: 'ship-overseas', allowed: true, reason: null }, { key: 'SHIP_CUSTOMER', label: '寄客户', permission: 'ship-customer', allowed: true, reason: null }], internalRemark: null }
+}
+describe('procurement transport form rules', () => {
+  it('binds the full batch to files, pages and the exact packing version', () => {
+    const value = detail(); const form = transportForm(value)
+    const payload = buildTransport('labels', form, value, files, base, '')
+    expect(payload).toMatchObject({ leg: 'OVERSEAS', packingVersion: 3, labels: [{ cartonId: '31', fileId: '501', page: 1 }, { cartonId: '32', fileId: '501', page: 2 }] })
+    expect(payload).not.toHaveProperty('sender')
+    expect(readPendingProcurement(JSON.stringify({ command: 'labels', payload }))).toEqual({ command: 'labels', payload })
+    form.labels[0].trackingNo = 'changed-after-submit'; expect(payload.labels?.[0].trackingNo).toBe('TRACK-1')
+  })
+  it('rejects missing or duplicate cartons, wrong-purpose files and invalid image pages', () => {
+    const value = detail(); let form = transportForm(value); form.labels.pop(); expect(() => buildTransport('labels', form, value, files, base, '')).toThrow('完整覆盖')
+    form = transportForm(value); form.labels[1].cartonId = '31'; expect(() => buildTransport('labels', form, value, files, base, '')).toThrow('完整覆盖')
+    form = transportForm(value); form.labels[0].fileId = '502'; expect(() => buildTransport('labels', form, value, files, base, '')).toThrow('每箱选择本单')
+    form = transportForm(value); expect(() => buildTransport('labels', form, value, [{ ...files[0], contentType: 'image/png' }], base, '')).toThrow('第 1 页')
+  })
+  it('uses domestic good quantities and replacement measurements, requiring proof for recipient changes', () => {
+    const value = detail(); const form = transportForm(value, 'DOMESTIC'); form.labels[0] = { cartonId: '31', fileId: '501', page: 1, carrier: 'SF', trackingNo: 'SF-1' }
+    expect(form.receiver).toEqual({ name: '客户收件人', phone: '13800000002', address: '深圳客户地址' })
+    expect(value.transport.domesticCargo[0]).toMatchObject({ quantity: 5, lengthCm: '15.00', grossWeightKg: '1.987' })
+    expect(buildTransport('labels', form, value, files, base, '')).not.toHaveProperty('addressVoucherFileId')
+    form.receiver.address = '客户确认的新地址'; expect(() => buildTransport('labels', form, value, files, base, '')).toThrow('客户确认凭证')
+    form.addressVoucherFileId = '502'; expect(buildTransport('labels', form, value, files, base, '').addressVoucherFileId).toBe('502')
+  })
+  it('requires confirmed packing, domestic receipt completion and an unshipped leg for label changes', () => {
+    const value = detail(); const form = transportForm(value); value.physical.packingStatus = 'DRAFT'; expect(() => buildTransport('labels', form, value, files, base, '')).toThrow('确认装箱')
+    value.physical.packingStatus = 'CONFIRMED'; value.purchaseFacts.overseas_shipped_at = '2020-01-03T10:00:00'; expect(() => buildTransport('labels', form, value, files, base, '')).toThrow('本段已交寄')
+    value.purchaseFacts.domestic_received_at = null; expect(() => buildTransport('labels', transportForm(value, 'DOMESTIC'), value, files, base, '')).toThrow('国内收货完成')
+  })
+  it('makes zero estimate explicit without sending actual-charge fields', () => {
+    const value = detail(); const form = transportForm(value); form.businessDate = '2020-01-02'
+    expect(() => buildTransport('international-estimate', form, value, files, base, '')).toThrow('明确填写')
+    form.amount = '0.00'; const payload = buildTransport('international-estimate', form, value, files, base, '')
+    expect(payload).toEqual({ ...base, amount: '0.00', businessDate: '2020-01-02', labelVersion: 2 })
+    expect(readPendingProcurement(JSON.stringify({ command: 'international-estimate', payload }))).not.toBeNull()
+  })
+  it('allows partial application only for current unapplied labels with a real time', () => {
+    const value = detail(); value.transport.overseasLabels!.labels[0].appliedAt = null; const form = transportForm(value); form.cartonIds = ['31']; form.occurredAt = '2020-01-02T11:00:00'
+    expect(buildTransport('labels/apply', form, value, files, base, '')).toEqual({ ...base, labelVersion: 2, cartonIds: ['31'], appliedAt: '2020-01-02T11:00:00' })
+    form.cartonIds = ['32']; expect(() => buildTransport('labels/apply', form, value, files, base, '')).toThrow('尚未确认贴单')
+    form.cartonIds = ['31']; form.occurredAt = '2020-01-01T10:00:00'; expect(() => buildTransport('labels/apply', form, value, files, base, '')).toThrow('早于上一节点')
+  })
+  it('ships the entire authoritative batch and checks label time and server readiness', () => {
+    const value = detail(); const form = transportForm(value); form.cartonIds = ['31']; form.occurredAt = '2020-01-03T10:00:00'
+    const payload = buildTransport('overseas-shipment', form, value, files, base, '')
+    expect(payload).toEqual({ ...base, leg: 'OVERSEAS', labelVersion: 2, cartonIds: ['31', '32'], shippedAt: '2020-01-03T10:00:00' })
+    expect(readPendingProcurement(JSON.stringify({ command: 'overseas-shipment', payload }))).not.toBeNull()
+    form.occurredAt = '2020-01-02T12:30:00'; expect(() => buildTransport('overseas-shipment', form, value, files, base, '')).toThrow('早于上一节点')
+    value.actions[0].allowed = false; value.actions[0].reason = '预估冻结未完成'; expect(() => buildTransport('overseas-shipment', form, value, files, base, '')).toThrow('预估冻结未完成')
+  })
+  it('keeps repacking one-to-one and never changes quantity or the original source', () => {
+    const value = detail(); const form = transportForm(value, 'DOMESTIC'); Object.assign(form, { cartonId: '31', lengthCm: '16.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '2.123' })
+    const payload = buildTransport('domestic-repack', form, value, files, base, '503')
+    expect(payload).toEqual({ ...base, cartonId: '31', lengthCm: '16.00', widthCm: '20.00', heightCm: '30.00', grossWeightKg: '2.123', voucherFileId: '503' })
+    expect(readPendingProcurement(JSON.stringify({ command: 'domestic-repack', payload }))).not.toBeNull()
+    form.cartonId = 'other'; expect(() => buildTransport('domestic-repack', form, value, files, base, '503')).toThrow('可寄原箱')
+  })
+  it('rejects corrupted recovered shipment identity before any request', () => {
+    expect(() => readPendingProcurement(JSON.stringify({ command: 'customer-shipment', payload: { ...base, labelVersion: 1, cartonIds: ['31', '31'], leg: 'DOMESTIC', shippedAt: '2020-01-03T10:00:00' } }))).toThrow('transport cartons')
+  })
+})
diff --git a/src/modules/overseas-business/procurementTransportForm.ts b/src/modules/overseas-business/procurementTransportForm.ts
new file mode 100644
index 00000000..851c6f4f
--- /dev/null
+++ b/src/modules/overseas-business/procurementTransportForm.ts
@@ -0,0 +1,75 @@
+import type { PlatformProcurement, ProcurementAddress, ProcurementFile } from './procurementTypes'
+import type { ProcurementCommand, ProcurementCommandBody } from './api/procurementCommands'
+import { dimension, whole, type Leg } from './procurementPhysicalForm'
+export const transportCommands = new Set<ProcurementCommand>(['labels', 'international-estimate', 'labels/apply', 'domestic-repack', 'overseas-shipment', 'customer-shipment'])
+export interface TransportForm {
+  leg: Leg; receiver: ProcurementAddress; addressVoucherFileId: string
+  labels: { cartonId: string; fileId: string; page: number | undefined; carrier: string; trackingNo: string }[]
+  amount: string; businessDate: string; occurredAt: string; cartonIds: string[]; cartonId: string
+  lengthCm: string; widthCm: string; heightCm: string; grossWeightKg: string
+}
+export function transportCargo(detail: PlatformProcurement, leg: Leg) { return leg === 'OVERSEAS' ? detail.transport.overseasCargo : detail.transport.domesticCargo }
+export function transportForm(detail: PlatformProcurement, leg: Leg = detail.purchaseFacts.overseas_shipped_at ? 'DOMESTIC' : 'OVERSEAS'): TransportForm {
+  const previous = leg === 'OVERSEAS' ? detail.transport.overseasLabels : detail.transport.domesticLabels
+  const order = detail.customerView.order
+  const receiver = previous?.receiver ?? (leg === 'DOMESTIC' ? { name: order.contactName, phone: order.contactPhone, address: order.receivingAddress } : { name: '', phone: '', address: '' })
+  return { leg, receiver: { ...receiver }, addressVoucherFileId: '', labels: transportCargo(detail, leg).map(box => {
+    const old = previous?.labels.find(row => row.cartonId === box.cartonId)
+    return { cartonId: box.cartonId, fileId: old?.fileId ?? '', page: old?.page ?? 1, carrier: old?.carrier ?? '', trackingNo: old?.trackingNo ?? '' }
+  }), amount: '', businessDate: '', occurredAt: '', cartonIds: [], cartonId: '', lengthCm: '', widthCm: '', heightCm: '', grossWeightKg: '' }
+}
+function requireText(value: string, max: number, label: string) { const result = value.trim(); if (!result || result.length > max) throw new Error(`请填写${label}，最多 ${max} 个字符`); return result }
+function realTime(value: string, earliest?: string | null) {
+  const time = Date.parse(value)
+  if (!value || !Number.isFinite(time) || time > Date.now()) throw new Error('请填写不晚于当前时间的实际操作时间')
+  if (earliest && time < Date.parse(earliest)) throw new Error('实际操作时间不能早于上一节点')
+  return value
+}
+export function buildTransport(command: ProcurementCommand, form: TransportForm, detail: PlatformProcurement, files: ProcurementFile[], base: ProcurementCommandBody, voucherFileId: string): ProcurementCommandBody {
+  const leg = command === 'customer-shipment' || command === 'domestic-repack' ? 'DOMESTIC' : command === 'labels' ? form.leg : 'OVERSEAS'
+  const cargo = transportCargo(detail, leg)
+  if (!cargo.length) throw new Error('当前运输段没有可寄货物')
+  const labels = leg === 'OVERSEAS' ? detail.transport.overseasLabels : detail.transport.domesticLabels
+  if (command === 'labels') {
+    if (detail.physical.packingStatus !== 'CONFIRMED' || !detail.physical.packingVersion) throw new Error('请先确认装箱清单')
+    if (leg === 'DOMESTIC' && !detail.purchaseFacts.domestic_received_at) throw new Error('国内收货完成后才能制作寄客户面单')
+    if (detail.purchaseFacts[leg === 'OVERSEAS' ? 'overseas_shipped_at' : 'customer_shipped_at']) throw new Error('本段已交寄，不能修改原面单')
+    const receiver = { name: requireText(form.receiver.name, 128, '收件人'), phone: form.receiver.phone.trim(), address: requireText(form.receiver.address, 1000, '完整收件地址') }
+    if (!/^[+0-9 ()-]{5,64}$/.test(receiver.phone)) throw new Error('请填写有效快递联系电话')
+    const original = detail.customerView.order
+    const changed = leg === 'DOMESTIC' && (receiver.name !== original.contactName || receiver.phone !== original.contactPhone || receiver.address !== original.receivingAddress)
+    if (changed && !files.some(file => file.fileId === form.addressVoucherFileId && file.category === 'EXCEPTION')) throw new Error('最终收件信息已变更，请关联本单客户确认凭证')
+    const unique = new Set(form.labels.map(row => row.cartonId))
+    if (unique.size !== cargo.length || form.labels.length !== cargo.length || cargo.some(box => !unique.has(box.cartonId))) throw new Error('面单必须完整覆盖本批全部原箱，不可重复或跨单')
+    const rows = form.labels.map(row => {
+      const file = files.find(file => file.fileId === row.fileId && file.category === 'LABEL')
+      if (!file || !['application/pdf', 'image/png', 'image/jpeg'].includes(file.contentType || '')) throw new Error('请为每箱选择本单 PDF、JPG 或 PNG 面单')
+      const page = whole(row.page, '面单页码', 1)
+      if (file.contentType !== 'application/pdf' && page !== 1) throw new Error('图片面单只能对应第 1 页')
+      return { cartonId: row.cartonId, fileId: row.fileId, page, carrier: requireText(row.carrier, 128, '承运商'), trackingNo: requireText(row.trackingNo, 128, '运单号') }
+    })
+    return { ...base, leg, packingVersion: detail.physical.packingVersion, receiver, ...(changed ? { addressVoucherFileId: form.addressVoucherFileId } : {}), labels: rows }
+  }
+  if (command === 'domestic-repack') {
+    if (!cargo.some(box => box.cartonId === form.cartonId)) throw new Error('请选择本单国内可寄原箱')
+    if (!files.some(file => file.fileId === voucherFileId && ['RECEIPT', 'EXCEPTION'].includes(file.category))) throw new Error('请关联本单换包装凭证')
+    return { ...base, cartonId: form.cartonId, lengthCm: dimension(form.lengthCm, '长', 2, 10), widthCm: dimension(form.widthCm, '宽', 2, 10), heightCm: dimension(form.heightCm, '高', 2, 10), grossWeightKg: dimension(form.grossWeightKg, '毛重', 3, 9), voucherFileId }
+  }
+  if (!labels) throw new Error('请先保存本段面单')
+  if (command === 'international-estimate') {
+    if (!/^\d{1,16}(?:\.\d{1,2})?$/.test(form.amount.trim())) throw new Error('请明确填写人民币预估金额，包括零元')
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(form.businessDate) || !Number.isFinite(Date.parse(form.businessDate))) throw new Error('请选择预估业务日期')
+    if ((base.reason?.length || 0) > 500) throw new Error('预估核对说明最多 500 个字符')
+    return { ...base, labelVersion: labels.version, amount: form.amount.trim(), businessDate: form.businessDate }
+  }
+  if (command === 'labels/apply') {
+    if (!form.cartonIds.length || new Set(form.cartonIds).size !== form.cartonIds.length || form.cartonIds.some(id => !labels.labels.some(row => row.cartonId === id && !row.appliedAt))) throw new Error('请选择当前面单中尚未确认贴单的箱')
+    return { ...base, labelVersion: labels.version, cartonIds: [...form.cartonIds], appliedAt: realTime(form.occurredAt, detail.purchaseFacts.overseas_received_at) }
+  }
+  const action = detail.actions.find(row => row.key === (leg === 'OVERSEAS' ? 'SHIP_OVERSEAS' : 'SHIP_CUSTOMER'))
+  if (!action?.allowed) throw new Error(action?.reason || '当前不满足交寄条件')
+  if (labels.labels.length !== cargo.length || cargo.some(box => !labels.labels.some(label => label.cartonId === box.cartonId))) throw new Error('当前面单与可寄原箱不一致，请重新核对')
+  const latestApplied = labels.labels.reduce<string | null>((latest, row) => row.appliedAt && (!latest || row.appliedAt > latest) ? row.appliedAt : latest, null)
+  if (leg === 'OVERSEAS' && labels.labels.some(row => !row.appliedAt)) throw new Error('本批全部箱须完成贴单')
+  return { ...base, leg, labelVersion: labels.version, cartonIds: cargo.map(box => box.cartonId), shippedAt: realTime(form.occurredAt, leg === 'OVERSEAS' ? latestApplied : detail.purchaseFacts.domestic_received_at) }
+}
diff --git a/src/modules/overseas-business/procurementTypes.ts b/src/modules/overseas-business/procurementTypes.ts
new file mode 100644
index 00000000..8d38bc14
--- /dev/null
+++ b/src/modules/overseas-business/procurementTypes.ts
@@ -0,0 +1,119 @@
+export type Amount = number | string
+export interface ProcurementSummary {
+  orderNo: string
+  purchaseCategory: string
+  productName: string
+  productSpecification: string | null
+  purchaseQuantity: number
+  budgetUnitPrice: Amount | null
+  currency: string | null
+  status: string
+  version: number
+  createdAt: string
+  updatedAt: string
+}
+export interface ProcurementOrder extends ProcurementSummary {
+  id: string
+  customerId: string
+  customerName: string | null
+  productUrl: string | null
+  receivingAddress: string
+  contactName: string
+  contactPhone: string
+  estimatedArrivalAt: string | null
+  plannedWarehouseName: string | null
+  actualWarehouseCode: string | null
+  actualWarehouseName: string | null
+}
+export interface ProcurementFee {
+  feeNo: string
+  purpose: string
+  name: string
+  version: number | null
+  active: boolean
+  determination: string
+  amount: Amount
+  currency: string
+  originalAmount: Amount | null
+  originalCurrency: string | null
+  exchangeRate: Amount | null
+  exchangeRateMonth: string | null
+  businessDate: string | null
+  parentFeeNo: string | null
+  walletStatus: string | null
+  sourceLinked: boolean
+}
+export interface ProcurementBox {
+  cartonNo: string
+  quantity: number
+  lengthCm: Amount
+  widthCm: Amount
+  heightCm: Amount
+  grossWeightKg: Amount
+}
+export interface ProcurementShipment {
+  shipmentNo: string
+  leg: 'OVERSEAS' | 'DOMESTIC'
+  shippedAt: string
+  cartonNo: string
+  quantity: number
+  carrier: string
+  trackingNo: string
+}
+export interface ProcurementDetail {
+  order: ProcurementOrder
+  budget: { totalAmount: Amount | null; currency: string; authorizedAt: string | null }
+  purchased: boolean
+  purchaseConfirmed: boolean
+  purchaseNeedsAttention: boolean
+  progress: { key: string; title: string; completedAt: string | null }[]
+  boxes: ProcurementBox[]
+  shipments: ProcurementShipment[]
+  fees: ProcurementFee[]
+  exceptionSummaries: string[]
+}
+
+export interface ProcurementAction { key: string; label: string; permission: string; allowed: boolean; reason: string | null }
+export type ProcurementFileCategory = 'PURCHASE' | 'BUDGET' | 'LABEL' | 'EXCEPTION' | 'RECEIPT' | 'VOUCHER'
+export interface ProcurementFile { id: string; fileId: string; category: ProcurementFileCategory; fileName: string; contentType: string | null; sizeBytes: number; createdAt: string }
+export interface ProcurementReceipt { id: string; receiptNo: string; leg: 'OVERSEAS' | 'DOMESTIC'; sourceCartonId: string | null; goodQuantity: number; damagedQuantity: number; extraQuantity: number; receivedAt: string; active: boolean }
+export interface ProcurementDisposition { id: string; leg: 'OVERSEAS' | 'DOMESTIC'; source_carton_id: string | null; receipt_id: string | null; kind: 'SHORTAGE' | 'DAMAGED' | 'EXTRA'; quantity: number; decision: string; voucher_file_id: string; reason: string; active: boolean | number; created_at: string }
+export interface ProcurementCarton extends ProcurementBox { id: string; sources: { receiptId: string; quantity: number }[] }
+export interface ProcurementCargo extends ProcurementBox { cartonId: string; packagingRecordId: string | null; sources: { receiptId: string; quantity: number }[] }
+export interface ProcurementAddress { name: string; phone: string; address: string }
+export interface ProcurementLabelSet { id: string; version: number; manifestId: string; cargoHash: string; sender: ProcurementAddress; receiver: ProcurementAddress; labels: { cartonId: string; fileId: string; page: number; carrier: string; trackingNo: string; appliedAt: string | null }[] }
+export interface ProcurementInternalFee {
+  id: string; feeNo: string; purpose: string; confirmationOrigin: 'BUSINESS' | 'FINANCIAL'; feeItemCode: string; feeItemName: string; feeVersion: number; active: boolean; determination: string
+  amount: Amount; currency: string; originalAmount: Amount; originalCurrency: string; exchangeRate: Amount; exchangeRateMonth: string; businessDate: string
+  parentFeeId: string | null; sourceFeeId: string | null; voucherFileId: string | null; voucherFileName: string | null
+  walletStatus: string; walletLedgerId: string | null; walletErrorCode: string | null; walletErrorMessage: string | null; remark: string | null
+}
+export interface ProcurementFeeCorrection {
+  correctionNo: string; rootFeeNo: string; targetOriginalAmount: Amount; originalCurrency: string; exchangeRate: Amount; exchangeRateMonth: string
+  targetAmount: Amount; previousNetAmount: Amount; differenceAmount: Amount; feeNos: string[]
+}
+export type ProcurementRemainingKind = 'PURCHASE_REMAINDER' | 'TRANSIT_REMAINDER' | 'GOOD' | 'DAMAGED' | 'EXTRA'
+export interface ProcurementRemaining { kind: ProcurementRemainingKind; sourceId: string | null; businessNo: string; quantity: number }
+export interface ProcurementControlNote {
+  id: string; note_no: string; target_type: 'PURCHASE' | 'WAREHOUSE' | 'RECEIPT' | 'SHIPMENT'; target_id: string | null; blocking: boolean | number
+  reason: string; client_summary: string | null; created_at: string; resolved_at: string | null; resolution_reason: string | null
+  voucher_file_id: string; resolution_voucher_id: string | null
+  original_value_json: { name?: string; code?: string } | null
+  corrected_value_json: { warehouseName?: string; warehouseCode?: string } | null
+}
+export interface ProcurementClosure { id: string; closure_no: string; financial_conclusion: string; reason: string; client_summary: string; created_at: string }
+export interface ProcurementClosureItem { id: string; closure_id: string; source_kind: ProcurementRemainingKind; source_id: string | null; quantity: number; decision: string; destination: string; voucher_file_id: string }
+export interface PlatformProcurement {
+  customerView: ProcurementDetail
+  purchaseFacts: { overseas_received_at?: string | null; domestic_received_at?: string | null; actual_warehouse_id?: string | null; overseas_shipped_at?: string | null; customer_shipped_at?: string | null; purchased_at?: string | null; purchased_product_name?: string | null; purchased_specification?: string | null; purchased_quantity?: number | null; purchase_amount?: Amount | null; purchase_currency?: string | null; purchase_issue?: string | null; purchase_confirmed_at?: string | null }
+  physical: { dispositions: ProcurementDisposition[]; receipts: ProcurementReceipt[]; packingVersion: number | null; packingStatus: string | null; cartons: ProcurementCarton[] }
+  transport: { overseasCargo: ProcurementCargo[]; domesticCargo: ProcurementCargo[]; overseasLabels: ProcurementLabelSet | null; domesticLabels: ProcurementLabelSet | null; shipments: { id: string; shipmentNo: string; leg: string; shippedAt: string }[] }
+  controls: { notes: ProcurementControlNote[]; remaining: ProcurementRemaining[]; closures: ProcurementClosure[]; closureItems: ProcurementClosureItem[] }
+  files: ProcurementFile[]
+  fees: ProcurementInternalFee[]
+  feeCorrections: ProcurementFeeCorrection[]
+  reviewHistory: import('./types').OverseasBusinessHistory[]
+  operations: { action: string; operator_id: string; reason: string; detail_json: unknown; created_at: string }[]
+  actions: ProcurementAction[]
+  internalRemark: string | null
+}
diff --git a/src/modules/overseas-business/types.ts b/src/modules/overseas-business/types.ts
index 9f276182..0b8b19eb 100644
--- a/src/modules/overseas-business/types.ts
+++ b/src/modules/overseas-business/types.ts
@@ -5,7 +5,7 @@ export interface OverseasBusinessHistory {
   operatorId: string | null; changeDetail?: string | null; remark: string | null; createdAt: string
 }
 
-export type OverseasPurchaseStatus = 'PENDING_REVIEW' | 'APPROVED' | 'REJECTED' | 'PENDING_OUTBOUND' | 'PARTIALLY_OUTBOUND' | 'OUTBOUNDED'
+export type OverseasPurchaseStatus = 'PENDING_REVIEW' | 'WAIT_PURCHASE' | 'WAIT_OVERSEAS_RECEIPT' | 'OVERSEAS_RECEIVING' | 'WAIT_PACKING' | 'WAIT_LABELS' | 'WAIT_OVERSEAS_SHIPMENT' | 'INTERNATIONAL_TRANSIT' | 'DOMESTIC_RECEIVING' | 'WAIT_CHARGES' | 'WAIT_CUSTOMER_SHIPMENT' | 'SHIPPED_TO_CUSTOMER' | 'REJECTED' | 'CANCELLED' | 'EXCEPTION_CLOSED'
 export interface OverseasPurchaseQuery {
   page?: number; size?: number; customerId?: string; orderNo?: string; customerKeyword?: string
   purchaseCategory?: string; productName?: string; status?: OverseasPurchaseStatus | ''
@@ -16,36 +16,16 @@ export interface OverseasPurchaseSummary {
   purchaseCategory: string; productName: string; productSpecification: string | null
   purchaseQuantity: number; budgetUnitPrice: string | null; currency: string
   purchaseWarehouseId: string | null; purchaseWarehouseName: string | null
-  inboundQuantity: number; outboundQuantity: number; inventoryQuantity: number
   status: OverseasPurchaseStatus; version: number; createdAt: string; updatedAt: string
 }
-export interface OverseasPurchaseDetail extends OverseasPurchaseSummary {
-  productUrl: string | null; receivingAddress: string | null; contactName: string | null; contactPhone: string | null
-  domesticCarrier: string | null; domesticTrackingNo: string | null; overseasCarrier: string | null; overseasTrackingNo: string | null
-  estimatedArrivalAt: string | null; remark: string | null; createdBy: string | null; reviewedBy: string | null
-  reviewRemark: string | null; reviewedAt: string | null; histories: OverseasBusinessHistory[]
-  outboundDetails?: OverseasPurchaseOutboundDetail[]
-  files: OverseasPurchaseFile[]; fees: OverseasPurchaseFee[]
-}
-export interface OverseasPurchaseFile { id: string; category: 'RECEIPT' | 'VOUCHER'; fileId: string; fileName: string; contentType: string | null; sizeBytes: number; createdAt: string }
-export interface OverseasPurchaseFee { id: string; feeNo: string; feeItemCode: string; feeItemName: string; amount: string; currency: string; voucherFileId: string; voucherFileName: string; remark: string | null; walletStatus: string; walletErrorMessage: string | null; createdAt: string }
-export interface OverseasPurchaseOutboundDetail { id: string; quantity: number; carrier: string | null; trackingNo: string | null; shippedAt: string | null; remark: string | null }
 export interface OverseasPurchaseCustomerOption { customerId: string; customerName: string }
 export interface OverseasPurchaseWarehouseOption { warehouseId: string; warehouseCode: string; warehouseName: string; countryCode: string }
-export interface UpdateOverseasPurchaseRequest {
-  version: number; purchaseCategory?: string; productName?: string; productSpecification?: string | null
-  productUrl?: string | null; inboundQuantity?: number; purchaseWarehouseId?: string | null
-  domesticCarrier?: string | null; domesticTrackingNo?: string | null; overseasCarrier?: string | null
-  overseasTrackingNo?: string | null; estimatedArrivalAt?: string | null; remark?: string | null
-  outboundDetails?: OverseasPurchaseOutboundDetail[]
+export interface UpdateOverseasPurchaseRequest { version: number; remark?: string | null }
+/** Fields consumed by the standalone remark editor from the aggregate platform detail. */
+export interface OverseasPurchaseEditorDetail {
+  customerView: { order: { orderNo: string; customerId: string; productName: string; purchaseQuantity: number; version: number } }
+  internalRemark: string | null
 }
-export interface ReviewOverseasPurchaseRequest {
-  version: number
-  decision: 'APPROVE' | 'REJECT'
-  idempotencyKey: string
-  remark?: string
-}
-
 export type LocalTransportType = 'PORT_PICKUP' | 'WAREHOUSE_TO_WAREHOUSE' | 'WAREHOUSE_TO_DOOR'
 export type LocalTransportStatus = 'PENDING_REVIEW' | 'WAITING_INBOUND' | 'RECEIVING' | 'WAITING_CONSOLIDATION' | 'PALLET_OVERAGE_REVIEW' | 'PARTIALLY_ALLOCATED' | 'ALLOCATED' | 'PENDING_DISPATCH' | 'DISPATCHED' | 'IN_TRANSIT' | 'COMPLETED' | 'REJECTED' | 'CANCELLED'
 export interface LocalTransportQuery {
diff --git a/src/styles/adminDensity.test.ts b/src/styles/adminDensity.test.ts
index 5a6ed6bb..5ffaa896 100644
--- a/src/styles/adminDensity.test.ts
+++ b/src/styles/adminDensity.test.ts
@@ -43,7 +43,7 @@ const overseasConsumers = [
 const overseasBusinessConsumers = [
   'overseas-business/pages/PurchaseOrdersView.vue', 'overseas-business/pages/PurchaseOrderDetailView.vue',
   'overseas-business/pages/PurchaseOrderEditView.vue', 'overseas-business/pages/TransportOrdersView.vue',
-  'overseas-business/pages/TransportOrderFormView.vue',
+  'overseas-business/pages/TransportOrderFormView.vue', 'overseas-business/components/ProcurementNodeActions.vue', 'overseas-business/components/ProcurementPhysicalFields.vue', 'overseas-business/components/ProcurementTransportFields.vue', 'overseas-business/components/ProcurementFinanceFields.vue', 'overseas-business/components/ProcurementChargeFields.vue', 'overseas-business/components/ProcurementControlFields.vue',
 ]
 const customerServiceConsumers = [
   'overseas-warehouse/pages/ExceptionOrdersView.vue', 'overseas-warehouse/pages/CustomerVisitsView.vue',
@@ -402,7 +402,7 @@ describe('approved Admin density ownership', () => {
         for (const node of nodes) {
           if (node.type !== 1) continue
           const classes = classesOf(node)
-          if (node.tag === 'DataTable' || node.tag === 'LoadingListDetailDrawer' || classes.some(name => ['density-action', 'density-actions', 'density-tabs', 'density-fields', 'density-tab-icon', 'density-back'].includes(name))) {
+          if (node.tag === 'DataTable' || node.tag === 'LoadingListDetailDrawer' || classes.some(name => ['density-action', 'density-actions', 'density-tabs', 'density-fields', 'density-table', 'density-tab-icon', 'density-back'].includes(name))) {
             expect(insideDensity, `${file}: ${classes.join(' ')} lacks its density ancestor`).toBe(true)
             checked += 1
           }

From df4d3dfd66cf3bc8f4dd5433fa45de820a3bb9ad Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 08:05:21 +0800
Subject: [PATCH 12/47] fix(admin): render appointment table actions and
 history

---
 .../AppointmentCalendarView.vue               |  3 +-
 .../AppointmentCargoPanel.vue                 |  4 +-
 .../AppointmentFollowupDialog.vue             |  2 +-
 .../AppointmentTableRendering.test.ts         | 43 +++++++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 src/modules/appointment-calendar/AppointmentTableRendering.test.ts

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 95ac5fc6..3928ab75 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -69,7 +69,7 @@ const statusLabels: Record<string, string> = { PENDING: '预约中', SUCCESS: '
 const columns: DataTableColumn[] = [
   { key: 'selection', type: 'selection', reserveSelection: true, width: 46, selectable: (row: InboundOrderSummaryDto) => row.fbaWarehouseCode === searchedWarehouse.value && (!row.appointmentStatus || ['FAILED', 'CANCELLED'].includes(row.appointmentStatus)) },
   { prop: 'inboundCode', label: '入仓码', minWidth: 150 },
-  { prop: 'customerName', label: '客户', minWidth: 150 },
+  { prop: 'customerName', label: '客户', slotName: 'customer', minWidth: 150 },
   { prop: 'fbaWarehouseCode', label: '目的仓', width: 110 },
   { prop: 'overseasWarehouseName', label: '海外仓', minWidth: 150 },
   { prop: 'packageCount', label: '箱数', width: 80 },
@@ -336,6 +336,7 @@ onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest;
         </details>
         <template v-if="!editing && warehouse">
           <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
+            <template #customer="{ row }">{{ row.customerName?.trim() || '客户名称缺失' }}</template>
             <template #notices><LoadErrorState v-if="candidateError" title="货物加载失败" :message="candidateError.message" @retry="loadCandidates()" /></template>
             <template #pagination-left>已选 {{ selected.length }} 票，可跨客户选择同一目的仓货物</template>
           </DataTable>
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index d22a4b00..3d330793 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -25,7 +25,7 @@ const error = ref<ApiErrorDetails | null>(null)
 let request = 0
 let controller: AbortController | undefined
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', slot: 'actions', width: 150, fixed: 'left' },
+  { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' },
   { prop: 'inboundCode', label: '入仓码', minWidth: 180 },
   { prop: 'customerName', label: '客户', minWidth: 150 },
   { prop: 'containerNo', label: '柜号', minWidth: 150 },
@@ -35,7 +35,7 @@ const columns: DataTableColumn[] = [
   { prop: 'receivedPackages', label: '实收箱数', width: 100 },
   { prop: 'estimatedArrivalAt', label: '来源预计到港', minWidth: 170 },
   { prop: 'estimatedWarehouseAt', label: '已保存预计到仓', minWidth: 170 },
-  { key: 'progress', label: '当前事项', slot: 'progress', minWidth: 170 },
+  { key: 'progress', label: '当前事项', slotName: 'progress', minWidth: 170 },
 ]
 
 async function load(reset = false) {
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
index 2593fe41..e516c73c 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
@@ -32,7 +32,7 @@ const error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails
 const pending = ref<SaveFollowup | null>(null)
 let generation = 0
 const columns: DataTableColumn[] = [
-  { key: 'stage', label: '事项', slot: 'stage', width: 120 },
+  { key: 'stage', label: '事项', slotName: 'stage', width: 120 },
   { prop: 'contactedParty', label: '联系对象', minWidth: 130 },
   { prop: 'result', label: '联系结果', minWidth: 200 },
   { prop: 'nextAction', label: '下一步', minWidth: 150 },
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
new file mode 100644
index 00000000..b2566c37
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -0,0 +1,43 @@
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import { getFollowups, listPlanningCargo, resolvePlanningSource, type PlanningCargo, type PlanningSource } from './planningApi'
+
+vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn() }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
+const cargo: PlanningCargo = { sourceKey: source.sourceKey, customerId: 'A', customerName: '客户甲', orderId: '1', inboundCode: 'IN-A', containerBookingId: '2', containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseCode: 'US', originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', packages: 20, receivedPackages: null, shippedPackages: null, sourcePalletCount: null, volumeCbm: null, estimatedArrivalAt: null, estimatedWarehouseAt: null, orderVersion: 1, standardNode: 'DEPARTED', shippingVersion: null, shippingObservedAt: null, shippingProvider: null, hasInboundPlan: false, hasActiveAppointment: false, detained: false, mixedDestinations: false }
+const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }
+
+describe('appointment tables use actual shared table slots', () => {
+  beforeEach(() => vi.resetAllMocks())
+  it('renders working source actions and readable progress through DataTable and RowActions', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
+    vi.mocked(resolvePlanningSource).mockResolvedValue({ source, coverage })
+    const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppointmentFollowupDialog: true } } })
+    await flushPromises()
+    const row = wrapper.get('.el-table__body-wrapper .el-table__row')
+    expect(row.text()).toContain('IN-A')
+    expect(row.text()).toContain('尚未建入仓计划')
+    const followup = row.findAll('button').find(button => button.text() === '跟进')
+    expect(followup).toBeDefined()
+    expect(row.findAll('button').some(button => button.text() === '查看来源')).toBe(true)
+    await followup!.trigger('click')
+    await flushPromises()
+    expect(resolvePlanningSource).toHaveBeenCalledExactlyOnceWith({ sourceKey: 'ORDER:1', customerId: 'A', destinationKey: 'FBA:ONT8' })
+    expect(wrapper.findComponent(AppointmentFollowupDialog).exists()).toBe(true)
+    wrapper.unmount()
+  })
+  it('renders followup stage names instead of blank table cells', async () => {
+    vi.mocked(getFollowups).mockResolvedValue({ history: { records: [{ stage: 'FBA_RECEIVING', version: 1, contactedParty: null, result: '等待回复', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' }], total: 1, page: 1, size: 10, pages: 1 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 1 } })
+    const wrapper = mount(AppointmentFollowupDialog, { props: { source, coverage, canWrite: false }, global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
+    await flushPromises()
+    const row = wrapper.get('.el-table__body-wrapper .el-table__row')
+    expect(row.text()).toContain('FBA收货跟进')
+    expect(row.text()).toContain('等待回复')
+    wrapper.unmount()
+  })
+})

From 214b58b642dfd24f5b7d40752082ed7a4549d3ab Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 08:11:13 +0800
Subject: [PATCH 13/47] fix(procurement): render file download actions

---
 .../pages/OverseasBusinessViews.test.ts       | 28 +++++++++++++++++++
 .../pages/PurchaseOrderDetailView.vue         |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index bc6163fb..e54023ae 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -10,6 +10,7 @@ import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import { listPlatformTenants } from '@/modules/iam'
 import type { PlatformProcurement } from '../procurementTypes'
+import { downloadProcurementFile } from '../api/procurementCommands'
 import type { FleetArrangement } from '../fleetArrangement'
 import type { LocalLooseboardDetail, LocalLooseboardOrder, LocalTransportDetail, LocalTransportOrder } from '../types'
 import {
@@ -29,6 +30,10 @@ const purchaseDetailSource = readFileSync(resolve(process.cwd(), 'src/modules/ov
 const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: {} as Record<string, string>, query: {} as Record<string, string> } }))
 vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
+vi.mock('../api/procurementCommands', async importOriginal => ({
+  ...await importOriginal<typeof import('../api/procurementCommands')>(),
+  downloadProcurementFile: vi.fn(),
+}))
 vi.mock('../api/platformOverseasBusiness', () => ({
   listOverseasPurchases: vi.fn(), getOverseasPurchase: vi.fn(), getOverseasPurchaseEditor: vi.fn(), updateOverseasPurchase: vi.fn(), listOverseasPurchaseCustomerOptions: vi.fn(), listOverseasPurchaseWarehouseOptions: vi.fn(),
   listUsTruckOrders: vi.fn(), getUsTruckOrder: vi.fn(), createUsTruckOrder: vi.fn(), updateUsTruckOrder: vi.fn(),
@@ -64,6 +69,7 @@ describe('overseas business mounted pages', () => {
   beforeEach(() => {
     vi.stubGlobal('ResizeObserver', ResizeObserverStub); vi.stubGlobal('localStorage', memoryStorage()); vi.stubGlobal('sessionStorage', memoryStorage()); document.body.innerHTML = ''
     routing.push.mockReset(); routing.route.params = {}; routing.route.query = {}
+    vi.mocked(downloadProcurementFile).mockReset()
     vi.mocked(listOverseasPurchases).mockReset().mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getOverseasPurchase).mockReset().mockResolvedValue(procurementDetail()); vi.mocked(updateOverseasPurchase).mockReset().mockResolvedValue({ ...purchase, version: 4 })
     vi.mocked(getOverseasPurchaseEditor).mockReset().mockResolvedValue({ customerView: { order: { orderNo: purchase.orderNo, customerId: purchase.customerId, productName: purchase.productName, purchaseQuantity: purchase.purchaseQuantity, version: purchase.version } }, internalRemark: purchase.remark })
     vi.mocked(listOverseasPurchaseCustomerOptions).mockReset().mockResolvedValue([{ customerId: '10001', customerName: '客户甲' }]); vi.mocked(listOverseasPurchaseWarehouseOptions).mockReset().mockResolvedValue([{ warehouseId: '20001', warehouseCode: 'LAX', warehouseName: '洛杉矶采购仓', countryCode: 'US' }])
@@ -166,6 +172,28 @@ describe('overseas business mounted pages', () => {
     expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-purchases' })
   })
 
+  it('downloads procurement files with list access and prevents duplicate pending downloads', async () => {
+    routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
+    const result = procurementDetail()
+    result.files = [{ id: '9007199254741000', fileId: '9007199254741001', category: 'LABEL', fileName: 'label.pdf', contentType: 'application/pdf', sizeBytes: 123, createdAt: '2026-10-10T10:00:00' }]
+    vi.mocked(getOverseasPurchase).mockResolvedValue(result)
+    let rejectDownload!: (error: Error) => void
+    vi.mocked(downloadProcurementFile).mockImplementation(() => new Promise((_resolve, reject) => { rejectDownload = reject }))
+    const wrapper = mountPage(PurchaseOrderDetailView)
+    useAuthStore().permissions = ['platform:overseas-business:purchase:list']
+    await flushPromises()
+    const button = wrapper.findAll('.el-table__body-wrapper button').find(item => item.text() === '下载')
+    expect(button).toBeDefined()
+    await button!.trigger('click'); await flushPromises()
+    expect(downloadProcurementFile).toHaveBeenCalledWith('OP-100', '10001', '9007199254741001')
+    expect(button!.attributes('disabled')).toBeDefined()
+    await button!.trigger('click')
+    expect(downloadProcurementFile).toHaveBeenCalledTimes(1)
+    rejectDownload(new Error('TEST download unavailable')); await flushPromises()
+    expect(button!.attributes('disabled')).toBeUndefined()
+    expect(document.body.textContent).toContain('文件下载失败')
+  })
+
   it('renders estimate holds separately from actual payment without claiming inbound settlement', async () => {
     routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
     const result = procurementDetail()
diff --git a/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue b/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
index 75e43af1..5224c530 100644
--- a/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
+++ b/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
@@ -110,7 +110,7 @@ const correctionColumns: DataTableColumn[] = [
   { key: 'feeNos', label: '关联实际费用或调整', minWidth: 240, formatter: (row: PlatformProcurement['feeCorrections'][number]) => row.feeNos.join('；') || '无资金差额' },
 ]
 const fileColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 90, fixed: 'left' }, { key: 'fileName', prop: 'fileName', label: '文件名', minWidth: 250 },
+  { key: 'actions', slotName: 'actions', label: '操作', width: 90, fixed: 'left' }, { key: 'fileName', prop: 'fileName', label: '文件名', minWidth: 250 },
   { key: 'category', label: '用途', width: 120, formatter: (row: ProcurementFile) => fileLabels[row.category] || '待核对' },
   { key: 'createdAt', label: '上传时间', minWidth: 160, formatter: (row: ProcurementFile) => dateTime(row.createdAt) },
 ]

From b835e52bcb9c85e07489e8290cbe5033b7a5eb27 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 08:21:03 +0800
Subject: [PATCH 14/47] fix(admin): make dispatch business numbers readable

---
 src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md   |  1 +
 .../overseas-warehouse/layoutAcceptance.test.ts      |  3 ++-
 .../overseas-warehouse/pages/DispatchesView.vue      | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md b/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
index 1f4ebeaf..36a99b7f 100644
--- a/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md
@@ -11,6 +11,7 @@
 | 页面 | 操作 | 依据 | 当前实现与结论 | 验收 |
 |---|---|---|---|---|
 | 排车列表 | 阶段切换与审核页签 | 本轮用户截图 Image #1 与“只有装车前”显示审核的明确要求 | 原先各阶段均显示审核页签；调整为仅装车前显示调度审核、理货员审核，其他阶段仅车辆信息，离开装车前自动回到车辆信息；沿用现有页签布局和车次详情跳转 | 阶段切换与审核跳转自动回归；1920×1080、100% 缩放待人工截图确认 |
+| 排车列表 | 编号与行操作可读性 | 2026-10-10 本轮 TEST 1920×1080 截图，DS-WH-20261009-642242 被170px列截断，操作列380px存在明显余白；沿当前高密度规范 | 保持操作列左固定与原三个直接动作及更多菜单；操作列260px，排车号220px，车次230px；长编号、姓名及关联订单可换行 | 当前修改待发布后同视口复验，不改变操作承载方式或业务资格 |
 
 排车装车后车辆信息分区增加路线地图列，使用公开`TransportRouteDialog`。原型、字段来源和多目的仓选择见[运输路线地图](../overseas-master-data/PROTOTYPE_MATRIX.md#运输路线地图)。其他阶段不新增路线列，不逐行请求地图。
 
diff --git a/src/modules/overseas-warehouse/layoutAcceptance.test.ts b/src/modules/overseas-warehouse/layoutAcceptance.test.ts
index 4a73dbbb..2f86a735 100644
--- a/src/modules/overseas-warehouse/layoutAcceptance.test.ts
+++ b/src/modules/overseas-warehouse/layoutAcceptance.test.ts
@@ -10,7 +10,8 @@ describe('overseas warehouse 1920px layout acceptance', () => {
     const widths: Record<string, number> = {
       'LastMileOrdersView.vue': 330,
       'InboundOrdersView.vue': 300,
-      'DispatchesView.vue': 380,
+      // Three compact RowActions plus the overflow menu; long business numbers use the saved space.
+      'DispatchesView.vue': 260,
       'OutboundsView.vue': 180,
       'DeliveryOrdersView.vue': 300,
       'RelabelOrdersView.vue': 180,
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.vue b/src/modules/overseas-warehouse/pages/DispatchesView.vue
index 223e75ab..17e93832 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.vue
@@ -212,13 +212,13 @@ const fields = computed<QueryField[]>(() => [
 ])
 
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 380, fixed: 'left', slotName: 'actions' },
-  { key: 'dispatchNo', prop: 'dispatchNo', label: '排车单号', minWidth: 170, fixed: 'left' },
-  { key: 'workflow', label: '关联车次', minWidth: 210, slotName: 'workflow' },
+  { key: 'actions', label: '操作', width: 260, fixed: 'left', slotName: 'actions' },
+  { key: 'dispatchNo', prop: 'dispatchNo', label: '排车单号', minWidth: 220, fixed: 'left', singleLine: false },
+  { key: 'workflow', label: '关联车次', minWidth: 230, slotName: 'workflow', singleLine: false },
   { key: 'dispatchReview', label: '调度审核', minWidth: 180, slotName: 'dispatchReview', singleLine: false },
   { key: 'loadingReview', label: '理货审核（整车）', minWidth: 180, slotName: 'loadingReview', singleLine: false },
-  { key: 'vehiclePlate', prop: 'vehiclePlate', label: '车牌号', minWidth: 130 },
-  { key: 'driverName', prop: 'driverName', label: '司机', minWidth: 120 },
+  { key: 'vehiclePlate', prop: 'vehiclePlate', label: '车牌号', minWidth: 150, singleLine: false },
+  { key: 'driverName', prop: 'driverName', label: '司机', minWidth: 150, singleLine: false },
   { key: 'driverPhone', prop: 'driverPhone', label: '联系电话', minWidth: 140 },
   {
     key: 'carrierName',
@@ -226,7 +226,7 @@ const columns: DataTableColumn[] = [
     label: '托车公司名称',
     minWidth: 160,
   },
-  { key: 'orderNos', prop: 'orderNos', label: '关联订单', minWidth: 220 },
+  { key: 'orderNos', prop: 'orderNos', label: '关联订单', minWidth: 260, singleLine: false },
   { key: 'route', prop: 'route', label: '路线', minWidth: 180 },
   {
     key: 'overseasWarehouse',

From 84488adf12aa4742f49e8acd88701a88f56d6717 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 08:42:03 +0800
Subject: [PATCH 15/47] feat(appointment): add shared container followup
 workspace

---
 .../AppointmentCalendarView.vue               |  5 +-
 .../AppointmentContainerPanel.vue             | 75 +++++++++++++++++++
 .../AppointmentFollowupDialog.test.ts         | 24 ++++--
 .../AppointmentFollowupDialog.vue             | 38 ++++++----
 .../AppointmentTableRendering.test.ts         | 22 +++++-
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  1 +
 .../appointment-calendar/planningApi.ts       | 30 ++++++++
 .../overseas-master-data/PROTOTYPE_MATRIX.md  |  1 +
 .../components/CapacityInquiryTable.vue       |  4 +-
 9 files changed, 173 insertions(+), 27 deletions(-)
 create mode 100644 src/modules/appointment-calendar/AppointmentContainerPanel.vue

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 3928ab75..aedd3f55 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -21,6 +21,7 @@ import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@
 import AppointmentCalendarPanel, { type CalendarEvent } from './AppointmentCalendarPanel.vue'
 import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import { calendarRange, dateKey } from './calendar'
 import { deleteAppointment, listArrivalCalendar, type ArrivalCalendarEntry } from './api'
 
@@ -30,7 +31,7 @@ const linkedSource = ref<ResolvedPlanningSource | null>(null)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkLoading = ref(false)
 let linkRequest = 0
-const workView = ref<'calendar' | 'cargo'>('calendar')
+const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
 const appointments = ref<FbaAppointmentDto[]>([])
 const arrivals = ref<ArrivalCalendarEntry[]>([])
 const range = ref(calendarRange(dateKey(new Date()), 'month'))
@@ -301,9 +302,11 @@ onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest;
     <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" @close="linkedSource = null" />
     <div class="density-status-tabs" role="group" aria-label="预约工作视图">
       <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">整柜提柜与接仓</button>
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">已开船 FBA 货物</button>
     </div>
     <AppointmentCargoPanel v-if="workView === 'cargo'" />
+    <AppointmentContainerPanel v-if="workView === 'containers'" />
     <div v-show="workView === 'calendar'">
     <LoadErrorState v-if="loadError" :title="errorTitle" :message="loadError.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
diff --git a/src/modules/appointment-calendar/AppointmentContainerPanel.vue b/src/modules/appointment-calendar/AppointmentContainerPanel.vue
new file mode 100644
index 00000000..f2d37cea
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentContainerPanel.vue
@@ -0,0 +1,75 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { listPlanningContainers, resolvePlanningContainer, type PlanningContainer, type ContainerFollowupContext } from './planningApi'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+
+const access = useAccessPreviewStore()
+const query = ref<QueryModel>({ keyword: '' })
+const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '整柜', placeholder: '柜号或入仓码', width: 300 }]
+const rows = ref<PlanningContainer[]>([]), page = ref(1), size = ref(20), total = ref(0)
+const loading = ref(false), opening = ref(false)
+const error = ref<ApiErrorDetails | null>(null), contextError = ref<ApiErrorDetails | null>(null)
+const context = ref<ContainerFollowupContext | null>(null)
+let request = 0, contextRequest = 0, controller: AbortController | undefined
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 130, fixed: 'left' },
+  { prop: 'containerNo', label: '集装箱号', minWidth: 170 },
+  { prop: 'orderCount', label: '美国范围票数', width: 120 },
+  { prop: 'customerCount', label: '客户数', width: 90 },
+  { key: 'packages', label: '预报箱数', slotName: 'packages', width: 130 },
+  { key: 'arrival', label: '来源预计到港', slotName: 'arrival', minWidth: 200 },
+  { key: 'receiving', label: '接仓点及跟进', slotName: 'receiving', minWidth: 280, singleLine: false },
+  { key: 'scope', label: '范围核对', slotName: 'scope', minWidth: 200 },
+]
+async function load(reset = false) {
+  if (reset) page.value = 1
+  const current = ++request
+  controller?.abort(); controller = new AbortController()
+  loading.value = true; error.value = null
+  try {
+    const result = await listPlanningContainers({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }, controller.signal)
+    if (current !== request) return
+    rows.value = result.records; total.value = result.total
+  } catch (cause) { if (current === request) { error.value = getApiErrorDetails(cause, '整柜货源加载失败'); rows.value = []; total.value = 0 } }
+  finally { if (current === request) loading.value = false }
+}
+async function follow(row: PlanningContainer, warehouseId?: string) {
+  const current = ++contextRequest
+  contextError.value = null; opening.value = true
+  try {
+    const result = await resolvePlanningContainer(row.containerBookingId, warehouseId)
+    if (current === contextRequest) context.value = result
+  } catch (cause) { if (current === contextRequest) contextError.value = getApiErrorDetails(cause, '整柜范围核对失败') }
+  finally { if (current === contextRequest) opening.value = false }
+}
+const displayTime = (value: string | null) => value?.replace('T', ' ') || '—'
+onMounted(() => load())
+onBeforeUnmount(() => { ++request; ++contextRequest; controller?.abort() })
+</script>
+
+<template>
+  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="containerBookingId" @update:page="load()" @update:page-size="load(true)">
+    <template #filters><QueryToolbar v-model="query" ariaLabel="整柜提柜与接仓查询" :fields="fields" :loading="loading" @search="load(true)" /></template>
+    <template #notices>
+      <LoadErrorState v-if="error" title="整柜货源加载失败" :message="error.message" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <LoadErrorState v-if="contextError" title="整柜范围核对失败" :message="contextError.message" :show-retry="false"><template #details><ApiErrorMeta :details="contextError" /></template></LoadErrorState>
+      <p>同柜多客户只记录一份提柜跟进；接仓按实际仓库分别跟进。预计到港为来源快照，不是对方确认时间。</p>
+    </template>
+    <template #actions="{ row }"><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer)">提柜跟进</el-button></template>
+    <template #packages="{ row }">{{ row.packages ?? '待核实' }}</template>
+    <template #arrival="{ row }">{{ displayTime(row.earliestArrivalAt) }}<span v-if="row.latestArrivalAt && row.latestArrivalAt !== row.earliestArrivalAt"> 至 {{ displayTime(row.latestArrivalAt) }}</span></template>
+    <template #receiving="{ row }"><div v-for="warehouse in row.warehouses" :key="warehouse.warehouseId" class="receiving-row"><span>{{ warehouse.warehouseName }} · {{ warehouse.orderCount }} 票</span><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer, warehouse.warehouseId)">接仓跟进</el-button></div></template>
+    <template #scope="{ row }">{{ row.incompleteScope ? '有未明确或非美国接仓点，待核对' : '接仓点已核实' }}</template>
+  </DataTable>
+  <AppointmentFollowupDialog v-if="context" :container="context" :can-write="access.can('platform:appointment:followup')" @close="context = null" />
+</template>
+
+<style scoped>
+.receiving-row { display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-3); }
+</style>
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts b/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
index dda264b8..d2016ce1 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
@@ -1,14 +1,14 @@
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { getFollowups, saveFollowup, type PlanningSource } from './planningApi'
+import { getFollowups, saveFollowup, getContainerFollowups, saveContainerFollowup, type PlanningSource, type ContainerFollowupContext } from './planningApi'
 
-vi.mock('./planningApi', () => ({ getFollowups: vi.fn(), saveFollowup: vi.fn() }))
+vi.mock('./planningApi', () => ({ getFollowups: vi.fn(), saveFollowup: vi.fn(), getContainerFollowups: vi.fn(), saveContainerFollowup: vi.fn() }))
 vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() } }))
 const history = { history: { records: [], page: 1, size: 10, total: 0, pages: 0 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 } }
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', canFollowup: true, blockReasons: [], orderId: '1', inboundCode: 'IN-1', bookingNo: null, containerNo: null, originWarehouseId: 'US-1', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: null, sourceVersion: null }
-function render(canWrite = true) {
-  return mount(AppointmentFollowupDialog, { props: { source, coverage: { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }, canWrite }, global: { stubs: {
+function render(canWrite = true, container?: ContainerFollowupContext) {
+  return mount(AppointmentFollowupDialog, { props: container ? { container, canWrite } : { source, coverage: { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }, canWrite }, global: { stubs: {
     AppDialog: { props: ['confirmDisabled'], template: '<div><slot/><button data-save :disabled="confirmDisabled" @click="$emit(\'confirm\')">保存</button></div>' },
     ElForm: { template: '<form><slot/></form>' }, ElFormItem: { template: '<label><slot/></label>' },
     ElInput: { props: ['modelValue', 'placeholder'], template: '<input :value="modelValue" :placeholder="placeholder" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
@@ -19,13 +19,25 @@ function render(canWrite = true) {
 describe('appointment followup recovery', () => {
   beforeEach(() => {
     vi.resetAllMocks(); vi.mocked(getFollowups).mockResolvedValue(history)
-    vi.mocked(saveFollowup).mockResolvedValue({ stage: 'DRAYAGE_CONTACT', version: 1, contactedParty: null, result: '已联系', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' })
+    vi.mocked(getContainerFollowups).mockResolvedValue(history)
+    vi.mocked(saveFollowup).mockResolvedValue({ stage: 'FBA_RECEIVING', version: 1, contactedParty: null, result: '已联系', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' })
+  })
+  it.each([null, '100'])('saves the correct container stage for warehouse %s without customer-scoped calls', async warehouseId => {
+    const container = { containerBookingId: 'C1', containerNo: 'CONTAINER-A', warehouseId, warehouseName: warehouseId ? '洛杉矶仓' : null, canFollowup: true, blockReasons: [] }
+    const wrapper = render(true, container); await flushPromises()
+    await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('同柜统一联系')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(saveContainerFollowup).toHaveBeenCalledWith(container, expect.objectContaining({ stage: warehouseId ? 'WAREHOUSE_RECEIVING' : 'DRAYAGE_CONTACT', expectedVersion: 0, result: '同柜统一联系' }))
+    expect(getContainerFollowups).toHaveBeenCalledTimes(2)
+    expect(getFollowups).not.toHaveBeenCalled()
+    expect(saveFollowup).not.toHaveBeenCalled()
+    wrapper.unmount()
   })
   it('saves contact facts without requiring appointment, inbound plan or driver fields', async () => {
     const wrapper = render(); await flushPromises()
     await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('已联系，等待回复')
     await wrapper.get('[data-save]').trigger('click'); await flushPromises()
-    expect(saveFollowup).toHaveBeenCalledWith('ORDER:1', 'A', expect.objectContaining({ stage: 'DRAYAGE_CONTACT', expectedVersion: 0, result: '已联系，等待回复', followupDate: null }))
+    expect(saveFollowup).toHaveBeenCalledWith('ORDER:1', 'A', expect.objectContaining({ stage: 'FBA_RECEIVING', expectedVersion: 0, result: '已联系，等待回复', followupDate: null }))
     const body = vi.mocked(saveFollowup).mock.calls[0]![2]
     expect(body).not.toHaveProperty('appointmentNo'); expect(body).not.toHaveProperty('driverId'); expect(body).not.toHaveProperty('operatorId')
     expect(getFollowups).toHaveBeenCalledTimes(2)
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
index e516c73c..b95d201f 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { getFollowups, saveFollowup, type PlanningSource, type AppointmentCoverage, type FollowupRecord, type FollowupStage, type SaveFollowup } from './planningApi'
+import { getFollowups, saveFollowup, getContainerFollowups, saveContainerFollowup, type ContainerFollowupContext, type PlanningSource, type AppointmentCoverage, type FollowupRecord, type FollowupStage, type SaveFollowup } from './planningApi'
 
-const props = defineProps<{ source: PlanningSource; coverage: AppointmentCoverage; canWrite: boolean }>()
+const props = defineProps<({ source: PlanningSource; coverage: AppointmentCoverage; container?: never } | { container: ContainerFollowupContext; source?: never; coverage?: never }) & { canWrite: boolean }>()
 const emit = defineEmits<{ close: [] }>()
 const stages: Record<FollowupStage, string> = { DRAYAGE_CONTACT: '拖车联系', TERMINAL_APPOINTMENT: '码头约号', WAREHOUSE_RECEIVING: '接仓跟进', FBA_RECEIVING: 'FBA收货跟进' }
 const coverageNeeds: Record<string, string> = {
@@ -23,7 +23,11 @@ const coverageNeeds: Record<string, string> = {
   FBA_SHIPMENT_REFERENCES: 'FBA货件资料尚未齐全，请补充货件号或追踪号。',
   SOURCE_CHANGED_REVIEW: '货源资料更新晚于预约，请核对是否需要改约。',
 }
-const form = reactive({ stage: (props.source.bookingNo ? 'FBA_RECEIVING' : 'DRAYAGE_CONTACT') as FollowupStage, contactedParty: '', result: '', nextAction: '', followupDate: '' })
+const allowedStages = computed(() => props.container ? props.container.warehouseId ? { WAREHOUSE_RECEIVING: stages.WAREHOUSE_RECEIVING } : { DRAYAGE_CONTACT: stages.DRAYAGE_CONTACT, TERMINAL_APPOINTMENT: stages.TERMINAL_APPOINTMENT } : { FBA_RECEIVING: stages.FBA_RECEIVING })
+const canFollowup = computed(() => props.container?.canFollowup ?? props.source?.canFollowup ?? false)
+const blockReasons = computed(() => props.container?.blockReasons ?? props.source?.blockReasons ?? [])
+const title = computed(() => props.container ? `${props.container.containerNo || '未回传柜号'} · ${props.container.warehouseName || '提柜'}` : props.source?.inboundCode || props.source?.bookingNo || '未关联入仓码')
+const form = reactive({ stage: (props.container ? props.container.warehouseId ? 'WAREHOUSE_RECEIVING' : 'DRAYAGE_CONTACT' : 'FBA_RECEIVING') as FollowupStage, contactedParty: '', result: '', nextAction: '', followupDate: '' })
 const rows = ref<FollowupRecord[]>([])
 const versions = ref<Record<FollowupStage, number>>({ DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 })
 const page = ref(1), size = ref(10), total = ref(0)
@@ -44,14 +48,14 @@ async function load() {
   const request = ++generation
   loading.value = true; error.value = null; ready.value = false
   try {
-    const result = await getFollowups(props.source.sourceKey, props.source.customerId, page.value, size.value)
+    const result = props.container ? await getContainerFollowups(props.container, page.value, size.value) : await getFollowups(props.source!.sourceKey, props.source!.customerId, page.value, size.value)
     if (request !== generation) return
     rows.value = result.history.records; total.value = result.history.total; versions.value = result.versions; ready.value = true
   } catch (cause) { if (request === generation) error.value = getApiErrorDetails(cause, '跟进记录加载失败') }
   finally { if (request === generation) loading.value = false }
 }
 async function save() {
-  if (!props.canWrite || !props.source.canFollowup || saving.value || !ready.value) return
+  if (!props.canWrite || !canFollowup.value || saving.value || !ready.value) return
   if (!pending.value && (!form.result.trim() || (form.followupDate && !form.nextAction.trim()))) {
     ElMessage.warning('请填写联系结果；设置下次跟进日时需填写下一步安排'); return
   }
@@ -59,7 +63,8 @@ async function save() {
     contactedParty: form.contactedParty.trim() || undefined, result: form.result.trim(), nextAction: form.nextAction.trim() || undefined, followupDate: form.followupDate || null }
   saving.value = true; saveError.value = null
   try {
-    await saveFollowup(props.source.sourceKey, props.source.customerId, pending.value)
+    if (props.container) await saveContainerFollowup(props.container, pending.value)
+    else await saveFollowup(props.source!.sourceKey, props.source!.customerId, pending.value)
     pending.value = null; form.result = ''; form.nextAction = ''; form.followupDate = ''; page.value = 1
     ElMessage.success('跟进记录已保存'); await load()
   } catch (cause) {
@@ -72,17 +77,18 @@ onBeforeUnmount(() => { ++generation })
 </script>
 
 <template>
-  <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${source.inboundCode || source.bookingNo || '未关联入仓码'}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !source.canFollowup || !ready || loading" @confirm="save" @update:model-value="emit('close')">
-    <p>{{ source.containerNo || '—' }} · {{ source.originWarehouseName }} → {{ source.destinationWarehouseCode }}</p>
+  <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${title}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !canFollowup || !ready || loading" @confirm="save" @update:model-value="emit('close')">
+    <p v-if="source">{{ source.containerNo || '—' }} · {{ source.originWarehouseName }} → {{ source.destinationWarehouseCode }}</p>
+    <p v-else>同柜多客户共用{{ container?.warehouseId ? '此接仓点' : '提柜' }}跟进记录；保存联系不自动确认预约或推进收货。</p>
     <LoadErrorState v-if="error" title="跟进记录加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="saveError" title="跟进保存未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
-    <p v-for="reason in source.blockReasons" :key="reason">{{ reason }}</p>
-    <p v-if="coverage.changeReviewRequired">来源资料有变化，请核对原预约与运输安排。</p>
-    <p v-if="coverage.appointments.length">已关联预约：{{ coverage.appointments.map(item => item.appointmentNo).join('、') }}</p>
-    <p v-else>尚未关联收货预约；联系记录保存后仍需登记对方正式确认。</p>
-    <ul v-if="coverage.missingFields.length" aria-label="预约待核实事项"><li v-for="item in coverage.missingFields" :key="item">{{ coverageNeeds[item] || '存在待核实事项，请返回来源详情核对。' }}</li></ul>
-    <el-form v-if="canWrite && source.canFollowup" label-position="top" class="followup-form density-form" :disabled="saving || !!pending">
-      <el-form-item label="跟进事项"><el-select v-model="form.stage"><el-option v-for="(label,value) in stages" :key="value" :value="value" :label="label" /></el-select></el-form-item>
+    <p v-for="reason in blockReasons" :key="reason">{{ reason }}</p>
+    <p v-if="coverage?.changeReviewRequired">来源资料有变化，请核对原预约与运输安排。</p>
+    <p v-if="coverage?.appointments.length">已关联预约：{{ coverage.appointments.map(item => item.appointmentNo).join('、') }}</p>
+    <p v-else-if="coverage">尚未关联收货预约；联系记录保存后仍需登记对方正式确认。</p>
+    <ul v-if="coverage?.missingFields.length" aria-label="预约待核实事项"><li v-for="item in coverage.missingFields" :key="item">{{ coverageNeeds[item] || '存在待核实事项，请返回来源详情核对。' }}</li></ul>
+    <el-form v-if="canWrite && canFollowup" label-position="top" class="followup-form density-form" :disabled="saving || !!pending">
+      <el-form-item label="跟进事项"><el-select v-model="form.stage"><el-option v-for="(label,value) in allowedStages" :key="value" :value="value" :label="label" /></el-select></el-form-item>
       <el-form-item label="联系对象"><el-input v-model="form.contactedParty" maxlength="200" placeholder="本次联系的车队、码头或仓库" /></el-form-item>
       <el-form-item label="下次跟进日期"><el-date-picker v-model="form.followupDate" type="date" value-format="YYYY-MM-DD" placeholder="业务地点当地日期" /></el-form-item>
       <el-form-item label="联系结果" required class="wide"><el-input v-model="form.result" type="textarea" maxlength="1000" placeholder="记录对方反馈，不会自动确认预约" /></el-form-item>
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index b2566c37..288b57aa 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -2,10 +2,11 @@ import ElementPlus from 'element-plus'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { getFollowups, listPlanningCargo, resolvePlanningSource, type PlanningCargo, type PlanningSource } from './planningApi'
+import { getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, type PlanningCargo, type PlanningSource } from './planningApi'
 
-vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn() }))
+vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn() }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
@@ -14,6 +15,23 @@ const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], ch
 
 describe('appointment tables use actual shared table slots', () => {
   beforeEach(() => vi.resetAllMocks())
+  it('renders one shared container and resolves each receiving warehouse without per-row requests', async () => {
+    vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [{ warehouseId: '100', warehouseName: '洛杉矶仓', orderCount: 20, customerCount: 12 }] }] })
+    vi.mocked(resolvePlanningContainer).mockResolvedValue({ containerBookingId: 'C1', containerNo: 'CONTAINER-A', warehouseId: '100', warehouseName: '洛杉矶仓', canFollowup: true, blockReasons: [] })
+    const wrapper = mount(AppointmentContainerPanel, { global: { plugins: [ElementPlus], stubs: { AppointmentFollowupDialog: true } } })
+    await flushPromises()
+    expect(listPlanningContainers).toHaveBeenCalledTimes(1)
+    expect(resolvePlanningContainer).not.toHaveBeenCalled()
+    const rows = wrapper.findAll('.el-table__body-wrapper .el-table__row')
+    expect(rows).toHaveLength(1)
+    expect(rows[0]!.text()).toContain('待核实')
+    expect(rows[0]!.text()).toContain('洛杉矶仓')
+    await rows[0]!.findAll('button').find(button => button.text() === '接仓跟进')!.trigger('click')
+    await flushPromises()
+    expect(resolvePlanningContainer).toHaveBeenCalledExactlyOnceWith('C1', '100')
+    expect(wrapper.findComponent(AppointmentFollowupDialog).props('container')?.warehouseId).toBe('100')
+    wrapper.unmount()
+  })
   it('renders working source actions and readable progress through DataTable and RowActions', async () => {
     vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
     vi.mocked(resolvePlanningSource).mockResolvedValue({ source, coverage })
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index 1f1093df..0682cf1f 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -15,6 +15,7 @@
 | 多条安排 | 日历标签、右侧明细 | 月/周日格均最多显示3条，超出显示“还有N条”，悬停显示当天总数；日格固定高度，右侧全部展示并独立滚动 |
 | 多入仓码 | 用户2026-10-09补充截图：单预约20票导致两列详情被长字符串撑高 | 右侧卡片与编辑弹框共用独立整行入仓码列表；去空去重后显示总数，默认3条，长码悬停可读全文；超过3条可展开/收起，展开后216px内独立滚动并可键盘聚焦，不拼成长段文字 |
 | 在途货物及外接来源跟进 | 美国预约统一方案的提前联系需求 | 日历与已开船FBA列表切换；跟进在居中1080px弹框中承载，3列表单、联系结果及下一步整行，历史分页；BOOKING深链先由服务端核对，再展示原登记及真实预约缺项 |
+| 整柜提柜与接仓 | 美国预约统一方案的整柜共享事项 | 独立工作视图按柜汇总，操作列左置；接仓点在行内分组，点击后共用1080px跟进弹框。整柜只选拖车/码头事项，接仓只记录对应仓库，单票只记录FBA联系；数量未知或范围不完整明确显示，不按客户复制整柜联系。首次只请求一页整柜数据，详情按点击读取；待1920×1080页面验收 |
 | 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
 
 预约结束时间未明确时允许为空；不把预计装车时间当结束时间。预约号、目的仓和货物来源遵守服务端合同。日历范围最多42天，每次范围变化查询预约与到港各一次；选择范围内日期不发送请求。候选在选仓后自动分页读取，跨页选择保留；换仓立即清空旧数据/选择并丢弃旧请求响应，清空仓库后不发送货物查询。后端必填的预计装车时间保留，不自动伪造；预约编号继续填写仓库提供的业务号。仓库请求失败可重试；仅展示前50个匹配仓，超出提示缩小关键词。
diff --git a/src/modules/appointment-calendar/planningApi.ts b/src/modules/appointment-calendar/planningApi.ts
index 9a437ba4..b13cab26 100644
--- a/src/modules/appointment-calendar/planningApi.ts
+++ b/src/modules/appointment-calendar/planningApi.ts
@@ -69,3 +69,33 @@ export async function resolvePlanningSource(query: { sourceKey: string; customer
     '/platform/v1/last-leg/appointment-planning/sources/resolve', { params: query },
   ))
 }
+
+export interface PlanningContainer {
+  containerBookingId: string; containerNo: string | null; orderCount: number; customerCount: number;
+  packages: number | null; unknownPackageOrders: number; earliestArrivalAt: string | null; latestArrivalAt: string | null;
+  standardNode: string; sourceVersion: string | null; incompleteScope: boolean;
+  warehouses: Array<{ warehouseId: string; warehouseName: string; orderCount: number; customerCount: number }>;
+}
+export interface ContainerFollowupContext {
+  containerBookingId: string; containerNo: string | null; warehouseId: string | null; warehouseName: string | null;
+  canFollowup: boolean; blockReasons: string[];
+}
+const containerBase = '/platform/v1/last-leg/appointment-planning/containers'
+export async function listPlanningContainers(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{ records: PlanningContainer[]; total: number }>, ApiEnvelope<{ records: PlanningContainer[]; total: number }>>(containerBase, { params: query, signal }))
+  return { ...result, total: Number(result.total), records: result.records.map(row => ({
+    ...row, orderCount: Number(row.orderCount), customerCount: Number(row.customerCount),
+    packages: row.packages == null ? null : Number(row.packages), unknownPackageOrders: Number(row.unknownPackageOrders),
+    warehouses: row.warehouses.map(warehouse => ({ ...warehouse, orderCount: Number(warehouse.orderCount), customerCount: Number(warehouse.customerCount) })),
+  })) }
+}
+export async function resolvePlanningContainer(containerId: string, warehouseId?: string) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<ContainerFollowupContext>, ApiEnvelope<ContainerFollowupContext>>(`${containerBase}/${encodeURIComponent(containerId)}`, { params: { warehouseId } }))
+}
+export async function getContainerFollowups(context: ContainerFollowupContext, page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<FollowupHistory>, ApiEnvelope<FollowupHistory>>(`${containerBase}/${encodeURIComponent(context.containerBookingId)}/follow-ups`, { params: { warehouseId: context.warehouseId || undefined, page, size } }))
+  return { ...result, history: { ...result.history, total: Number(result.history.total) }, versions: Object.fromEntries(Object.entries(result.versions).map(([stage, version]) => [stage, Number(version)])) as Record<FollowupStage, number> }
+}
+export async function saveContainerFollowup(context: ContainerFollowupContext, body: SaveFollowup) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<FollowupRecord>, ApiEnvelope<FollowupRecord>>(`${containerBase}/${encodeURIComponent(context.containerBookingId)}/follow-ups`, body, { params: { warehouseId: context.warehouseId || undefined } }))
+}
diff --git a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
index d68b2679..11997640 100644
--- a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
@@ -138,6 +138,7 @@
 | 页面 | 操作 | 承载与尺寸 | 调整及验收边界 |
 |---|---|---|---|
 | 拼车接货 | 可拼车次、我的登记、待办 | integrated列表，操作列左置 | 直接登记，销售隐藏容量计算过程，服务端返回处理进度；待1920×1080人工截图 |
+| 我的登记 | 多动作与客户名称显示 | 沿上述列表及RowActions | 2026-10-10 TEST截图`minimal-inquiry-saved-1920.jpg`显示230px操作列裁掉第三动作及更多；改320px，客户列210px允许换行，保留原动作和权限；发布后原FB记录复验 |
 | 客户货物登记 | 新增、补充资料、只读跟进 | 1080px居中三列 | 首屏客户/目的地/已知货量；确认前必填折叠但显示缺项；始终选填独立；单站自动带入 |
 | 客户货物登记 | 确认承运、取消 | 既有居中确认框 | 展示对象及保位/商业订单影响，保存成功不冒充确认成功 |
 | 客户货物登记 | 安排来货、核量、排入本车 | 1080px居中，复用履约表单 | 原登记连续处理，按服务端资格；关联业务按权限跳转 |
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
index 00d78082..81ea3625 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
@@ -20,8 +20,8 @@ function actions(row: CapacityInquiry, busy: boolean): RowActionItem[] {
     { key: 'cancel', label: '取消意向', visible: row.actions.canCancel && write('cancel'), disabled: busy, tone: 'danger' }]
 }
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 230, fixed: 'left', slotName: 'actions' },
-  { key: 'bookingNo', label: '意向 / 预订号', minWidth: 210 }, { key: 'customerName', label: '客户', minWidth: 155 },
+  { key: 'actions', label: '操作', width: 320, fixed: 'left', slotName: 'actions' },
+  { key: 'bookingNo', label: '意向 / 预订号', minWidth: 210, singleLine: false }, { key: 'customerName', label: '客户', minWidth: 210, singleLine: false },
   { key: 'tripNo', label: '车次号', minWidth: 210 }, { key: 'destinationLabel', label: '卸货站', minWidth: 130 },
   { key: 'status', label: '当前进度 / 下一步', minWidth: 270, slotName: 'status', singleLine: false }, { key: 'cargo', label: '预计货量', minWidth: 270, slotName: 'cargo' },
   { key: 'agreedAmount', label: '约定运费（非实收）', minWidth: 165, slotName: 'amount' }, { key: 'businessOrderNo', label: '本土订单号', minWidth: 210 },

From fb062b5ec41dae1f6b5ed63be194b6f5d9b9c3d9 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 08:48:15 +0800
Subject: [PATCH 16/47] fix(procurement): normalize integer wire fields before
 commands

---
 .../api/platformOverseasBusiness.test.ts      | 26 ++++++++++++++++-
 .../api/platformOverseasBusiness.ts           | 29 +++++++++++++++++--
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/modules/overseas-business/api/platformOverseasBusiness.test.ts b/src/modules/overseas-business/api/platformOverseasBusiness.test.ts
index 4c14d578..58560912 100644
--- a/src/modules/overseas-business/api/platformOverseasBusiness.test.ts
+++ b/src/modules/overseas-business/api/platformOverseasBusiness.test.ts
@@ -10,6 +10,7 @@ import {
   updateUsTruckOrder,
 } from './platformOverseasBusiness'
 import type { UpdateLocalTransportOrderRequest } from '../types'
+import { readPendingProcurement } from '../procurementPending'
 
 const envelope = <T>(data: T) => ({ code: '200', message: 'success', data })
 const purchaseSummary = {
@@ -34,6 +35,29 @@ const looseboardSummary = {
 describe('platform overseas business API adapter', () => {
   beforeEach(() => vi.clearAllMocks())
 
+  it('normalizes wire integer strings before building replayable procurement commands', async () => {
+    overseas.get.mockResolvedValue(envelope({
+      customerView: { order: { ...purchaseSummary, version: '0', purchaseQuantity: '1' }, boxes: [{ quantity: '1' }], shipments: [{ quantity: '1' }], fees: [{ version: '2' }] },
+      purchaseFacts: { purchased_quantity: '1' }, physical: { packingVersion: '3', dispositions: [{ id: '901', quantity: '1' }], receipts: [{ id: '902', goodQuantity: '1', damagedQuantity: '0', extraQuantity: '0' }], cartons: [{ id: '903', quantity: '1', sources: [{ receiptId: '902', quantity: '1' }] }] },
+      fees: [{ id: '904', feeVersion: '2' }], controls: { notes: [], remaining: [{ quantity: '1' }], closures: [], closureItems: [{ quantity: '1' }] }, files: [{ id: '905', fileId: '9007199254740995', sizeBytes: '123' }],
+      transport: { overseasCargo: [{ cartonId: '903', quantity: '1', sources: [{ receiptId: '902', quantity: '1' }] }], domesticCargo: [], overseasLabels: { id: '906', manifestId: '907', version: '4', labels: [{ cartonId: '903', fileId: '9007199254740995', page: '1' }] }, domesticLabels: null, shipments: [] },
+    }))
+    const detail = await getOverseasPurchase('OP-1', '10001')
+    const payload = { version: detail.customerView.order.version, idempotencyKey: 'review-wire', decision: 'APPROVE', purchaseWarehouseId: '9007199254740995' }
+    expect(() => readPendingProcurement(JSON.stringify({ command: 'review', payload }))).not.toThrow()
+    expect(detail.customerView.order.purchaseQuantity).toBe(1)
+    expect(detail.physical.receipts[0].goodQuantity + detail.physical.receipts[0].damagedQuantity).toBe(1)
+    expect(detail.physical.packingVersion).toBe(3)
+    expect(detail.physical.cartons[0].sources[0].quantity).toBe(1)
+    expect(detail.transport.overseasCargo[0].quantity).toBe(1)
+    expect(detail.transport.overseasLabels?.version).toBe(4)
+    expect(detail.transport.overseasLabels?.labels[0].page).toBe(1)
+    expect(detail.files[0]).toMatchObject({ fileId: '9007199254740995', sizeBytes: 123 })
+    expect(detail.fees[0].feeVersion).toBe(2)
+    expect(detail.controls.remaining[0].quantity).toBe(1)
+    expect(detail.controls.closureItems[0].quantity).toBe(1)
+  })
+
   it('loads procurement candidates and normalizes procurement pages', async () => {
     overseas.get
       .mockResolvedValueOnce(envelope([{ customerId: '10001', customerName: '客户一' }]))
@@ -49,7 +73,7 @@ describe('platform overseas business API adapter', () => {
 
   it('loads and patches procurement detail with three-state null payloads', async () => {
     const detail = { summary: purchaseSummary, productUrl: null, histories: [{ operationType: 'UPDATE', fromStatus: 'WAIT_PURCHASE', toStatus: 'WAIT_PURCHASE', operatorId: '7', changeDetail: '{}', remark: null, createdAt: '2026-08-02T00:00:00' }] }
-    overseas.get.mockResolvedValue(envelope({ customerView: { order: purchaseSummary }, reviewHistory: detail.histories, physical: { dispositions: [], receipts: [], cartons: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] } }))
+    overseas.get.mockResolvedValue(envelope({ customerView: { order: purchaseSummary, boxes: [], shipments: [], fees: [] }, reviewHistory: detail.histories, physical: { dispositions: [], receipts: [], cartons: [] }, fees: [], feeCorrections: [], controls: { notes: [], remaining: [], closures: [], closureItems: [] }, files: [], transport: { overseasCargo: [], domesticCargo: [], overseasLabels: null, domesticLabels: null, shipments: [] } }))
     expect((await getOverseasPurchase('OP/1', '10001')).reviewHistory[0]?.operationType).toBe('UPDATE')
     overseas.patch.mockResolvedValue(envelope(detail))
     const payload = { version: 4, remark: null }
diff --git a/src/modules/overseas-business/api/platformOverseasBusiness.ts b/src/modules/overseas-business/api/platformOverseasBusiness.ts
index 16660e73..66e66ae7 100644
--- a/src/modules/overseas-business/api/platformOverseasBusiness.ts
+++ b/src/modules/overseas-business/api/platformOverseasBusiness.ts
@@ -32,8 +32,12 @@ interface LooseboardDetailPayload {
 function normalizePage<TPayload, TResult>(payload: PagePayload<TPayload>, normalize: (value: TPayload) => TResult): OverseasBusinessPage<TResult> {
   return { records: (payload.records || []).map(normalize), page: Number(payload.page), size: Number(payload.size), total: Number(payload.total), pages: Number(payload.pages) }
 }
+function procurementInteger(value: unknown): number {
+  if ((typeof value !== 'number' && typeof value !== 'string') || !/^\d+$/.test(String(value)) || !Number.isSafeInteger(Number(value))) throw new Error('采购数据中的数量或版本无效，请刷新后重试')
+  return Number(value)
+}
 function procurementSummary(value: ProcurementSummaryPayload): OverseasPurchaseSummary {
-  return { ...value, id: String(value.id), purchaseWarehouseId: value.purchaseWarehouseId == null ? null : String(value.purchaseWarehouseId), budgetUnitPrice: value.budgetUnitPrice == null ? null : String(value.budgetUnitPrice) }
+  return { ...value, version: procurementInteger(value.version), purchaseQuantity: procurementInteger(value.purchaseQuantity), id: String(value.id), purchaseWarehouseId: value.purchaseWarehouseId == null ? null : String(value.purchaseWarehouseId), budgetUnitPrice: value.budgetUnitPrice == null ? null : String(value.budgetUnitPrice) }
 }
 function truckSummary(value: TruckSummaryPayload): LocalTransportOrder {
   return { ...value, id: String(value.id), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
@@ -63,6 +67,22 @@ export async function listOverseasPurchases(query: OverseasPurchaseQuery = {}) {
 export async function getOverseasPurchase(orderNo: string, customerId: string) {
   const response = await http.get<ApiEnvelope<PlatformProcurement>, ApiEnvelope<PlatformProcurement>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { params: { customerId } })
   const detail = unwrapApiResponse(response)
+  detail.customerView.order.version = procurementInteger(detail.customerView.order.version)
+  detail.customerView.order.purchaseQuantity = procurementInteger(detail.customerView.order.purchaseQuantity)
+  for (const row of [...detail.customerView.boxes, ...detail.customerView.shipments]) row.quantity = procurementInteger(row.quantity)
+  for (const fee of detail.customerView.fees) if (fee.version != null) fee.version = procurementInteger(fee.version)
+  if (detail.purchaseFacts?.purchased_quantity != null) detail.purchaseFacts.purchased_quantity = procurementInteger(detail.purchaseFacts.purchased_quantity)
+  if (detail.physical.packingVersion != null) detail.physical.packingVersion = procurementInteger(detail.physical.packingVersion)
+  for (const row of detail.physical.receipts) {
+    row.goodQuantity = procurementInteger(row.goodQuantity); row.damagedQuantity = procurementInteger(row.damagedQuantity); row.extraQuantity = procurementInteger(row.extraQuantity)
+  }
+  for (const row of [...detail.physical.dispositions, ...detail.controls.remaining, ...detail.controls.closureItems]) row.quantity = procurementInteger(row.quantity)
+  for (const row of [...detail.physical.cartons, ...detail.transport.overseasCargo, ...detail.transport.domesticCargo]) {
+    row.quantity = procurementInteger(row.quantity)
+    for (const source of row.sources) source.quantity = procurementInteger(source.quantity)
+  }
+  for (const fee of detail.fees) fee.feeVersion = procurementInteger(fee.feeVersion)
+  for (const file of detail.files) file.sizeBytes = procurementInteger(file.sizeBytes)
   if (detail.purchaseFacts?.actual_warehouse_id != null) detail.purchaseFacts.actual_warehouse_id = String(detail.purchaseFacts.actual_warehouse_id)
   detail.physical.dispositions = detail.physical.dispositions.map(row => ({ ...row, id: String(row.id), source_carton_id: row.source_carton_id == null ? null : String(row.source_carton_id), receipt_id: row.receipt_id == null ? null : String(row.receipt_id), voucher_file_id: String(row.voucher_file_id) }))
   detail.physical.receipts = detail.physical.receipts.map(row => ({ ...row, id: String(row.id), sourceCartonId: row.sourceCartonId == null ? null : String(row.sourceCartonId) }))
@@ -76,6 +96,8 @@ export async function getOverseasPurchase(orderNo: string, customerId: string) {
   detail.files = detail.files.map(file => ({ ...file, id: String(file.id), fileId: String(file.fileId) }))
   for (const leg of ['overseasCargo', 'domesticCargo'] as const) detail.transport[leg] = detail.transport[leg].map(row => ({ ...row, cartonId: String(row.cartonId), packagingRecordId: row.packagingRecordId == null ? null : String(row.packagingRecordId), sources: row.sources.map(source => ({ ...source, receiptId: String(source.receiptId) })) }))
   for (const labels of [detail.transport.overseasLabels, detail.transport.domesticLabels]) if (labels) {
+    labels.version = procurementInteger(labels.version)
+    for (const label of labels.labels) label.page = procurementInteger(label.page)
     labels.id = String(labels.id); labels.manifestId = String(labels.manifestId)
     labels.labels = labels.labels.map(row => ({ ...row, cartonId: String(row.cartonId), fileId: String(row.fileId) }))
   }
@@ -83,7 +105,10 @@ export async function getOverseasPurchase(orderNo: string, customerId: string) {
 }
 export async function getOverseasPurchaseEditor(orderNo: string, customerId: string) {
   const response = await http.get<ApiEnvelope<OverseasPurchaseEditorDetail>, ApiEnvelope<OverseasPurchaseEditorDetail>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { params: { customerId } })
-  return unwrapApiResponse(response)
+  const detail = unwrapApiResponse(response)
+  detail.customerView.order.version = procurementInteger(detail.customerView.order.version)
+  detail.customerView.order.purchaseQuantity = procurementInteger(detail.customerView.order.purchaseQuantity)
+  return detail
 }
 export async function updateOverseasPurchase(orderNo: string, customerId: string, payload: UpdateOverseasPurchaseRequest) {
   const response = await http.patch<ApiEnvelope<ProcurementDetailPayload>, ApiEnvelope<ProcurementDetailPayload>>(`${procurementBasePath}/${encodeURIComponent(orderNo)}`, { version: payload.version, remark: payload.remark }, { params: { customerId } })

From 901431f17af41dce4bccf23850d591151fd18501 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 10:44:07 +0800
Subject: [PATCH 17/47] feat(appointments): simplify planning and preserve
 source warehouse intent

---
 src/core/auth/auth.test.ts                    | 56 +++++++++++
 src/core/auth/auth.ts                         |  4 +
 .../AppointmentCalendarPanel.test.ts          |  2 +-
 .../AppointmentCalendarPanel.vue              |  2 +-
 .../AppointmentCalendarView.test.ts           | 44 ++++++---
 .../AppointmentCalendarView.vue               | 92 ++++++++++---------
 .../AppointmentCargoPanel.vue                 | 70 +++++++++++++-
 .../AppointmentFollowupDialog.vue             |  1 +
 .../AppointmentTableRendering.test.ts         | 18 +++-
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  8 +-
 .../appointment-calendar/planningApi.ts       | 22 +++++
 .../overseas-master-data/PROTOTYPE_MATRIX.md  |  1 +
 .../components/CapacityInquiryDialog.vue      |  3 +-
 .../pages/CapacityOfferDetailView.vue         |  1 +
 .../pages/CapacityOffersBehavior.test.ts      | 36 +++++++-
 .../pages/CapacityOffersView.vue              |  1 +
 .../API_INTEGRATION_MATRIX.md                 |  2 +-
 .../api/inboundOrders.test.ts                 | 10 +-
 .../overseas-warehouse/api/inboundOrders.ts   | 37 ++++++--
 .../appointmentForm.test.ts                   | 15 +++
 .../overseas-warehouse/appointmentForm.ts     | 28 ++++++
 .../components/FbaAppointmentFields.vue       | 30 ++++++
 src/modules/overseas-warehouse/index.ts       |  4 +-
 .../pages/InboundOrdersView.vue               | 40 ++++----
 .../pages/prototypeContract.test.ts           |  3 +-
 src/modules/overseas-warehouse/types.ts       |  1 +
 26 files changed, 423 insertions(+), 108 deletions(-)
 create mode 100644 src/modules/overseas-warehouse/appointmentForm.test.ts
 create mode 100644 src/modules/overseas-warehouse/appointmentForm.ts
 create mode 100644 src/modules/overseas-warehouse/components/FbaAppointmentFields.vue

diff --git a/src/core/auth/auth.test.ts b/src/core/auth/auth.test.ts
index e8898056..2e3062cd 100644
--- a/src/core/auth/auth.test.ts
+++ b/src/core/auth/auth.test.ts
@@ -242,6 +242,62 @@ describe('admin auth session', () => {
     expect(localStorage.getItem('cc-admin-token')).toBeNull()
   })
 
+  it('rejects an old refresh after another tab has switched to a different account', async () => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'admin-refresh')
+    localStorage.setItem('cc-admin-permission-codes', '["platform:warehouse:list"]')
+    let finishRefresh!: (value: ReturnType<typeof loginResponse>) => void
+    mocks.post.mockImplementation(() => new Promise(resolve => { finishRefresh = resolve }))
+    mocks.listCurrentPlatformPermissionCodes.mockResolvedValue(['platform:warehouse:list'])
+    const listeners = vi.spyOn(window, 'addEventListener')
+    const auth = useAuthStore()
+    const onStorage = listeners.mock.calls.find(([name]) => name === 'storage')![1] as (event: StorageEvent) => void
+    listeners.mockRestore()
+    const refreshing = auth.refreshSession()
+    await Promise.resolve()
+    const salesToken = token({ user_id: '2000002', username: 'sales' })
+    localStorage.setItem('cc-admin-token', salesToken)
+    localStorage.setItem('cc-admin-refresh-token', 'sales-refresh')
+    localStorage.setItem('cc-admin-permission-codes', '["platform:fleet:capacity-offer:list"]')
+    onStorage(new StorageEvent('storage', { key: 'cc-admin-token' }))
+    expect(auth.user?.account).toBe('sales')
+    finishRefresh(loginResponse(token(), 'admin-rotated'))
+    await expect(refreshing).rejects.toThrow('登录会话已被后续操作替代')
+    expect(auth.user?.account).toBe('sales')
+    expect(auth.token).toBe(salesToken)
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBe('sales-refresh')
+    expect([...auth.permissionCodes]).toEqual(['platform:fleet:capacity-offer:list'])
+  })
+
+  it('discards late permission results after another tab switches accounts without clearing the new session', async () => {
+    mocks.post.mockResolvedValue(loginResponse())
+    let finishPermissions!: (value: string[]) => void
+    let permissionsStarted!: () => void
+    const started = new Promise<void>(resolve => { permissionsStarted = resolve })
+    mocks.listCurrentPlatformPermissionCodes.mockImplementation(() => {
+      permissionsStarted()
+      return new Promise(resolve => { finishPermissions = resolve })
+    })
+    const listeners = vi.spyOn(window, 'addEventListener')
+    const auth = useAuthStore()
+    const onStorage = listeners.mock.calls.find(([name]) => name === 'storage')![1] as (event: StorageEvent) => void
+    listeners.mockRestore()
+    const login = auth.login('platform_admin', 'password')
+    await started
+    const salesToken = token({ user_id: '2000002', username: 'sales' })
+    localStorage.setItem('cc-admin-token', salesToken)
+    localStorage.setItem('cc-admin-refresh-token', 'sales-refresh')
+    localStorage.setItem('cc-admin-permission-codes', '["platform:fleet:capacity-offer:list"]')
+    onStorage(new StorageEvent('storage', { key: 'cc-admin-token' }))
+    finishPermissions(['platform:warehouse:list'])
+    await expect(login).rejects.toThrow('登录会话已被后续操作替代')
+    expect(auth.user?.account).toBe('sales')
+    expect(auth.token).toBe(salesToken)
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBe('sales-refresh')
+    expect([...auth.permissionCodes]).toEqual(['platform:fleet:capacity-offer:list'])
+    expect(mocks.post).toHaveBeenCalledTimes(1)
+  })
+
   it('refreshes a rejected logout once and revokes the rotated pair without restoring local state', async () => {
     const previous = token()
     const rotated = token({ token_version: 2 })
diff --git a/src/core/auth/auth.ts b/src/core/auth/auth.ts
index 2c206da9..d8072e09 100644
--- a/src/core/auth/auth.ts
+++ b/src/core/auth/auth.ts
@@ -144,6 +144,10 @@ export const useAuthStore = defineStore('admin-auth', () => {
     try {
       const session = sessionFromToken(storedToken)
       const cachedPermissions = JSON.parse(localStorage.getItem(PERMISSION_CODES_KEY) || '[]') as unknown
+      // A different account in another tab supersedes this tab's pending login/refresh responses.
+      if (user.value?.id !== session.user.id || user.value?.account !== session.user.account) {
+        sessionGeneration += 1
+      }
       token.value = storedToken
       refreshToken.value = storedRefreshToken
       user.value = session.user
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
index 8cfe2150..41d43a17 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
@@ -46,7 +46,7 @@ describe('appointment calendar interactions', () => {
     await wrapper.findAll('button').find(button => button.text() === '＋ 新增预约')!.trigger('click')
     expect(wrapper.emitted('create')).toEqual([['2026-09-24']])
     await wrapper.findAll('button').find(button => button.text() === '编辑')!.trigger('click')
-    await wrapper.findAll('button').find(button => button.text() === '删除')!.trigger('click')
+    await wrapper.findAll('button').find(button => button.text() === '取消预约')!.trigger('click')
     expect(wrapper.emitted('edit')?.[0]?.[0]).toMatchObject({ key: 'a' })
     expect(wrapper.emitted('delete')?.[0]?.[0]).toMatchObject({ key: 'a' })
   })
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index dd418631..f7ae284b 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -109,7 +109,7 @@ defineExpose({ selectedDate, mode })
           <AppointmentInboundCodes v-if="event.inboundCodes" :codes="event.inboundCodes" />
           <footer v-if="event.canEdit || event.canDelete" class="density-actions">
             <el-button v-if="event.canEdit" class="density-action" :disabled="loading" @click="emit('edit', event)">编辑</el-button>
-            <el-button v-if="event.canDelete" class="density-action" data-tone="danger" :disabled="loading" @click="emit('delete', event)">删除</el-button>
+            <el-button v-if="event.canDelete" class="density-action" data-tone="danger" :disabled="loading" @click="emit('delete', event)">取消预约</el-button>
           </footer>
         </article>
       </div>
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index a9e92753..5cc60ff4 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -3,9 +3,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCalendarView from './AppointmentCalendarView.vue'
 import { createFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
 import { listArrivalCalendar } from './api'
-import { resolvePlanningSource, saveFollowup } from './planningApi'
+import { resolvePlanningSource, saveFollowup, listUnscheduledAppointments } from './planningApi'
 const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true }))
-vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn() }))
+vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listUnscheduledAppointments: vi.fn() }))
 import { listPlatformWarehouses } from '@/modules/warehouses'
 vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
 
@@ -14,7 +14,7 @@ vi.mock('vue-router', () => ({ useRoute: () => routing, useRouter: () => ({ push
 vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), deleteAppointment: vi.fn() }))
 
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => permission !== 'source-read' || routing.canSourceRead }) }))
-vi.mock('@/modules/overseas-warehouse', () => ({
+vi.mock('@/modules/overseas-warehouse', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/modules/overseas-warehouse')>()),
   createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(), listFbaAppointmentCalendar: vi.fn(),
   listInboundOrders: vi.fn(), updateFbaAppointment: vi.fn(),
   overseasWarehousePermissions: { inboundOrderAppointment: 'write', lastMileOrderList: 'source-read' },
@@ -22,8 +22,8 @@ vi.mock('@/modules/overseas-warehouse', () => ({
 vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
 
 const candidates = [
-  { lineId: '9007199254740993', customerId: 'A', fbaWarehouseCode: 'ONT8', planId: '1', planNo: 'IN-A', orderId: '10' },
-  { lineId: '9007199254740994', customerId: 'B', fbaWarehouseCode: 'ONT8', planId: '2', planNo: 'IN-B', orderId: '20' },
+  { lineId: '9007199254740993', customerId: 'A', overseasWarehouseId: '100', fbaWarehouseCode: 'ONT8', planId: '1', planNo: 'IN-A', orderId: '10' },
+  { lineId: '9007199254740994', customerId: 'B', overseasWarehouseId: '100', fbaWarehouseCode: 'ONT8', planId: '2', planNo: 'IN-B', orderId: '20' },
 ]
 function render() {
   return mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
@@ -48,9 +48,10 @@ describe('appointment calendar data integration', () => {
     routing.query = {}; routing.canSourceRead = true
     vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: ['ONT8', 'LAX9'].map(code => ({ id: code, tenantId: 0, warehouseCode: code, warehouseName: code, warehouseType: 'FBA' as const, status: 'ACTIVE' as const, internalCode: null, countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, remark: null })), page: 1, size: 50, pages: 1, total: 2 })
     vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([])
+    vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [], total: 0})
     vi.mocked(listArrivalCalendar).mockResolvedValue([])
     vi.mocked(listInboundOrders).mockResolvedValue({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
-    vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', appointmentAt: '2026-10-09T09:00:00', expectedLoadingAt: '2026-10-09T07:00:00', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
+    vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
   it('creates one shared appointment for two customers without sending a fabricated header customer', async () => {
@@ -64,13 +65,12 @@ describe('appointment calendar data integration', () => {
     await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
     await flushPromises()
     await wrapper.get('[data-select]').trigger('click')
-    await wrapper.get('input[placeholder="填写仓库提供的预约编号"]').setValue('APT-AB')
-    await wrapper.findAll('[data-date]')[1]!.setValue('2026-10-09T07:00:00')
+    expect(wrapper.find('input[placeholder="填写仓库提供的预约编号"]').exists()).toBe(false)
     await wrapper.get('[data-save]').trigger('click')
     await flushPromises()
     expect(createFbaAppointment).toHaveBeenCalledTimes(1)
     expect(createFbaAppointment).toHaveBeenCalledWith(expect.objectContaining({
-      appointmentNo: 'APT-AB', lineIds: ['9007199254740993', '9007199254740994'],
+      originWarehouseId: '100', fbaWarehouseCode: 'ONT8', lineIds: ['9007199254740993', '9007199254740994'], idempotencyKey: expect.any(String), details: expect.objectContaining({plannedDate: '2026-10-09', appointmentStatus: 'PENDING', appointmentAt: null, confirmationNo: null}),
     }))
     expect(vi.mocked(createFbaAppointment).mock.calls[0]![0]).not.toHaveProperty('customerId')
     expect(listInboundOrders).toHaveBeenCalledTimes(1)
@@ -88,6 +88,27 @@ describe('appointment calendar data integration', () => {
     await flushPromises()
     expect(listInboundOrders).toHaveBeenLastCalledWith({ page: 1, size: 10, fbaWarehouseCode: 'ONT8' })
   })
+  it('keeps a pending unknown save retry on the same immutable command', async () => {
+    vi.mocked(createFbaAppointment).mockRejectedValueOnce(new Error('response lost'))
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('[data-create]').trigger('click'); await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8'); await flushPromises()
+    await wrapper.get('[data-select]').trigger('click')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    const first = vi.mocked(createFbaAppointment).mock.calls[0]![0]
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(vi.mocked(createFbaAppointment).mock.calls[1]![0]).toEqual(first)
+    expect(first.details.appointmentAt).toBeNull()
+    expect(first.details.confirmationNo).toBeNull()
+    expect(first.idempotencyKey).toBeTruthy()
+  })
+  it('keeps undated arrangements outside calendar time slots', async () => {
+    vi.mocked(listUnscheduledAppointments).mockResolvedValueOnce({ records: [{ id:'1', version:0, appointmentNo:'AP-UNSCHEDULED', originWarehouseId:'100', appointmentStatus:'PENDING', selectedCount:2, fbaWarehouseCode:'ONT8', items:[] }], total:1 })
+    const wrapper=render(); await flushPromises()
+    expect(wrapper.text()).toContain('未定时安排（1）')
+    expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('events')).toEqual([])
+    expect(wrapper.findComponent({name:'DataTable'}).props('data')[0]).not.toHaveProperty('appointmentAt')
+  })
 
   it('changing or clearing the warehouse clears prior cargo selection and blocks saving it', async () => {
     const wrapper = render()
@@ -96,8 +117,7 @@ describe('appointment calendar data integration', () => {
     await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
     await flushPromises()
     await wrapper.get('[data-select]').trigger('click')
-    await wrapper.get('input[placeholder="填写仓库提供的预约编号"]').setValue('APT-AB')
-    await wrapper.findAll('[data-date]')[1]!.setValue('2026-10-09T07:00:00')
+    expect(wrapper.find('input[placeholder="填写仓库提供的预约编号"]').exists()).toBe(false)
     await wrapper.get('select[aria-label="预约仓库"]').setValue('')
     await wrapper.get('[data-save]').trigger('click')
     expect(createFbaAppointment).not.toHaveBeenCalled()
@@ -148,7 +168,7 @@ describe('appointment calendar data integration', () => {
 
   it('keeps delivery appointments when the arrival source fails', async () => {
     vi.mocked(listArrivalCalendar).mockRejectedValueOnce(new Error('到港暂不可用'))
-    vi.mocked(listFbaAppointmentCalendar).mockResolvedValueOnce([{ version: 0, id: '1', appointmentNo: 'APT-AB', appointmentAt: '2026-10-09T09:00:00', expectedLoadingAt: '2026-10-09T07:00:00', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] }])
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValueOnce([{ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] }])
     const wrapper = render()
     await flushPromises()
     const calendar = wrapper.findComponent({ name: 'AppointmentCalendarPanel' })
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index aedd3f55..2a0ce7a6 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -2,7 +2,7 @@
 import '@/styles/adminDensity.css'
 import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
-import { resolvePlanningSource, type ResolvedPlanningSource } from './planningApi'
+import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
@@ -15,7 +15,8 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
 import {
   createFbaAppointment, getFbaAppointment, listFbaAppointmentCalendar, listInboundOrders, updateFbaAppointment,
   overseasWarehousePermissions as permission,
-  type FbaAppointmentDto, type BatchFbaAppointmentPayload, type InboundOrderSummaryDto,
+  FbaAppointmentFields, createAppointmentForm, appointmentPayload, appointmentFormError,
+  type FbaAppointmentDto, type FbaAppointmentDetailsPayload, type InboundOrderSummaryDto,
 } from '@/modules/overseas-warehouse'
 import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
 import AppointmentCalendarPanel, { type CalendarEvent } from './AppointmentCalendarPanel.vue'
@@ -65,8 +66,18 @@ let calendarController: AbortController | undefined
 let calendarRequest = 0
 let candidateRequest = 0
 let detailRequest = 0
-const form = reactive({ appointmentEndAt: '', appointmentNo: '', appointmentAt: '', expectedLoadingAt: '', appointmentStatus: 'PENDING' as BatchFbaAppointmentPayload['appointmentStatus'], appointmentRemark: '' })
-const statusLabels: Record<string, string> = { PENDING: '预约中', SUCCESS: '预约成功', FAILED: '预约失败', CANCELLED: '已取消' }
+const form = reactive(createAppointmentForm())
+const pendingSave = ref<{ appointmentNo: string | null; version: number; originWarehouseId: string; fbaWarehouseCode: string; lineIds: string[]; details: FbaAppointmentDetailsPayload; idempotencyKey: string } | null>(null)
+const unscheduled = ref<FbaAppointmentDto[]>([]), unscheduledTotal = ref(0), unscheduledPage = ref(1), unscheduledSize = ref(10)
+const unscheduledError = ref<ApiErrorDetails | null>(null)
+const unscheduledColumns: DataTableColumn[] = [{key:'actions',label:'操作',slotName:'actions',width:100,fixed:'left'},{prop:'appointmentNo',label:'系统预约单号',minWidth:200},{prop:'fbaWarehouseCode',label:'目的仓',width:100},{prop:'selectedCount',label:'票数',width:80}]
+let unscheduledRequest = 0
+async function loadUnscheduled() {
+  const current = ++unscheduledRequest; unscheduledError.value = null
+  try { const result = await listUnscheduledAppointments(unscheduledPage.value, unscheduledSize.value); if(current === unscheduledRequest) {unscheduled.value = result.records; unscheduledTotal.value = result.total} }
+  catch(cause) {if(current === unscheduledRequest) unscheduledError.value = getApiErrorDetails(cause, '未定时安排加载失败')}
+}
+const statusLabels: Record<string, string> = { PENDING: '安排待确认', SUCCESS: '对方已确认', FAILED: '未约成', CANCELLED: '已取消' }
 const columns: DataTableColumn[] = [
   { key: 'selection', type: 'selection', reserveSelection: true, width: 46, selectable: (row: InboundOrderSummaryDto) => row.fbaWarehouseCode === searchedWarehouse.value && (!row.appointmentStatus || ['FAILED', 'CANCELLED'].includes(row.appointmentStatus)) },
   { prop: 'inboundCode', label: '入仓码', minWidth: 150 },
@@ -89,15 +100,17 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
     { label: '货物去向', value: arrival.destinationWarehouseCode },
   ],
 })), ...appointments.value.map(appointment => ({
-  key: appointment.appointmentNo, type: 'delivery' as const, date: appointment.appointmentAt.slice(0, 10),
-  time: appointment.appointmentAt.slice(11, 16) + (appointment.appointmentEndAt ? `–${appointment.appointmentEndAt.slice(11, 16)}` : ''), title: `${appointment.fbaWarehouseCode} 预约送仓`,
+  key: appointment.appointmentNo, type: 'delivery' as const, date: (appointment.appointmentAt || appointment.plannedAt || appointment.plannedDate || '').slice(0, 10),
+  time: (appointment.appointmentAt || appointment.plannedAt || '').slice(11, 16) + (appointment.appointmentEndAt ? `–${appointment.appointmentEndAt.slice(11, 16)}` : ''), title: `${appointment.fbaWarehouseCode} ${appointment.appointmentStatus === 'SUCCESS' ? '已确认送仓' : '计划送仓'}`,
   fields: [
     { label: '预约仓库', value: appointment.fbaWarehouseCode },
-    { label: '预约编号', value: appointment.appointmentNo },
+    { label: '系统单号', value: appointment.appointmentNo },
+    { label: '外部约号', value: appointment.confirmationNo },
+    { label: '地点时区', value: appointment.timezone || '待核实' },
     { label: '预约状态', value: statusLabels[appointment.appointmentStatus] || '—' },
     { label: '货物信息', value: `${appointment.selectedCount} 票 / ${new Set(appointment.items.map(item => item.customerId)).size} 个客户` },
     { label: '预约备注', value: appointment.appointmentRemark },
-  ],
+  ].filter(field => field.value != null && field.value !== ''),
   inboundCodes: appointment.items.map(item => item.inboundCode),
   canEdit: access.can(permission.inboundOrderAppointment),
   canDelete: access.can('platform:appointment:delete'),
@@ -144,16 +157,17 @@ function openCreate(date: string) {
   candidateTotal.value = 0
   candidateError.value = null
   dialogError.value = null
-  Object.assign(form, { appointmentEndAt: '', appointmentNo: '', appointmentAt: `${date}T09:00:00`, expectedLoadingAt: '', appointmentStatus: 'PENDING', appointmentRemark: '' })
+  Object.assign(form, createAppointmentForm(), { plannedDate: date }); pendingSave.value = null
   dialogOpen.value = true
   detailReady.value = true
   void searchWarehouses('')
 }
 
-async function openEdit(event: CalendarEvent) {
+async function openEdit(event: Pick<CalendarEvent, 'key'>) {
   const request = ++detailRequest
   dialogError.value = null
-  editing.value = appointments.value.find(item => item.appointmentNo === event.key) || null
+  editing.value = [...appointments.value, ...unscheduled.value].find(item => item.appointmentNo === event.key) || null
+  pendingSave.value = null
   if (!editing.value) return
   dialogOpen.value = true
   detailLoading.value = true
@@ -164,9 +178,7 @@ async function openEdit(event: CalendarEvent) {
     editing.value = detail
     detailReady.value = true
     warehouse.value = detail.fbaWarehouseCode
-    Object.assign(form, { appointmentEndAt: detail.appointmentEndAt || '', appointmentNo: detail.appointmentNo, appointmentAt: detail.appointmentAt,
-      expectedLoadingAt: detail.expectedLoadingAt, appointmentStatus: detail.appointmentStatus,
-      appointmentRemark: detail.appointmentRemark || '' })
+    Object.assign(form, createAppointmentForm(detail))
   } catch (error) {
     if (request === detailRequest) dialogError.value = getApiErrorDetails(error, '预约详情加载失败')
   } finally { if (request === detailRequest) detailLoading.value = false }
@@ -222,13 +234,13 @@ async function loadCandidates() {
 
 async function save() {
   if (saving.value || detailLoading.value || !detailReady.value) return
-  if (!form.appointmentNo.trim() || !form.appointmentAt || !form.expectedLoadingAt) {
-    ElMessage.warning('请填写预约号、预约送仓时间和预计装车时间'); return
-  }
+  const validation = appointmentFormError(form)
+  if (!pendingSave.value && validation) { ElMessage.warning(validation); return }
   if (!editing.value) {
     if (!warehouse.value || warehouse.value !== searchedWarehouse.value || candidateLoading.value || candidateError.value) { ElMessage.warning('请先选择仓库并等待货物加载完成'); return }
     if (selected.value.some(item => item.fbaWarehouseCode !== warehouse.value)) { ElMessage.warning('请重新选择当前仓库的货物'); return }
     if (!selected.value.length) { ElMessage.warning('请选择需要预约的货物'); return }
+    if (selected.value.some(item => !item.overseasWarehouseId) || new Set(selected.value.map(item => item.overseasWarehouseId)).size !== 1) { ElMessage.warning('请选择同一接仓点的货物'); return }
     if (new Set(selected.value.map(item => item.fbaWarehouseCode)).size !== 1) {
       ElMessage.warning('同一预约的货物必须送往同一目的仓'); return
     }
@@ -236,14 +248,15 @@ async function save() {
   saving.value = true
   dialogError.value = null
   try {
-    const common = { appointmentEndAt: form.appointmentEndAt || null, appointmentAt: form.appointmentAt, expectedLoadingAt: form.expectedLoadingAt,
-      appointmentStatus: form.appointmentStatus, appointmentRemark: form.appointmentRemark.trim() || undefined }
-    if (editing.value) await updateFbaAppointment(editing.value.appointmentNo, { ...common, version: editing.value.version })
-    else await createFbaAppointment({ ...common, appointmentNo: form.appointmentNo.trim(), lineIds: selected.value.map(item => item.lineId) })
+    pendingSave.value ||= {appointmentNo: editing.value?.appointmentNo || null, version: editing.value?.version || 0, originWarehouseId: String(selected.value[0]?.overseasWarehouseId || ''), fbaWarehouseCode: searchedWarehouse.value, lineIds: selected.value.map(item => item.lineId), details: appointmentPayload(form), idempotencyKey: crypto.randomUUID()}
+    const payload = pendingSave.value
+    if (payload.appointmentNo) await updateFbaAppointment(payload.appointmentNo, { details: payload.details, version: payload.version, idempotencyKey: payload.idempotencyKey })
+    else await createFbaAppointment({ originWarehouseId: payload.originWarehouseId, fbaWarehouseCode: payload.fbaWarehouseCode, details: payload.details, idempotencyKey: payload.idempotencyKey, lineIds: payload.lineIds })
+    pendingSave.value = null
     dialogOpen.value = false
     ElMessage.success('预约已保存')
-    await load()
-  } catch (error) { dialogError.value = getApiErrorDetails(error, '预约保存失败，请核对后重试') }
+    await Promise.all([load(), loadUnscheduled()])
+  } catch (error) { dialogError.value = getApiErrorDetails(error, '预约保存失败，请核对后重试'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(dialogError.value.code || '')) pendingSave.value = null }
   finally { saving.value = false }
 }
 
@@ -255,17 +268,17 @@ async function remove(event: CalendarEvent) {
   const appointment = appointments.value.find(item => item.appointmentNo === event.key)
   if (!appointment || loading.value) return
   try {
-    await ElMessageBox.confirm(`确认删除预约 ${appointment.appointmentNo}？该操作会解除全部 ${appointment.selectedCount} 票货物的预约关联。`, '删除预约',
-      { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'admin-density-confirm' })
+    await ElMessageBox.confirm(`确认取消预约 ${appointment.appointmentNo}？将释放全部 ${appointment.selectedCount} 票货物的占用，历史仍保留。`, '取消预约',
+      { type: 'warning', confirmButtonText: '确认取消预约', cancelButtonText: '返回', customClass: 'admin-density-confirm' })
   } catch { return }
   loading.value = true
   try {
     await deleteAppointment(appointment.appointmentNo, appointment.version)
-    ElMessage.success('预约已删除')
+    ElMessage.success('预约已取消，历史仍保留')
     await load()
   } catch (error) {
-    errorTitle.value = '预约删除失败'
-    loadError.value = getApiErrorDetails(error, '预约删除失败')
+    errorTitle.value = '预约取消失败'
+    loadError.value = getApiErrorDetails(error, '预约取消失败')
   } finally { loading.value = false }
 }
 
@@ -291,8 +304,8 @@ async function resolveLink() {
 }
 watch(() => [route.query.sourceKey, route.query.customerId, route.query.destinationKey], resolveLink, { immediate: true })
 
-onMounted(() => load())
-onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest; ++warehouseRequest; ++linkRequest; calendarController?.abort() })
+onMounted(() => { void load(); void loadUnscheduled() })
+onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequest; ++detailRequest; ++warehouseRequest; ++linkRequest; calendarController?.abort() })
 </script>
 
 <template>
@@ -305,14 +318,16 @@ onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest;
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">整柜提柜与接仓</button>
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">已开船 FBA 货物</button>
     </div>
-    <AppointmentCargoPanel v-if="workView === 'cargo'" />
+    <AppointmentCargoPanel v-if="workView === 'cargo'" @created="load(); loadUnscheduled()" />
     <AppointmentContainerPanel v-if="workView === 'containers'" />
     <div v-show="workView === 'calendar'">
     <LoadErrorState v-if="loadError" :title="errorTitle" :message="loadError.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
+    <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
+    <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
     <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" />
     </div>
-    <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" confirm-text="保存" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
+    <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
       <div v-loading="detailLoading">
         <el-form label-position="top" class="calendar-form density-form">
@@ -322,21 +337,10 @@ onBeforeUnmount(() => { ++calendarRequest; ++candidateRequest; ++detailRequest;
               <el-option v-for="item in warehouseOptions" :key="String(item.id)" :value="item.warehouseCode" :label="item.warehouseName === item.warehouseCode ? item.warehouseCode : `${item.warehouseCode} · ${item.warehouseName}`" />
             </el-select>
           </el-form-item>
-          <el-form-item label="预约送仓时间" required><el-date-picker v-model="form.appointmentAt" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
-          <el-form-item label="预约编号" required><el-input v-model="form.appointmentNo" :readonly="!!editing" maxlength="64" placeholder="填写仓库提供的预约编号" /></el-form-item>
-          <el-form-item label="预计装车时间" required><el-date-picker v-model="form.expectedLoadingAt" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
-          <el-form-item v-if="editing" label="预约状态"><el-select v-model="form.appointmentStatus"><el-option v-for="(label, value) in statusLabels" :key="value" :value="value" :label="label" /></el-select></el-form-item>
         </el-form>
         <LoadErrorState v-if="!editing && warehouseError" title="仓库加载失败" :message="warehouseError.message" @retry="searchWarehouses(warehouseKeyword)" />
         <p v-if="!editing && warehouseTotal > warehouseOptions.length && !warehouseError" class="appointment-hint">输入更完整的仓库编码或名称，缩小搜索范围。</p>
-        <details :key="editing?.appointmentNo || 'create'" class="appointment-extra">
-          <summary>补充信息（结束时间、备注{{ editing ? '' : '、状态' }}）</summary>
-          <el-form label-position="top" class="calendar-form density-form">
-            <el-form-item label="预约结束时间"><el-date-picker v-model="form.appointmentEndAt" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
-            <el-form-item v-if="!editing" label="预约状态"><el-select v-model="form.appointmentStatus"><el-option v-for="(label, value) in statusLabels" :key="value" :value="value" :label="label" /></el-select></el-form-item>
-            <el-form-item label="备注"><el-input v-model="form.appointmentRemark" maxlength="1000" placeholder="有特殊要求时填写" /></el-form-item>
-          </el-form>
-        </details>
+        <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="saving || !!pendingSave" />
         <template v-if="!editing && warehouse">
           <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
             <template #customer="{ row }">{{ row.customerName?.trim() || '客户名称缺失' }}</template>
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index 3d330793..f1435965 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { FbaAppointmentFields, createAppointmentForm, appointmentPayload, appointmentFormError, overseasWarehousePermissions } from '@/modules/overseas-warehouse'
+import AppDialog from '@/shared/components/AppDialog.vue'
 import { useRouter } from 'vue-router'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import QueryToolbar, { type QueryModel, type QueryField } from '@/shared/components/QueryToolbar.vue'
@@ -7,14 +10,58 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import RowActions from '@/shared/components/RowActions.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { listPlanningCargo, resolvePlanningSource, type ResolvedPlanningSource, type PlanningCargo } from './planningApi'
+import { listPlanningCargo, resolvePlanningSource, previewPlanningBatch, createSourceAppointment, type SourceAppointmentPayload, type PlanningBatchPreview, type ResolvedPlanningSource, type PlanningCargo } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 
 const router = useRouter()
 const access = useAccessPreviewStore()
+const emit = defineEmits<{ created: [] }>()
+const arrangement = reactive(createAppointmentForm())
+const creating = ref(false), createError = ref<ApiErrorDetails | null>(null)
+const pendingCreate = ref<SourceAppointmentPayload | null>(null)
 const following = ref<ResolvedPlanningSource | null>(null)
 const followupError = ref<ApiErrorDetails | null>(null)
+const selected = ref<Record<string, PlanningCargo>>({})
+const selectedRows = computed(() => Object.values(selected.value))
+const batchPreview = ref<PlanningBatchPreview | null>(null)
+const batchLoading = ref(false), batchError = ref<ApiErrorDetails | null>(null)
+let batchRequest = 0
+function selectable(row: PlanningCargo) {
+  const anchor = selectedRows.value[0]
+  return !row.detained && !row.mixedDestinations && !row.hasActiveAppointment && (!anchor || (anchor.originWarehouseId === row.originWarehouseId && anchor.destinationWarehouseCode === row.destinationWarehouseCode))
+}
+function toggle(row: PlanningCargo, checked: unknown) {
+  batchError.value = null
+  if (checked && selectable(row) && selectedRows.value.length < 100) selected.value[row.sourceKey] = row
+  else delete selected.value[row.sourceKey]
+}
+function selectPage() { for (const row of rows.value) if (selectable(row) && selectedRows.value.length < 100) selected.value[row.sourceKey] = row }
+async function previewBatch() {
+  if (!selectedRows.value.length || batchLoading.value) return
+  const current = ++batchRequest
+  batchLoading.value = true; batchError.value = null
+  try {
+    const result = await previewPlanningBatch(selectedRows.value.map(row => ({ sourceKey: row.sourceKey, customerId: row.customerId, destinationKey: `FBA:${row.destinationWarehouseCode}` })))
+    if (current === batchRequest) { batchPreview.value = result; Object.assign(arrangement, createAppointmentForm()); pendingCreate.value = null; createError.value = null }
+  } catch (cause) { if (current === batchRequest) batchError.value = getApiErrorDetails(cause, '所选货物暂不能合批') }
+  finally { if (current === batchRequest) batchLoading.value = false }
+}
+async function saveArrangement() {
+  if (!batchPreview.value || creating.value || !access.can(overseasWarehousePermissions.inboundOrderAppointment)) return
+  const error = appointmentFormError(arrangement)
+  if (!pendingCreate.value && error) { ElMessage.warning(error); return }
+  pendingCreate.value ||= { originWarehouseId: batchPreview.value.group.originWarehouseId, fbaWarehouseCode: batchPreview.value.destinationWarehouseCode, sources: batchPreview.value.sources.map(row => ({sourceKey: row.sourceKey, customerId: row.customerId, destinationKey: row.destinationKey})), details: appointmentPayload(arrangement), idempotencyKey: crypto.randomUUID() }
+  creating.value = true; createError.value = null
+  try {
+    const result = await createSourceAppointment(pendingCreate.value)
+    pendingCreate.value = null; batchPreview.value = null; selected.value = {}
+    ElMessage.success(`预约安排 ${result.appointmentNo} 已保存`); emit('created'); await load()
+  } catch (cause) {
+    createError.value = getApiErrorDetails(cause, '保存结果待核实，请重试原请求')
+    if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(createError.value.code || '')) pendingCreate.value = null
+  } finally { creating.value = false }
+}
 let followupRequest = 0
 const query = ref<QueryModel>({ keyword: '' })
 const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '货物', placeholder: '入仓码、柜号、客户名称', width: 300 }]
@@ -26,6 +73,7 @@ let request = 0
 let controller: AbortController | undefined
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' },
+  { key: 'select', label: '选择', slotName: 'select', width: 65 },
   { prop: 'inboundCode', label: '入仓码', minWidth: 180 },
   { prop: 'customerName', label: '客户', minWidth: 150 },
   { prop: 'containerNo', label: '柜号', minWidth: 150 },
@@ -63,18 +111,26 @@ async function openFollowup(row: PlanningCargo) {
   } catch (cause) { if (request === followupRequest) followupError.value = getApiErrorDetails(cause, '来源核对失败') }
 }
 onMounted(() => load())
-onBeforeUnmount(() => { ++request; ++followupRequest; controller?.abort() })
+onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller?.abort() })
 </script>
 
 <template>
   <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="sourceKey" @update:page="load()" @update:page-size="load(true)">
+    <template #toolbar-start>已选 {{ selectedRows.length }} 票，可跨客户选择同一起运仓、同一目的仓货物</template>
+    <template #toolbar-actions>
+      <el-button :disabled="loading || batchLoading" @click="selectPage">选择本页可合批货物</el-button>
+      <el-button :disabled="!selectedRows.length || batchLoading" @click="selected = {}; batchError = null">清空选择</el-button>
+      <el-button type="primary" :disabled="!selectedRows.length" :loading="batchLoading" @click="previewBatch">合批核对（{{ selectedRows.length }}/100）</el-button>
+    </template>
     <template #filters><QueryToolbar v-model="query" ariaLabel="在途货物查询" :fields="fields" :loading="loading" @search="load(true)" /></template>
     <template #notices>
+      <LoadErrorState v-if="batchError" title="所选货物暂不能合批" :message="batchError.message" :show-retry="false"><template #details><ApiErrorMeta :details="batchError" /></template></LoadErrorState>
       <LoadErrorState v-if="followupError" title="来源核对失败" :message="followupError.message" :show-retry="false" />
       <LoadErrorState v-if="error" title="已开船货物加载失败" :message="error.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <p v-else class="cargo-note">来源预计时间供筹划核对，确认预约前请核对最新船期与货物备妥情况。</p>
     </template>
     <template #actions="{ row }"><RowActions :actions="[{ key: 'followup', label: '跟进' }, { key: 'source', label: '查看来源' }]" text-actions @action="key => key === 'followup' ? openFollowup(row as PlanningCargo) : source(row as PlanningCargo)" /></template>
+    <template #select="{ row }"><el-checkbox :model-value="!!selected[row.sourceKey]" :aria-label="`选择 ${row.inboundCode || '未关联入仓码'}`" :disabled="batchLoading || (!selected[row.sourceKey] && (!selectable(row as PlanningCargo) || selectedRows.length >= 100))" @change="value => toggle(row as PlanningCargo, value)" /></template>
     <template #progress="{ row }">
       <span v-if="row.detained">暂扣，待处理</span>
       <span v-else-if="row.mixedDestinations">含多个目的地，待核对</span>
@@ -83,6 +139,14 @@ onBeforeUnmount(() => { ++request; ++followupRequest; controller?.abort() })
     </template>
   </DataTable>
   <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" @close="following = null" />
+  <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="pendingCreate ? '重试本次保存' : '保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="batchPreview = null">
+    <p>{{ batchPreview.originWarehouseName }} → {{ batchPreview.destinationWarehouseCode }}</p>
+    <p>{{ batchPreview.group.sourceCount }} 票 / {{ batchPreview.group.customerCount }} 个客户 / 预报 {{ batchPreview.group.packages ?? '待核实' }} 箱</p>
+    <p v-if="batchPreview.group.readinessIncomplete">货物备妥窗口待核实；预计到港或预计到仓不能替代备妥时间。</p>
+    <p>保存前尚未占用货物；先保存安排不代表已取得对方确认。</p>
+    <LoadErrorState v-if="createError" title="预约安排保存未完成" :message="createError.message" :show-retry="false"><template #details><ApiErrorMeta :details="createError" /></template></LoadErrorState>
+    <FbaAppointmentFields :model="arrangement" :disabled="creating || !!pendingCreate" />
+  </AppDialog>
 </template>
 
 <style scoped>
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
index b95d201f..b615d0bd 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
@@ -13,6 +13,7 @@ const emit = defineEmits<{ close: [] }>()
 const stages: Record<FollowupStage, string> = { DRAYAGE_CONTACT: '拖车联系', TERMINAL_APPOINTMENT: '码头约号', WAREHOUSE_RECEIVING: '接仓跟进', FBA_RECEIVING: 'FBA收货跟进' }
 const coverageNeeds: Record<string, string> = {
   DESTINATION: '目的仓与原安排不一致，请核对。',
+  DESTINATION_UNVERIFIED: '来源目的地资料待核实，尚不能判断是否发生变更。',
   CARRIER_CONFIRMATION: '尚未确认承运，请先在原登记完成确认。',
   REAL_CARGO_MATERIALS: '尚未关联实际货物资料，可先记录联系结果。',
   CARGO_QUANTITY_REVIEW: '货量或重复关联需要核对。',
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index 288b57aa..ffb566a0 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -4,9 +4,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, type PlanningCargo, type PlanningSource } from './planningApi'
+import { getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, type PlanningCargo, type PlanningSource } from './planningApi'
 
-vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn() }))
+vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn() }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
@@ -15,6 +15,20 @@ const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], ch
 
 describe('appointment tables use actual shared table slots', () => {
   beforeEach(() => vi.resetAllMocks())
+  it('selects multiple customers and makes one authoritative batch check without per-row resolution', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo, { ...cargo, sourceKey: 'ORDER:2', orderId: '2', inboundCode: 'IN-B', customerId: 'B', customerName: '客户乙' }], page: 1, size: 20, total: 2, pages: 1 })
+    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: 40, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 0 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', sources: [source], missingFields: ['READY_WINDOW_UNVERIFIED'] })
+    const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
+    await flushPromises()
+    await wrapper.findAll('button').find(button => button.text() === '选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(button => button.text().startsWith('合批核对'))!.trigger('click')
+    await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{ sourceKey: 'ORDER:1', customerId: 'A', destinationKey: 'FBA:ONT8' }, { sourceKey: 'ORDER:2', customerId: 'B', destinationKey: 'FBA:ONT8' }])
+    expect(resolvePlanningSource).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain('2 票 / 2 个客户 / 预报 40 箱')
+    expect(wrapper.text()).toContain('保存前尚未占用货物')
+    wrapper.unmount()
+  })
   it('renders one shared container and resolves each receiving warehouse without per-row requests', async () => {
     vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [{ warehouseId: '100', warehouseName: '洛杉矶仓', orderCount: 20, customerCount: 12 }] }] })
     vi.mocked(resolvePlanningContainer).mockResolvedValue({ containerBookingId: 'C1', containerNo: 'CONTAINER-A', warehouseId: '100', warehouseName: '洛杉矶仓', canFollowup: true, blockReasons: [] })
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index 0682cf1f..9f569faf 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -7,18 +7,20 @@
 | 页面/操作 | 原型承载与布局 | 实现约束 |
 |---|---|---|
 | 预约列表 | 左侧月/周日历，右侧选中日期详情 | 保留双栏日历；到港蓝色、送仓绿色，区分预计/实际到港 |
-| 新增预约 | 居中双列表单，原型最大宽度760px | 按2026-10-09用户简化要求，改用居中1080px三列表单；仓库从启用FBA主档远程搜索选择，选择后自动分页加载货物；主区保留仓库、送仓时间、预约编号、预计装车时间，结束时间/备注/新建默认预约中状态收至补充信息，在同弹框下方分页选择真实入仓货物 |
+| 新增预约 | 居中表单，按用户简化要求使用1080px三列 | 仓库远程搜索并自动加载货物；主区保留计划日期、登记阶段及可选备注。系统单号自动生成，不要求外部约号和预计装车时间；计划时段收至补充信息。选择“已取得对方正式确认”才展开外部号和确认时段，并显示地点时区 |
 | 编辑预约 | 复用居中表单 | 与入仓单共用记录；版本校验；真实货物归属不允许手填更改 |
 | 到港详情 | 当天安排右侧只读 | 使用货柜/船节点事实，无逐行详情请求，无模拟到港数据 |
-| 删除预约 | 二次确认 | 显式提示全部货物解除预约关联；独立删除权限，已关联有效排车拒绝删除 |
+| 取消预约 | 二次确认 | 显式提示全部货物释放占用、历史保留；沿用独立权限，已关联有效排车时先处理运输安排，不能自动回退库存 |
 | 月/周切换 | 顶部切换与前后按钮 | 周模式按7天移动，修正原型仍按月移动的问题 |
 | 多条安排 | 日历标签、右侧明细 | 月/周日格均最多显示3条，超出显示“还有N条”，悬停显示当天总数；日格固定高度，右侧全部展示并独立滚动 |
 | 多入仓码 | 用户2026-10-09补充截图：单预约20票导致两列详情被长字符串撑高 | 右侧卡片与编辑弹框共用独立整行入仓码列表；去空去重后显示总数，默认3条，长码悬停可读全文；超过3条可展开/收起，展开后216px内独立滚动并可键盘聚焦，不拼成长段文字 |
 | 在途货物及外接来源跟进 | 美国预约统一方案的提前联系需求 | 日历与已开船FBA列表切换；跟进在居中1080px弹框中承载，3列表单、联系结果及下一步整行，历史分页；BOOKING深链先由服务端核对，再展示原登记及真实预约缺项 |
 | 整柜提柜与接仓 | 美国预约统一方案的整柜共享事项 | 独立工作视图按柜汇总，操作列左置；接仓点在行内分组，点击后共用1080px跟进弹框。整柜只选拖车/码头事项，接仓只记录对应仓库，单票只记录FBA联系；数量未知或范围不完整明确显示，不按客户复制整柜联系。首次只请求一页整柜数据，详情按点击读取；待1920×1080页面验收 |
+| 在途跨客户合批安排 | 美国预约统一方案的同起运仓、同目的仓合批 | 操作列后选择同起运仓及同目的仓，跨页累计最多100票；批量核对后在1080px弹框填写与入仓入口共用的安排表单。未知箱数保留待核实；暂扣、多目的地和已有预约不可选入。保存必须重新核对，未知结果保留同一命令供重试 |
+| 未定时安排 | 总览不得伪造时段 | 日历上方独立折叠分页列表；日期未定不补零点或09点，继续编辑仍操作原系统单号；仅有计划日期时日历显示日期，不生成确认时段 |
 | 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
 
-预约结束时间未明确时允许为空；不把预计装车时间当结束时间。预约号、目的仓和货物来源遵守服务端合同。日历范围最多42天，每次范围变化查询预约与到港各一次；选择范围内日期不发送请求。候选在选仓后自动分页读取，跨页选择保留；换仓立即清空旧数据/选择并丢弃旧请求响应，清空仓库后不发送货物查询。后端必填的预计装车时间保留，不自动伪造；预约编号继续填写仓库提供的业务号。仓库请求失败可重试；仅展示前50个匹配仓，超出提示缩小关键词。
+结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约与到港各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
 
 本轮视觉验收：待人工1920×1080截图确认。
 
diff --git a/src/modules/appointment-calendar/planningApi.ts b/src/modules/appointment-calendar/planningApi.ts
index b13cab26..47e2ed38 100644
--- a/src/modules/appointment-calendar/planningApi.ts
+++ b/src/modules/appointment-calendar/planningApi.ts
@@ -1,4 +1,5 @@
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { FbaAppointmentDetailsPayload, FbaAppointmentDto } from '@/modules/overseas-warehouse'
 
 export interface PlanningCargo {
   sourceKey: string
@@ -64,6 +65,27 @@ export interface AppointmentCoverage {
   appointments: Array<{ appointmentNo: string; confirmationNo: string | null; status: string; confirmedAt: string | null; confirmedEndAt: string | null; timezone: string | null }>;
 }
 export interface ResolvedPlanningSource { source: PlanningSource; coverage: AppointmentCoverage }
+export interface PlanningBatchPreview {
+  group: { originWarehouseId: string; destinationKey: string; packages: number | null; sourceCount: number; customerCount: number; readinessIncomplete: boolean; readyFrom: string | null; readyTo: string | null; unknownQuantitySources: number }
+  originWarehouseName: string
+  destinationWarehouseCode: string
+  sources: PlanningSource[]
+  missingFields: string[]
+}
+export async function previewPlanningBatch(sources: Array<{sourceKey: string; customerId: string; destinationKey: string}>) {
+  const result = unwrapApiResponse(await http.post<ApiEnvelope<PlanningBatchPreview>, ApiEnvelope<PlanningBatchPreview>>(
+    '/platform/v1/last-leg/appointment-planning/batches/preview', { sources },
+  ))
+  return { ...result, group: { ...result.group, packages: result.group.packages == null ? null : Number(result.group.packages), sourceCount: Number(result.group.sourceCount), customerCount: Number(result.group.customerCount) } }
+}
+export interface SourceAppointmentPayload { originWarehouseId: string; fbaWarehouseCode: string; sources: Array<{sourceKey: string; customerId: string; destinationKey: string}>; details: FbaAppointmentDetailsPayload; idempotencyKey: string }
+export async function createSourceAppointment(payload: SourceAppointmentPayload) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<FbaAppointmentDto>, ApiEnvelope<FbaAppointmentDto>>('/platform/v1/last-leg/appointment-planning/appointments', payload))
+}
+export async function listUnscheduledAppointments(page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{records: FbaAppointmentDto[]; total: number}>, ApiEnvelope<{records: FbaAppointmentDto[]; total: number}>>('/platform/v1/last-leg/appointment-planning/appointments/unscheduled', { params: { page, size } }))
+  return { ...result, total: Number(result.total) }
+}
 export async function resolvePlanningSource(query: { sourceKey: string; customerId: string; destinationKey?: string }) {
   return unwrapApiResponse(await http.get<ApiEnvelope<ResolvedPlanningSource>, ApiEnvelope<ResolvedPlanningSource>>(
     '/platform/v1/last-leg/appointment-planning/sources/resolve', { params: query },
diff --git a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
index 11997640..ab72bd56 100644
--- a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
@@ -142,6 +142,7 @@
 | 客户货物登记 | 新增、补充资料、只读跟进 | 1080px居中三列 | 首屏客户/目的地/已知货量；确认前必填折叠但显示缺项；始终选填独立；单站自动带入 |
 | 客户货物登记 | 确认承运、取消 | 既有居中确认框 | 展示对象及保位/商业订单影响，保存成功不冒充确认成功 |
 | 客户货物登记 | 安排来货、核量、排入本车 | 1080px居中，复用履约表单 | 原登记连续处理，按服务端资格；关联业务按权限跳转 |
+| 客户货物登记 | 查看排车详情、前往车次审核 | 只读跟进弹框跳转既有独立详情 | 排车与车次分别按各自list权限展示；审核仍由车次独立写权限控制，不在排车只读页暗示可审核；待TEST发布后1920×1080复验 |
 | 车次准备 | 选择合格排车、新建或加入车次、连续发布 | 1080px居中，复用车次与发布表单 | 来源带入、版本和失败续办，未授权的预约事实不由此生成 |
 
 本次无新增文件预览、删除或停用方式；未改变的操作沿既有矩阵。代码测试与真实页面验收分别报告。
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index 7a491ee8..ef17bd4e 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -125,7 +125,8 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
       <el-button v-if="inquiry.progress.primaryAction === 'RECEIPT' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-confirm')" @click="emit('action', 'receipt', inquiry)">核对实收与运费</el-button>
       <el-button v-if="inquiry.progress.primaryAction === 'BIND' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-edit') && access.can('platform:fleet:trip:edit') && access.can('platform:overseas-warehouse:inbound-order:smart-dispatch')" @click="emit('action', 'bind', inquiry)">确认排入本车</el-button>
       <el-button v-if="inquiry.incomingNo" @click="emit('action', 'fulfillment', inquiry)">查看收货进度</el-button>
-      <el-button v-if="inquiry.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')" @click="emit('action', 'dispatch', inquiry)">查看排车与审核</el-button>
+      <el-button v-if="inquiry.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')" @click="emit('action', 'dispatch', inquiry)">查看排车详情</el-button>
+      <el-button v-if="inquiry.dispatchNo && access.can('platform:fleet:trip:list')" @click="emit('action', 'trip', inquiry)">前往车次审核</el-button>
     </section>
     <section v-if="inquiry?.appointmentCoverage" aria-label="收货预约覆盖">
       <h3>收货预约覆盖</h3><el-button v-if="access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')" @click="emit('action', 'appointment', inquiry)">预约跟进</el-button><p>{{ appointmentCoverageLabels[inquiry.appointmentCoverage.status] || '预约结果待核对' }}。承运保位不代表收货方已接受本票货物。</p>
diff --git a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
index a872d376..d2a9ccd4 100644
--- a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
@@ -23,6 +23,7 @@ const fulfillmentOpen = ref(false), fulfillmentRow = ref<CapacityInquiry | null>
 function openFulfillment(key: string, row: CapacityInquiry) {
   if (key === 'appointment' && access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')) { void router.push({ name: 'appointment-calendar', query: { sourceKey: `BOOKING:${row.bookingNo}`, customerId: row.customerId, destinationKey: row.cargo.destinationKey } }); return true }
   if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } }); return true }
+  if (key === 'trip' && row.dispatchNo && access.can('platform:fleet:trip:list')) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo } }); return true }
   if (!['incoming', 'receipt', 'bind', 'fulfillment'].includes(key)) return false
   editorOpen.value = false
   fulfillmentRow.value = row; fulfillmentMode.value = key === 'fulfillment' ? 'view' : key as 'incoming' | 'receipt' | 'bind'; fulfillmentOpen.value = true
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index 9be4ccc4..290ade91 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -10,9 +10,9 @@ import { useUnsavedWorkStore } from '@/core/unsaved-work/unsavedWork'
 import * as api from '../api/capacityOffers'
 import type { CapacityOffer, CapacityInquiry } from '../capacityOfferTypes'
 import type { FleetTrip } from '../tripTypes'
-const state = vi.hoisted(() => ({ manage: false, write: true, quote: false, route: { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'CO-1' } }, push: vi.fn() }))
+const state = vi.hoisted(() => ({ manage: false, write: true, quote: false, links: new Set<string>(), route: { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'CO-1' } }, push: vi.fn() }))
 vi.mock('vue-router', () => ({ useRoute: () => state.route, useRouter: () => ({ push: state.push }) }))
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (p: string) => p === 'platform:fleet:capacity-offer:manage' ? state.manage : p === 'platform:fleet:quote:list' ? state.quote : p === 'platform:fleet:capacity-offer:list' || p.includes(':inquiry-') && state.write }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (p: string) => state.links.has(p) || (p === 'platform:fleet:capacity-offer:manage' ? state.manage : p === 'platform:fleet:quote:list' ? state.quote : p === 'platform:fleet:capacity-offer:list' || p.includes(':inquiry-') && state.write) }) }))
 vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn().mockResolvedValue(undefined) } }))
 vi.mock('../api/capacityOffers', () => ({ listCapacityOffers: vi.fn(), listCapacityInquiries: vi.fn(), getCapacityOffer: vi.fn(), getCapacityInquiry: vi.fn(), saveCapacityInquiry: vi.fn(), saveAndConfirmInquiry: vi.fn(), commandCapacityInquiry: vi.fn(), listOfferCustomers: vi.fn(), listOfferQuotes: vi.fn(), saveCapacityOffer: vi.fn(), commandCapacityOffer: vi.fn() }))
 export const offer: CapacityOffer = { offerNo: 'CO-1', tripNo: 'TR-1', status: 'OPEN', recordVersion: 2, tripRecordVersion: 5, warehouseId: '92', warehouseName: '测试起运仓', plannedDepartureAt: '2026-10-10T12:00:00Z', cutoffAt: '2026-10-10T10:00:00Z', contactName: '调度', contactPhone: '测试联系信息', remark: null, capacityKnown: false, canCreateInquiry: true, canConfirm: false, blockReason: '待调度核对', destinations: [{ destinationKey: 'FBA:ONT8', name: 'ONT8', deliveryIndex: 1, remaining: null }], segments: [], actions: { canEdit: true, canPublish: false, canPause: true, canResume: false, canClose: true } }
@@ -35,7 +35,7 @@ function mount(component: object, props: Record<string, unknown> = {}) {
   } } }); wrappers.push(wrapper); return { wrapper, pinia }
 }
 const button = (w: VueWrapper, label: string) => w.findAll('button').find(b => b.text() === label)!
-beforeEach(() => { vi.clearAllMocks(); state.manage = false; state.write = true; state.quote = false; vi.mocked(ElMessageBox.confirm).mockImplementation(vi.fn().mockResolvedValue(undefined)); vi.mocked(api.listCapacityOffers).mockResolvedValue(pageOf([structuredClone(offer)], 41)); vi.mocked(api.listCapacityInquiries).mockResolvedValue(pageOf([structuredClone(inquiry)])); vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer: structuredClone(offer), inquiries: pageOf([structuredClone(inquiry)]) }) })
+beforeEach(() => { vi.clearAllMocks(); state.manage = false; state.write = true; state.quote = false; state.links.clear(); vi.mocked(ElMessageBox.confirm).mockImplementation(vi.fn().mockResolvedValue(undefined)); vi.mocked(api.listCapacityOffers).mockResolvedValue(pageOf([structuredClone(offer)], 41)); vi.mocked(api.listCapacityInquiries).mockResolvedValue(pageOf([structuredClone(inquiry)])); vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer: structuredClone(offer), inquiries: pageOf([structuredClone(inquiry)]) }) })
 afterEach(() => { wrappers.splice(0).forEach(w => w.unmount()); vi.useRealTimers() })
 it('loads only the active tab and sends exactly one query after resetting from a later page', async () => {
   const { wrapper } = mount(CapacityOffersView); await flushPromises()
@@ -161,3 +161,33 @@ it('requires an explicit choice for multiple destinations', async () => {
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
   expect(api.saveCapacityInquiry).not.toHaveBeenCalled()
 })
+
+// Navigation must retain the exact bound business references and independent read permissions.
+it.each([CapacityOffersView, CapacityOfferDetailView])('opens the bound trip separately from read-only dispatch detail', async component => {
+  const row = { ...inquiry, dispatchNo: 'DS-BOUND', status: 'BOUND' as const }
+  state.links = new Set(['platform:fleet:trip:list', 'platform:overseas-warehouse:dispatch:list'])
+  const { wrapper } = mount(component); await flushPromises()
+  const dialog = wrapper.findComponent(CapacityInquiryDialog)
+  dialog.vm.$emit('action', 'dispatch', row); await flushPromises()
+  expect(state.push).toHaveBeenLastCalledWith({ name: 'overseas-dispatch-detail', params: { dispatchNo: 'DS-BOUND' } })
+  dialog.vm.$emit('action', 'trip', row); await flushPromises()
+  expect(state.push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo } })
+  expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
+  state.links.clear(); state.push.mockClear()
+  dialog.vm.$emit('action', 'trip', row); dialog.vm.$emit('action', 'dispatch', row); await flushPromises()
+  expect(state.push).not.toHaveBeenCalled()
+})
+it('shows follow-up destinations only with the matching read permission', async () => {
+  const row = { ...inquiry, dispatchNo: 'DS-BOUND', status: 'BOUND' as const }
+  state.links.add('platform:overseas-warehouse:dispatch:list')
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: row, readonly: true }); await flushPromises()
+  expect(button(wrapper, '查看排车详情')).toBeDefined()
+  expect(button(wrapper, '前往车次审核')).toBeUndefined()
+  wrapper.unmount()
+  state.links = new Set(['platform:fleet:trip:list'])
+  const second = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: row, readonly: true }); await flushPromises()
+  expect(button(second.wrapper, '查看排车详情')).toBeUndefined()
+  await button(second.wrapper, '前往车次审核').trigger('click')
+  expect(second.wrapper.emitted('action')).toEqual([['trip', row]])
+  expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
+})
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersView.vue b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
index 8dc6346a..efd2a71c 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
@@ -26,6 +26,7 @@ const fulfillmentOpen = ref(false), fulfillmentRow = ref<CapacityInquiry | null>
 function openFulfillment(key: string, row: CapacityInquiry) {
   if (key === 'appointment' && access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')) { void router.push({ name: 'appointment-calendar', query: { sourceKey: `BOOKING:${row.bookingNo}`, customerId: row.customerId, destinationKey: row.cargo.destinationKey } }); return true }
   if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } }); return true }
+  if (key === 'trip' && row.dispatchNo && access.can('platform:fleet:trip:list')) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo } }); return true }
   if (!['incoming', 'receipt', 'bind', 'fulfillment'].includes(key)) return false
   editorOpen.value = false
   fulfillmentRow.value = row; fulfillmentMode.value = key === 'fulfillment' ? 'view' : key as 'incoming' | 'receipt' | 'bind'; fulfillmentOpen.value = true
diff --git a/src/modules/overseas-warehouse/API_INTEGRATION_MATRIX.md b/src/modules/overseas-warehouse/API_INTEGRATION_MATRIX.md
index 70c9b4d2..910f6a03 100644
--- a/src/modules/overseas-warehouse/API_INTEGRATION_MATRIX.md
+++ b/src/modules/overseas-warehouse/API_INTEGRATION_MATRIX.md
@@ -11,7 +11,7 @@
 | 柜级计划进度/详情 | `GET /platform/v1/last-leg/orders/container-summaries`；`GET /container-summaries/{sourceContainerBookingId}` | summary：`sourceContainerBookingId,containerNo?,totalOrderCount,inboundCodeCount,missingInboundCodeCount,planCount,plannedInboundCodeCount,pendingPlanCount,plannedArrivalAt?,allPlansReady,blockingReason?`；list query：`page,size,containerNo?,createdFrom?,createdTo?`；detail：`summary,orders[]`，订单与计划 ID 均为字符串 | 独立“柜子”Tab 消费服务端全柜分页，默认按计划到仓升序且 null 最后；详情抽屉显示柜内全部订单、入仓码和独立计划状态；同一摘要也供按柜生成选择框，不从订单分页本地拼柜 |
 | 入库列表 | `GET /platform/v1/last-leg/inbound-plans` | query：`page,size,planNo,inboundCode,status,warehouse,fbaWarehouseCode,appointmentStatus,dispatchStatus,createdFrom,createdTo`；平台跨客户；每行返回计划级 `assigned/mergeAllowed/urgent` | `...:inbound-order:list`；`lineId/planId/orderId/customerId` 均为字符串；合托展示为可选提示，不作为完成门禁 |
 | 入库详情 | `GET /platform/v1/last-leg/inbound-plans/{planNo}` | query：显式 `customerId`；path 编码；`allocations[]` 直接返回实际 `palletNo`、`palletOwnerPlanNo`、`palletOwnedByCurrentPlan` | 同 list；缺客户范围时页面明确报错；`sourceOrderId` 字符串化；跨计划合托按分配事实展示真实托盘码、所属计划和本单箱数，不把外部托盘计入当前计划自有托盘数 |
-| FBA 预约新增 | `POST /platform/v1/last-leg/inbound-plans/fba-appointments/batch` | body：`customerId,lineIds:string[],appointmentNo,appointmentAt,expectedLoadingAt,appointmentStatus,appointmentRemark?` | `...:inbound-order:fba-appointment`；只允许同客户、同 FBA 仓勾选 |
+| FBA 预约新增 | `POST /platform/v1/last-leg/inbound-plans/fba-appointments/batch` | body：`lineIds:string[],details,idempotencyKey`；details区分计划日期/时段、确认号/时段及状态 | `...:inbound-order:fba-appointment`；跨客户同美国起运仓、同FBA仓；服务端将选择明细转换成原稳定货源并生成系统单号，不输入主单客户或预计装车时间 |
 | FBA 预约详情/编辑 | `GET /fba-appointments/{appointmentNo}?customerId=...`；`PUT` 同 path | PUT body：`customerId,appointmentAt,expectedLoadingAt,appointmentStatus,appointmentRemark?` | GET 同 list；PUT 同 appointment；失败保留弹框和错误元数据 |
 | 排车列表/详情 | `GET /platform/v1/last-leg/dispatches`；`GET /dispatches/{dispatchNo}` | list query：`page,size,dispatchNo,vehiclePlate,status,fbaAppointmentNo`；不传客户 | `...:inbound-order:list`；Controller 受 `lastleg.dispatch-query-api.enabled` 控制 |
 | 排车候选 | `GET /platform/v1/last-leg/dispatches/candidates` | query：`planIds?`（逗号分隔长 ID）、`orderNo?`,`fbaWarehouseCode?`,`sourceStage?`,`draftToken?`；退回候选返回`sourceType=RETURN_RECEIPT,returnReceiptId,returnReceiptNo`，箱数为实际剩余可拣量 | 同 inbound list；已实收阶段包含真实退回来源，展示业务凭据号；草稿恢复失败保留选择并允许重试 |
diff --git a/src/modules/overseas-warehouse/api/inboundOrders.test.ts b/src/modules/overseas-warehouse/api/inboundOrders.test.ts
index 8530829b..04c9e2ac 100644
--- a/src/modules/overseas-warehouse/api/inboundOrders.test.ts
+++ b/src/modules/overseas-warehouse/api/inboundOrders.test.ts
@@ -33,7 +33,7 @@ describe('inbound order overseas API', () => {
     vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: detail })
 
     await getFbaAppointment('APT/1')
-    await updateFbaAppointment('APT/1', { version: detail.version, appointmentAt: detail.appointmentAt, expectedLoadingAt: detail.expectedLoadingAt, appointmentStatus: 'SUCCESS' })
+    await updateFbaAppointment('APT/1', { version: detail.version, idempotencyKey: 'update-key', details: {appointmentAt: detail.appointmentAt, confirmationNo: 'EXT-1', appointmentStatus: 'SUCCESS'} })
 
     expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/APT%2F1')
     expect(http.put).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/APT%2F1', expect.not.objectContaining({ customerId: expect.anything() }))
@@ -50,11 +50,9 @@ describe('inbound order overseas API', () => {
   it('preserves selected line ids as strings when creating an appointment', async () => {
     vi.mocked(http.post).mockResolvedValue({ code: '200', message: 'success', data: { id: '1', appointmentNo: 'APT-1', appointmentStatus: 'SUCCESS', selectedCount: 1, fbaWarehouseCode: 'ONT8' } })
     const payload = {
-      lineIds: ['190000000000000099'],
-      appointmentNo: 'APT-1',
-      appointmentAt: '2026-08-20T10:30:00',
-      expectedLoadingAt: '2026-08-20T09:00:00',
-      appointmentStatus: 'SUCCESS' as const,
+      originWarehouseId: '100', fbaWarehouseCode: 'ONT8', lineIds: ['190000000000000099'],
+      idempotencyKey: 'create-key',
+      details: { plannedDate: '2026-08-20', appointmentStatus: 'PENDING' as const },
     }
     await createFbaAppointment(payload)
     expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/batch', payload)
diff --git a/src/modules/overseas-warehouse/api/inboundOrders.ts b/src/modules/overseas-warehouse/api/inboundOrders.ts
index 9119ca13..cf1269ac 100644
--- a/src/modules/overseas-warehouse/api/inboundOrders.ts
+++ b/src/modules/overseas-warehouse/api/inboundOrders.ts
@@ -53,31 +53,48 @@ export interface InboundOrderSummaryDto {
   version?: number | null
 }
 
-export interface BatchFbaAppointmentPayload {
-  lineIds: string[]
-  appointmentNo: string
-  appointmentAt: string
+export interface FbaAppointmentDetailsPayload {
+  plannedDate?: string | null
+  plannedAt?: string | null
+  plannedEndAt?: string | null
+  confirmationNo?: string | null
+  appointmentAt?: string | null
   appointmentEndAt?: string | null
-  expectedLoadingAt: string
   appointmentStatus: 'PENDING' | 'SUCCESS' | 'FAILED' | 'CANCELLED'
-  appointmentRemark?: string
+  appointmentRemark?: string | null
+  startOffset?: string | null
+  endOffset?: string | null
+}
+export interface BatchFbaAppointmentPayload {
+  originWarehouseId: string
+  fbaWarehouseCode: string
+  lineIds: string[]
+  details: FbaAppointmentDetailsPayload
+  idempotencyKey: string
 }
 
 export interface FbaAppointmentDto {
   version: number
   id: string
   appointmentNo: string
-  appointmentAt: string
+  confirmationNo?: string | null
+  plannedDate?: string | null
+  plannedAt?: string | null
+  plannedEndAt?: string | null
+  appointmentAt?: string | null
   appointmentEndAt?: string | null
-  expectedLoadingAt: string
+  timezone?: string | null
+  appointmentStartUtc?: string | null
+  appointmentEndUtc?: string | null
+  originWarehouseId: string
   appointmentStatus: string
   appointmentRemark?: string | null
   selectedCount: number
   fbaWarehouseCode: string
-  items: Array<{ customerId: string; id: string; planId: string; lineId: string; orderId: string; inboundCode: string; fbaWarehouseCode: string }>
+  items: Array<{ customerId: string; id: string; sourceKey: string; sourceVersion?: string | null; orderId?: string | null; inboundCode?: string | null; fbaWarehouseCode: string; packageCount?: number | null }>
 }
 
-export type UpdateFbaAppointmentPayload = Omit<BatchFbaAppointmentPayload, 'lineIds' | 'appointmentNo'> & { version: number }
+export interface UpdateFbaAppointmentPayload { details: FbaAppointmentDetailsPayload; version: number; idempotencyKey: string }
 
 export async function listFbaAppointmentCalendar(query: { from: string; to: string }, signal?: AbortSignal) {
   const response = await http.get<ApiEnvelope<FbaAppointmentDto[]>, ApiEnvelope<FbaAppointmentDto[]>>(
diff --git a/src/modules/overseas-warehouse/appointmentForm.test.ts b/src/modules/overseas-warehouse/appointmentForm.test.ts
new file mode 100644
index 00000000..6cc35cd9
--- /dev/null
+++ b/src/modules/overseas-warehouse/appointmentForm.test.ts
@@ -0,0 +1,15 @@
+import { expect, it } from 'vitest'
+import { appointmentFormError, appointmentPayload, createAppointmentForm } from './appointmentForm'
+
+it('allows an undated arrangement without inventing confirmation or loading facts', () => {
+  const form = createAppointmentForm()
+  expect(appointmentFormError(form)).toBeNull()
+  expect(appointmentPayload(form)).toMatchObject({ plannedDate: null, plannedAt: null, appointmentAt: null, confirmationNo: null, appointmentStatus: 'PENDING' })
+  expect(appointmentPayload(form)).not.toHaveProperty('expectedLoadingAt')
+})
+it('retains an already confirmed repeated local time using its stored UTC instant', () => {
+  const form = createAppointmentForm({ id: '1', version: 0, appointmentNo: 'AP-1', confirmationNo: 'EXT-1', originWarehouseId: '100', fbaWarehouseCode: 'ONT8', appointmentStatus: 'SUCCESS', selectedCount: 1, items: [], appointmentAt: '2026-11-01T01:30:00', appointmentStartUtc: '2026-11-01T09:30:00Z', timezone: 'America/Los_Angeles' })
+  expect(form.startOffset).toBe('-08:00')
+  expect(appointmentPayload(form).endOffset).toBeNull()
+  expect(appointmentPayload(form).appointmentAt).toBe('2026-11-01T01:30:00')
+})
diff --git a/src/modules/overseas-warehouse/appointmentForm.ts b/src/modules/overseas-warehouse/appointmentForm.ts
new file mode 100644
index 00000000..10044564
--- /dev/null
+++ b/src/modules/overseas-warehouse/appointmentForm.ts
@@ -0,0 +1,28 @@
+import type { FbaAppointmentDetailsPayload, FbaAppointmentDto } from './api/inboundOrders'
+
+export interface AppointmentForm {
+  plannedDate: string; plannedAt: string; plannedEndAt: string; confirmationNo: string
+  appointmentAt: string; appointmentEndAt: string; appointmentStatus: FbaAppointmentDetailsPayload['appointmentStatus']
+  appointmentRemark: string; startOffset: string; endOffset: string
+}
+export function createAppointmentForm(detail?: FbaAppointmentDto): AppointmentForm {
+  return { plannedDate: detail?.plannedDate || '', plannedAt: detail?.plannedAt || '', plannedEndAt: detail?.plannedEndAt || '', confirmationNo: detail?.confirmationNo || '',
+    appointmentAt: detail?.appointmentAt || '', appointmentEndAt: detail?.appointmentEndAt || '', appointmentStatus: (detail?.appointmentStatus || 'PENDING') as AppointmentForm['appointmentStatus'],
+    appointmentRemark: detail?.appointmentRemark || '', startOffset: confirmedOffset(detail?.appointmentAt, detail?.appointmentStartUtc), endOffset: confirmedOffset(detail?.appointmentEndAt, detail?.appointmentEndUtc) }
+}
+function confirmedOffset(local?: string | null, utc?: string | null): string {
+  if (!local || !utc) return ''
+  const minutes = (Date.parse(`${local}Z`) - Date.parse(utc)) / 60000
+  if (!Number.isInteger(minutes) || Math.abs(minutes) > 18 * 60) return ''
+  return `${minutes < 0 ? '-' : '+'}${String(Math.floor(Math.abs(minutes) / 60)).padStart(2, '0')}:${String(Math.abs(minutes) % 60).padStart(2, '0')}`
+}
+export function appointmentPayload(form: AppointmentForm): FbaAppointmentDetailsPayload {
+  return { plannedDate: form.plannedDate || null, plannedAt: form.plannedAt || null, plannedEndAt: form.plannedEndAt || null, confirmationNo: form.confirmationNo.trim() || null,
+    appointmentAt: form.appointmentAt || null, appointmentEndAt: form.appointmentEndAt || null, appointmentStatus: form.appointmentStatus, appointmentRemark: form.appointmentRemark.trim() || null,
+    startOffset: form.startOffset.trim() || null, endOffset: form.endOffset.trim() || null }
+}
+export function appointmentFormError(form: AppointmentForm): string | null {
+  if (form.appointmentStatus === 'SUCCESS' && (!form.confirmationNo.trim() || !form.appointmentAt)) return '登记对方确认时，请填写外部约号与确认时间'
+  if (['FAILED', 'CANCELLED'].includes(form.appointmentStatus) && !form.appointmentRemark.trim()) return '请填写取消或未约成的原因'
+  return null
+}
diff --git a/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue b/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue
new file mode 100644
index 00000000..cbaf3306
--- /dev/null
+++ b/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import type { AppointmentForm } from '../appointmentForm'
+defineProps<{ model: AppointmentForm; appointmentNo?: string; timezone?: string | null; disabled?: boolean }>()
+</script>
+<template>
+  <p>{{ appointmentNo ? `系统单号：${appointmentNo}` : '系统单号将在保存后生成' }} · {{ timezone || '目的仓时区待核实' }}</p>
+  <el-form label-position="top" class="appointment-fields density-form" :disabled="disabled">
+    <el-form-item label="计划送仓日期"><el-date-picker v-model="model.plannedDate" type="date" value-format="YYYY-MM-DD" placeholder="日期未定可留空" /></el-form-item>
+    <el-form-item label="本次登记"><el-select v-model="model.appointmentStatus"><el-option label="先保存安排，等待对方确认" value="PENDING" /><el-option label="已取得对方正式确认" value="SUCCESS" /><el-option v-if="appointmentNo" label="未约成" value="FAILED" /><el-option v-if="appointmentNo" label="取消安排" value="CANCELLED" /></el-select></el-form-item>
+    <template v-if="model.appointmentStatus === 'SUCCESS'">
+      <el-form-item label="外部约号" required><el-input v-model="model.confirmationNo" maxlength="128" placeholder="填写收货方提供的确认号" /></el-form-item>
+      <el-form-item label="对方确认开始时间" required><el-date-picker v-model="model.appointmentAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="目的仓当地时间" @change="model.startOffset = ''" /></el-form-item>
+      <el-form-item label="对方确认结束时间"><el-date-picker v-model="model.appointmentEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="未明确可留空" @change="model.endOffset = ''" /></el-form-item>
+    </template>
+    <el-form-item :label="['FAILED','CANCELLED'].includes(model.appointmentStatus) ? '原因' : '备注'" :required="['FAILED','CANCELLED'].includes(model.appointmentStatus)"><el-input v-model="model.appointmentRemark" maxlength="1000" placeholder="有需交接的事项时填写" /></el-form-item>
+    <details class="appointment-fields__extra"><summary>补充计划时段与夏令时信息</summary>
+      <el-form-item label="计划开始时段"><el-date-picker v-model="model.plannedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="只知道日期时不必填写" /></el-form-item>
+      <el-form-item label="计划结束时段"><el-date-picker v-model="model.plannedEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
+      <template v-if="model.appointmentStatus === 'SUCCESS'"><p>当地时钟回拨、同一时间出现两次时，需按对方确认明确时差。</p>
+        <el-form-item label="确认开始时差"><el-input v-model="model.startOffset" placeholder="仅重叠时刻需填，如 -07:00" /></el-form-item>
+        <el-form-item label="确认结束时差"><el-input v-model="model.endOffset" placeholder="仅重叠时刻需填，如 -08:00" /></el-form-item>
+      </template>
+    </details>
+  </el-form>
+</template>
+<style scoped>
+.appointment-fields { display:grid; grid-template-columns:repeat(3,minmax(0,1fr)); gap:0 var(--admin-space-6); }
+.appointment-fields :deep(.el-select), .appointment-fields :deep(.el-date-editor) { width:100%; }
+.appointment-fields__extra { grid-column:1 / -1; }
+</style>
diff --git a/src/modules/overseas-warehouse/index.ts b/src/modules/overseas-warehouse/index.ts
index 4f56418b..c424b130 100644
--- a/src/modules/overseas-warehouse/index.ts
+++ b/src/modules/overseas-warehouse/index.ts
@@ -2,5 +2,7 @@ export {
   createFbaAppointment, getFbaAppointment, listFbaAppointmentCalendar,
   listInboundOrders, updateFbaAppointment,
 } from './api/inboundOrders'
-export type { FbaAppointmentDto, BatchFbaAppointmentPayload, InboundOrderSummaryDto } from './api/inboundOrders'
+export type { FbaAppointmentDto, BatchFbaAppointmentPayload, UpdateFbaAppointmentPayload, FbaAppointmentDetailsPayload, InboundOrderSummaryDto } from './api/inboundOrders'
+export { default as FbaAppointmentFields } from './components/FbaAppointmentFields.vue'
+export { createAppointmentForm, appointmentPayload, appointmentFormError } from './appointmentForm'
 export { overseasWarehousePermissions } from './permissions'
diff --git a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
index 9c7e592d..3c919ec9 100644
--- a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
@@ -15,6 +15,8 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import SmartDispatchDialog from '../components/SmartDispatchDialog.vue'
+import FbaAppointmentFields from '../components/FbaAppointmentFields.vue'
+import { createAppointmentForm, appointmentPayload, appointmentFormError } from '../appointmentForm'
 import { createFbaAppointment, getFbaAppointment, listInboundOrders, updateFbaAppointment, updateInboundPlan, type InboundOrderSummaryDto } from '../api/inboundOrders'
 import { listReceivingOverseasWarehouses, type ReceivingOverseasWarehouseDto } from '../api/pallets'
 import { overseasWarehousePermissions as permission } from '../permissions'
@@ -53,7 +55,9 @@ const editingAppointmentNo = ref('')
 const appointmentSelectedCount = ref(0)
 const appointmentFbaWarehouse = ref('—')
 const appointmentVersion = ref(0)
-const appointmentForm = reactive({ appointmentEndAt: '', appointmentNo: '', appointmentAt: '', expectedLoadingAt: '', appointmentStatus: 'SUCCESS' as 'PENDING' | 'SUCCESS' | 'FAILED' | 'CANCELLED', appointmentRemark: '' })
+const appointmentForm = reactive(createAppointmentForm())
+const appointmentTimezone = ref<string | null>(null)
+const pendingAppointment = ref<{appointmentNo: string | null; version: number; originWarehouseId: string; fbaWarehouseCode: string; lineIds: string[]; details: ReturnType<typeof appointmentPayload>; idempotencyKey: string} | null>(null)
 const appointmentTitle = computed(() => appointmentMode.value === 'edit' ? '编辑预约' : '预约')
 const planEditOpen = ref(false); const planEditLoading = ref(false); const planEditSaving = ref(false); const planEditTarget = ref<InboundOrderListItem | null>(null); const planEditForm = reactive({ warehouseId: '', warehouseCode: '', warehouseName: '', version: 0 }); const warehouses = ref<ReceivingOverseasWarehouseDto[]>([])
 
@@ -61,7 +65,7 @@ function selectableRow(source: object) {
   const row = source as InboundOrderListItem
   if (!row.fbaWarehouse || row.fbaWarehouse === '—') return false
   const anchor = selectedRows.value[0]
-  return !anchor || anchor.fbaWarehouse === row.fbaWarehouse
+  return !anchor || (anchor.fbaWarehouse === row.fbaWarehouse && anchor.originWarehouseId === row.originWarehouseId)
 }
 
 const columns: DataTableColumn[] = [
@@ -102,7 +106,7 @@ function appointmentStatusLabel(value: unknown) { return !value ? '未预约' :
 function toListItem(dto: InboundOrderSummaryDto): InboundOrderListItem {
   return {
     lineId: String(dto.lineId), planId: String(dto.planId), customerId: String(dto.customerId), orderId: String(dto.orderId),
-    warehouseId: text(dto.warehouseId) === '—' ? '' : String(dto.warehouseId), destinationWarehouseCode: text(dto.warehouseCode), destinationWarehouseName: text(dto.warehouseName),
+    originWarehouseId: String(dto.overseasWarehouseId || ''), warehouseId: text(dto.warehouseId) === '—' ? '' : String(dto.warehouseId), destinationWarehouseCode: text(dto.warehouseCode), destinationWarehouseName: text(dto.warehouseName),
     orderNo: text(dto.planNo), inboundCode: text(dto.inboundCode), lxCode: text(dto.lxCode), type: typeLabel(dto.orderType), warehouse: receivingWarehouse(dto.overseasWarehouseCode, dto.overseasWarehouseName),
     fbaWarehouse: text(dto.fbaWarehouseCode), owner: text(dto.customerName), cartons: number(dto.packageCount), pickedCartons: number(dto.pickedPackageCount),
     grossWeight: number(dto.grossWeightKg), netWeight: number(dto.netWeightKg), volume: number(dto.volumeCbm), pallets: number(dto.palletCount),
@@ -117,6 +121,7 @@ function onSelectionChange(selection: object[]) { selectedRows.value = selection
 function selectionError() {
   if (!selectedRows.value.length) return '请至少选择 1 条入库单'
   if (selectedRows.value.some((row) => !row.fbaWarehouse || row.fbaWarehouse === '—')) return '所选入库单缺少 FBA 仓库信息'
+  if (selectedRows.value.some(row => !row.originWarehouseId) || new Set(selectedRows.value.map(row => row.originWarehouseId)).size !== 1) return '所选入库单必须属于同一接仓点'
   if (new Set(selectedRows.value.map((row) => row.fbaWarehouse)).size !== 1) return '所选入库单必须属于同一 FBA 仓库'
   return ''
 }
@@ -127,7 +132,7 @@ function openAppointment() {
   appointmentMode.value = 'create'; editingAppointmentNo.value = ''
   appointmentSelectedCount.value = selectedRows.value.length; appointmentFbaWarehouse.value = selectedRows.value[0]?.fbaWarehouse || '—'
   appointmentVersion.value = 0
-  Object.assign(appointmentForm, { appointmentEndAt: '', appointmentNo: '', appointmentAt: '', expectedLoadingAt: '', appointmentStatus: 'SUCCESS', appointmentRemark: '' })
+  Object.assign(appointmentForm, createAppointmentForm()); appointmentTimezone.value = null; pendingAppointment.value = null
   mutationError.value = null
   appointmentOpen.value = true
 }
@@ -146,7 +151,7 @@ async function openAppointmentEdit(source: object) {
     appointmentSelectedCount.value = detail.selectedCount
     appointmentFbaWarehouse.value = detail.fbaWarehouseCode || row.fbaWarehouse
     appointmentVersion.value = detail.version
-    Object.assign(appointmentForm, { appointmentEndAt: detail.appointmentEndAt || '', appointmentNo: detail.appointmentNo, appointmentAt: detail.appointmentAt, expectedLoadingAt: detail.expectedLoadingAt, appointmentStatus: detail.appointmentStatus, appointmentRemark: detail.appointmentRemark || '' })
+    Object.assign(appointmentForm, createAppointmentForm(detail)); appointmentTimezone.value = detail.timezone || null; pendingAppointment.value = null
   } catch (caught) {
     appointmentOpen.value = false
     mutationError.value = getApiErrorDetails(caught, 'FBA 预约详情加载失败，请重试')
@@ -155,14 +160,17 @@ async function openAppointmentEdit(source: object) {
 
 async function submitAppointment() {
   if (appointmentMode.value === 'create') { const error = selectionError(); if (error) { ElMessage.warning(error); return } }
-  if (!appointmentForm.appointmentNo.trim() || !appointmentForm.appointmentAt || !appointmentForm.expectedLoadingAt) { ElMessage.warning('请填写预约号、预约送仓时间和预计装车时间'); return }
+  const validation = appointmentFormError(appointmentForm)
+  if (!pendingAppointment.value && validation) { ElMessage.warning(validation); return }
   saving.value = true; mutationError.value = null
   try {
-    const common = { appointmentEndAt: appointmentForm.appointmentEndAt || null, appointmentAt: appointmentForm.appointmentAt, expectedLoadingAt: appointmentForm.expectedLoadingAt, appointmentStatus: appointmentForm.appointmentStatus, appointmentRemark: appointmentForm.appointmentRemark.trim() || undefined }
-    if (appointmentMode.value === 'edit') await updateFbaAppointment(editingAppointmentNo.value, { ...common, version: appointmentVersion.value })
-    else await createFbaAppointment({ lineIds: selectedRows.value.map((row) => row.lineId), appointmentNo: appointmentForm.appointmentNo.trim(), ...common })
+    pendingAppointment.value ||= {appointmentNo: appointmentMode.value === 'edit' ? editingAppointmentNo.value : null, version: appointmentVersion.value, originWarehouseId: selectedRows.value[0]?.originWarehouseId || '', fbaWarehouseCode: selectedRows.value[0]?.fbaWarehouse || '', lineIds: selectedRows.value.map(row => row.lineId), details: appointmentPayload(appointmentForm), idempotencyKey: crypto.randomUUID()}
+    const payload = pendingAppointment.value
+    if (payload.appointmentNo) await updateFbaAppointment(payload.appointmentNo, { details: payload.details, version: payload.version, idempotencyKey: payload.idempotencyKey })
+    else await createFbaAppointment({ originWarehouseId: payload.originWarehouseId, fbaWarehouseCode: payload.fbaWarehouseCode, lineIds: payload.lineIds, details: payload.details, idempotencyKey: payload.idempotencyKey })
+    pendingAppointment.value = null
     appointmentOpen.value = false; selectedRows.value = []; ElMessage.success('FBA 预约保存成功'); await load()
-  } catch (caught) { mutationError.value = getApiErrorDetails(caught, 'FBA 预约保存失败，请重试') }
+  } catch (caught) { mutationError.value = getApiErrorDetails(caught, 'FBA 预约保存失败，请重试'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(mutationError.value.code || '')) pendingAppointment.value = null }
   finally { saving.value = false }
 }
 
@@ -205,17 +213,11 @@ onMounted(() => { void load() })
       <template #pagination-left>共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>
   </ListPageLayout>
-  <AppDialog class="admin-density-dialog" v-model="appointmentOpen" :title="appointmentTitle" width="min(1080px, calc(100vw - 48px))" confirm-text="保存预约" :confirm-loading="saving" @confirm="submitAppointment">
+  <AppDialog class="admin-density-dialog" v-model="appointmentOpen" :title="appointmentTitle" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingAppointment ? '重试本次保存' : '保存预约安排'" :confirm-loading="saving" @confirm="submitAppointment">
     <div v-loading="appointmentLoading">
     <div class="appointment-summary">已选择 {{ appointmentSelectedCount }} 条，FBA仓库：{{ appointmentFbaWarehouse }}</div>
-    <el-form label-position="top" class="appointment-form density-form">
-      <el-form-item label="预约号" required><el-input v-model="appointmentForm.appointmentNo" maxlength="64" :readonly="appointmentMode === 'edit'" placeholder="请输入预约号" /></el-form-item>
-      <el-form-item label="预约送仓时间" required><el-date-picker v-model="appointmentForm.appointmentAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预约送仓时间" /></el-form-item>
-      <el-form-item label="预约结束时间"><el-date-picker v-model="appointmentForm.appointmentEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="未明确可留空" /></el-form-item>
-      <el-form-item label="预计装车时间" required><el-date-picker v-model="appointmentForm.expectedLoadingAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计装车时间" /></el-form-item>
-      <el-form-item label="预约状态" required><el-select v-model="appointmentForm.appointmentStatus" placeholder="请选择预约状态"><el-option label="预约中" value="PENDING" /><el-option label="预约成功" value="SUCCESS" /><el-option label="预约失败" value="FAILED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item>
-      <el-form-item label="预约备注"><el-input v-model="appointmentForm.appointmentRemark" maxlength="1000" placeholder="请输入预约备注" /></el-form-item>
-    </el-form>
+    <FbaAppointmentFields :model="appointmentForm" :appointment-no="editingAppointmentNo || undefined" :timezone="appointmentTimezone" :disabled="saving || !!pendingAppointment" />
+
     </div>
   </AppDialog>
   <SmartDispatchDialog v-model="smartDispatchOpen" :orders="selectedRows" @created="selectedRows = []; load()" />
diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
index 2bdf21d1..f65d9ab3 100644
--- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
+++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
@@ -210,7 +210,8 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(value).toContain("key: 'selection', type: 'selection'")
     expect(value).toContain('@selection-change="onSelectionChange"')
     expect(value).toContain('createFbaAppointment')
-    expect(value).toContain('预计装车时间')
+    expect(value).toContain('FbaAppointmentFields')
+    expect(value).not.toContain('appointmentForm.expectedLoadingAt')
     expect(value).toContain('所选入库单必须属于同一 FBA 仓库')
     expect(value).not.toContain('anchor.customerId === row.customerId')
     expect(value).toContain('anchor.fbaWarehouse === row.fbaWarehouse')
diff --git a/src/modules/overseas-warehouse/types.ts b/src/modules/overseas-warehouse/types.ts
index 79afda07..65aea33a 100644
--- a/src/modules/overseas-warehouse/types.ts
+++ b/src/modules/overseas-warehouse/types.ts
@@ -66,6 +66,7 @@ export interface LastMileOrderListItem {
 }
 
 export interface InboundOrderListItem {
+  originWarehouseId: string
   lineId: string
   planId: string
   customerId: string

From 320c2e44711a90f12b1c21a7be6f2590b2114db6 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 10:48:25 +0800
Subject: [PATCH 18/47] fix(appointments): type cargo checkbox value for CI
 builds

---
 src/modules/appointment-calendar/AppointmentCargoPanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index f1435965..9422a72e 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -130,7 +130,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
       <p v-else class="cargo-note">来源预计时间供筹划核对，确认预约前请核对最新船期与货物备妥情况。</p>
     </template>
     <template #actions="{ row }"><RowActions :actions="[{ key: 'followup', label: '跟进' }, { key: 'source', label: '查看来源' }]" text-actions @action="key => key === 'followup' ? openFollowup(row as PlanningCargo) : source(row as PlanningCargo)" /></template>
-    <template #select="{ row }"><el-checkbox :model-value="!!selected[row.sourceKey]" :aria-label="`选择 ${row.inboundCode || '未关联入仓码'}`" :disabled="batchLoading || (!selected[row.sourceKey] && (!selectable(row as PlanningCargo) || selectedRows.length >= 100))" @change="value => toggle(row as PlanningCargo, value)" /></template>
+    <template #select="{ row }"><el-checkbox :model-value="!!selected[row.sourceKey]" :aria-label="`选择 ${row.inboundCode || '未关联入仓码'}`" :disabled="batchLoading || (!selected[row.sourceKey] && (!selectable(row as PlanningCargo) || selectedRows.length >= 100))" @change="(value: boolean | string | number) => toggle(row as PlanningCargo, value)" /></template>
     <template #progress="{ row }">
       <span v-if="row.detained">暂扣，待处理</span>
       <span v-else-if="row.mixedDestinations">含多个目的地，待核对</span>

From 33e7e1e41baac1d82d13683bae3d5b419ec73f67 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 11:02:51 +0800
Subject: [PATCH 19/47] fix(warehouses): select region time zones instead of
 UTC offsets

---
 .../warehouses/pages/WarehousesView.test.ts   | 26 +++---
 .../warehouses/pages/WarehousesView.vue       | 91 ++++++++++---------
 2 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/src/modules/warehouses/pages/WarehousesView.test.ts b/src/modules/warehouses/pages/WarehousesView.test.ts
index 1e2c90c5..33182f52 100644
--- a/src/modules/warehouses/pages/WarehousesView.test.ts
+++ b/src/modules/warehouses/pages/WarehousesView.test.ts
@@ -76,7 +76,7 @@ const domesticWarehouse: PlatformWarehouseSummaryResource = {
   warehouseName: '义乌收货仓',
   warehouseType: 'DOMESTIC',
   countryCode: 'CN',
-  timezone: 'UTC+8',
+  timezone: 'Asia/Shanghai',
   contactName: '仓库客服',
   contactPhone: '0579-12345678',
   contactEmail: 'warehouse@example.com',
@@ -111,7 +111,7 @@ const fbaWarehouse: PlatformWarehouseSummaryResource = {
   warehouseName: 'AKR1',
   warehouseType: 'FBA',
   countryCode: 'US',
-  timezone: 'UTC-5',
+  timezone: 'America/New_York',
   contactName: null,
   contactPhone: null,
   contactEmail: null,
@@ -234,14 +234,14 @@ describe('WarehousesView', () => {
     expect(wrapper.find('.data-table').text()).not.toContain('浙江省义乌市北苑街道 1 号库')
     expect(wrapper.text()).toContain('国内收货仓')
     expect(wrapper.text()).toContain('中国 CN')
-    expect(wrapper.find('.data-table').text()).not.toContain('UTC+8')
+    expect(wrapper.find('.data-table').text()).not.toContain('Asia/Shanghai')
     expect(wrapper.text()).toContain('共 1 个公共仓库')
     expect(wrapper.find('.data-table').exists()).toBe(true)
     const editButton = wrapper.findAll('.table-actions button').find((button) => button.text().trim() === '编辑')
     await editButton?.trigger('click')
     await flushPromises()
     expect((wrapper.find('textarea[placeholder*="街道"]').element as HTMLTextAreaElement).value).toBe('真实物流园 1 号库')
-    expect(document.body.textContent).toContain('UTC+8')
+    expect(document.body.textContent).toContain('Asia/Shanghai')
   })
 
   it('submits filters and pagination to the API instead of filtering rows locally', async () => {
@@ -356,12 +356,12 @@ describe('WarehousesView', () => {
       city: 'Long Beach',
       postalCode: '90802',
       addressLine1: '2400 E Spring St',
-      timezone: 'UTC-8',
+      timezone: 'America/Los_Angeles',
     })
     expect(createPlatformWarehouse).not.toHaveBeenCalled()
   })
 
-  it('hides domestic country, timezone and type inputs while submitting fixed CN and UTC+8 defaults', async () => {
+  it('hides domestic country, timezone and type inputs while submitting fixed CN and Asia/Shanghai defaults', async () => {
     const wrapper = await mountView()
 
     wrapper.findComponent({ name: 'ElDropdown' }).vm.$emit('command', 'DOMESTIC')
@@ -387,7 +387,7 @@ describe('WarehousesView', () => {
       warehouseName: '义乌新仓',
       warehouseType: 'DOMESTIC',
       countryCode: 'CN',
-      timezone: 'UTC+8',
+      timezone: 'Asia/Shanghai',
       address: expect.objectContaining({ countryCode: 'CN', city: '义乌市' }),
     })
   })
@@ -409,7 +409,7 @@ describe('WarehousesView', () => {
     const timezoneSelect = wrapper.findAllComponents({ name: 'ElSelect' })
       .find((select) => select.props('placeholder') === '请选择时区')
     expect(timezoneSelect).toBeDefined()
-    expect(wrapper.findAllComponents({ name: 'ElOption' }).some((option) => option.props('value') === 'UTC-8')).toBe(true)
+    expect(wrapper.findAllComponents({ name: 'ElOption' }).some((option) => option.props('value') === 'America/Los_Angeles')).toBe(true)
 
     setField('input[placeholder="请输入仓库名称"]', '洛杉矶海外仓')
     stateSelect!.vm.$emit('update:modelValue', 'CA')
@@ -427,7 +427,7 @@ describe('WarehousesView', () => {
       warehouseName: '洛杉矶海外仓',
       warehouseType: 'OVERSEAS',
       countryCode: 'US',
-      timezone: 'UTC-8',
+      timezone: 'America/Los_Angeles',
       address: expect.objectContaining({ stateProvince: 'CA' }),
     })
   })
@@ -470,7 +470,7 @@ describe('WarehousesView', () => {
       warehouseName: '洛杉矶合作仓',
       warehouseType: 'OVERSEAS_PARTNER',
       countryCode: 'US',
-      timezone: 'UTC-8',
+      timezone: 'America/Los_Angeles',
       address: expect.objectContaining({ stateProvince: 'CA', city: 'Los Angeles' }),
     }))
   })
@@ -508,7 +508,7 @@ describe('WarehousesView', () => {
     const dialogText = document.querySelector('.warehouse-editor-dialog')?.textContent || ''
     expect(dialogText).toContain('编辑FBA 地址')
     expect(dialogText).not.toContain('例如 US')
-    expect(dialogText).not.toContain('例如 UTC-8')
+    expect(dialogText).not.toContain('例如 America/Los_Angeles')
 
     const countrySelect = wrapper.findAllComponents({ name: 'ElSelect' })
       .find((select) => select.props('placeholder') === '请选择国家或地区')
@@ -518,7 +518,7 @@ describe('WarehousesView', () => {
       .find((select) => select.props('placeholder') === '请选择时区')
     expect(countrySelect?.props('modelValue')).toBe('US')
     expect(stateSelect?.props('modelValue')).toBe('OH')
-    expect(timezoneSelect?.props('modelValue')).toBe('UTC-5')
+    expect(timezoneSelect?.props('modelValue')).toBe('America/New_York')
     expect(countrySelect).toBeDefined()
     expect((wrapper.find('input[placeholder="例如 154 或 CADF"]').element as HTMLInputElement).value).toBe('154')
 
@@ -533,7 +533,7 @@ describe('WarehousesView', () => {
       warehouseType: 'FBA',
       internalCode: '154',
       countryCode: 'US',
-      timezone: 'UTC-5',
+      timezone: 'America/New_York',
       address: expect.objectContaining({ stateProvince: 'OH' }),
     })
   })
diff --git a/src/modules/warehouses/pages/WarehousesView.vue b/src/modules/warehouses/pages/WarehousesView.vue
index 6050f004..5bda11a2 100644
--- a/src/modules/warehouses/pages/WarehousesView.vue
+++ b/src/modules/warehouses/pages/WarehousesView.vue
@@ -38,10 +38,13 @@ const warehouseTypeLabels: Record<WarehouseType, string> = {
   OVERSEAS_PARTNER: '海外仓合作仓',
 }
 const timezoneOptions = [
-  'UTC-12', 'UTC-11', 'UTC-10', 'UTC-9', 'UTC-8', 'UTC-7', 'UTC-6', 'UTC-5', 'UTC-4', 'UTC-3',
-  'UTC-2', 'UTC-1', 'UTC+0', 'UTC+1', 'UTC+2', 'UTC+3', 'UTC+4', 'UTC+5', 'UTC+6', 'UTC+7',
-  'UTC+8', 'UTC+9', 'UTC+10', 'UTC+11', 'UTC+12', 'UTC+13', 'UTC+14',
+  'Asia/Shanghai', 'America/New_York', 'America/Chicago', 'America/Denver',
+  'America/Los_Angeles', 'America/Phoenix', 'America/Anchorage', 'America/Adak', 'Pacific/Honolulu',
+  'America/Toronto', 'America/Vancouver', 'America/Edmonton', 'America/Winnipeg', 'America/Halifax',
+  'Europe/London', 'Europe/Berlin', 'Europe/Paris', 'Europe/Rome', 'Europe/Madrid',
+  'Asia/Tokyo', 'Australia/Sydney', 'Australia/Brisbane', 'Australia/Adelaide', 'Australia/Perth',
 ]
+
 const countryOptions = [
   { label: '美国 US', value: 'US' },
   { label: '加拿大 CA', value: 'CA' },
@@ -66,55 +69,55 @@ const countryDisplayLabels: Record<string, string> = {
   AU: '澳大利亚',
 }
 const usStateOptions = [
-  { label: 'AL Alabama', value: 'AL', timezone: 'UTC-6' },
-  { label: 'AK Alaska', value: 'AK', timezone: 'UTC-9' },
-  { label: 'AZ Arizona', value: 'AZ', timezone: 'UTC-7' },
-  { label: 'AR Arkansas', value: 'AR', timezone: 'UTC-6' },
-  { label: 'CA California', value: 'CA', timezone: 'UTC-8' },
-  { label: 'CO Colorado', value: 'CO', timezone: 'UTC-7' },
-  { label: 'CT Connecticut', value: 'CT', timezone: 'UTC-5' },
-  { label: 'DE Delaware', value: 'DE', timezone: 'UTC-5' },
+  { label: 'AL Alabama', value: 'AL', timezone: 'America/Chicago' },
+  { label: 'AK Alaska', value: 'AK', timezone: null },
+  { label: 'AZ Arizona', value: 'AZ', timezone: null },
+  { label: 'AR Arkansas', value: 'AR', timezone: 'America/Chicago' },
+  { label: 'CA California', value: 'CA', timezone: 'America/Los_Angeles' },
+  { label: 'CO Colorado', value: 'CO', timezone: 'America/Denver' },
+  { label: 'CT Connecticut', value: 'CT', timezone: 'America/New_York' },
+  { label: 'DE Delaware', value: 'DE', timezone: 'America/New_York' },
   { label: 'FL Florida', value: 'FL', timezone: null },
-  { label: 'GA Georgia', value: 'GA', timezone: 'UTC-5' },
-  { label: 'HI Hawaii', value: 'HI', timezone: 'UTC-10' },
-  { label: 'IA Iowa', value: 'IA', timezone: 'UTC-6' },
+  { label: 'GA Georgia', value: 'GA', timezone: 'America/New_York' },
+  { label: 'HI Hawaii', value: 'HI', timezone: 'Pacific/Honolulu' },
+  { label: 'IA Iowa', value: 'IA', timezone: 'America/Chicago' },
   { label: 'ID Idaho', value: 'ID', timezone: null },
-  { label: 'IL Illinois', value: 'IL', timezone: 'UTC-6' },
+  { label: 'IL Illinois', value: 'IL', timezone: 'America/Chicago' },
   { label: 'IN Indiana', value: 'IN', timezone: null },
   { label: 'KS Kansas', value: 'KS', timezone: null },
   { label: 'KY Kentucky', value: 'KY', timezone: null },
-  { label: 'LA Louisiana', value: 'LA', timezone: 'UTC-6' },
-  { label: 'MA Massachusetts', value: 'MA', timezone: 'UTC-5' },
-  { label: 'MD Maryland', value: 'MD', timezone: 'UTC-5' },
-  { label: 'ME Maine', value: 'ME', timezone: 'UTC-5' },
+  { label: 'LA Louisiana', value: 'LA', timezone: 'America/Chicago' },
+  { label: 'MA Massachusetts', value: 'MA', timezone: 'America/New_York' },
+  { label: 'MD Maryland', value: 'MD', timezone: 'America/New_York' },
+  { label: 'ME Maine', value: 'ME', timezone: 'America/New_York' },
   { label: 'MI Michigan', value: 'MI', timezone: null },
-  { label: 'MN Minnesota', value: 'MN', timezone: 'UTC-6' },
-  { label: 'MO Missouri', value: 'MO', timezone: 'UTC-6' },
-  { label: 'MS Mississippi', value: 'MS', timezone: 'UTC-6' },
-  { label: 'MT Montana', value: 'MT', timezone: 'UTC-7' },
-  { label: 'NC North Carolina', value: 'NC', timezone: 'UTC-5' },
+  { label: 'MN Minnesota', value: 'MN', timezone: 'America/Chicago' },
+  { label: 'MO Missouri', value: 'MO', timezone: 'America/Chicago' },
+  { label: 'MS Mississippi', value: 'MS', timezone: 'America/Chicago' },
+  { label: 'MT Montana', value: 'MT', timezone: 'America/Denver' },
+  { label: 'NC North Carolina', value: 'NC', timezone: 'America/New_York' },
   { label: 'ND North Dakota', value: 'ND', timezone: null },
   { label: 'NE Nebraska', value: 'NE', timezone: null },
-  { label: 'NH New Hampshire', value: 'NH', timezone: 'UTC-5' },
-  { label: 'NJ New Jersey', value: 'NJ', timezone: 'UTC-5' },
-  { label: 'NM New Mexico', value: 'NM', timezone: 'UTC-7' },
-  { label: 'NV Nevada', value: 'NV', timezone: 'UTC-8' },
-  { label: 'NY New York', value: 'NY', timezone: 'UTC-5' },
-  { label: 'OH Ohio', value: 'OH', timezone: 'UTC-5' },
-  { label: 'OK Oklahoma', value: 'OK', timezone: 'UTC-6' },
+  { label: 'NH New Hampshire', value: 'NH', timezone: 'America/New_York' },
+  { label: 'NJ New Jersey', value: 'NJ', timezone: 'America/New_York' },
+  { label: 'NM New Mexico', value: 'NM', timezone: 'America/Denver' },
+  { label: 'NV Nevada', value: 'NV', timezone: null },
+  { label: 'NY New York', value: 'NY', timezone: 'America/New_York' },
+  { label: 'OH Ohio', value: 'OH', timezone: 'America/New_York' },
+  { label: 'OK Oklahoma', value: 'OK', timezone: 'America/Chicago' },
   { label: 'OR Oregon', value: 'OR', timezone: null },
-  { label: 'PA Pennsylvania', value: 'PA', timezone: 'UTC-5' },
-  { label: 'RI Rhode Island', value: 'RI', timezone: 'UTC-5' },
-  { label: 'SC South Carolina', value: 'SC', timezone: 'UTC-5' },
+  { label: 'PA Pennsylvania', value: 'PA', timezone: 'America/New_York' },
+  { label: 'RI Rhode Island', value: 'RI', timezone: 'America/New_York' },
+  { label: 'SC South Carolina', value: 'SC', timezone: 'America/New_York' },
   { label: 'SD South Dakota', value: 'SD', timezone: null },
   { label: 'TN Tennessee', value: 'TN', timezone: null },
   { label: 'TX Texas', value: 'TX', timezone: null },
-  { label: 'VA Virginia', value: 'VA', timezone: 'UTC-5' },
-  { label: 'VT Vermont', value: 'VT', timezone: 'UTC-5' },
-  { label: 'WA Washington', value: 'WA', timezone: 'UTC-8' },
-  { label: 'WI Wisconsin', value: 'WI', timezone: 'UTC-6' },
-  { label: 'WV West Virginia', value: 'WV', timezone: 'UTC-5' },
-  { label: 'WY Wyoming', value: 'WY', timezone: 'UTC-7' },
+  { label: 'VA Virginia', value: 'VA', timezone: 'America/New_York' },
+  { label: 'VT Vermont', value: 'VT', timezone: 'America/New_York' },
+  { label: 'WA Washington', value: 'WA', timezone: 'America/Los_Angeles' },
+  { label: 'WI Wisconsin', value: 'WI', timezone: 'America/Chicago' },
+  { label: 'WV West Virginia', value: 'WV', timezone: 'America/New_York' },
+  { label: 'WY Wyoming', value: 'WY', timezone: 'America/Denver' },
 ]
 
 const access = useAccessPreviewStore()
@@ -213,7 +216,7 @@ const emptyForm = (type: WarehouseType = 'FBA'): WarehouseForm => ({
   businessHours: '',
   warehouseType: type,
   countryCode: type === 'DOMESTIC' ? 'CN' : 'US',
-  timezone: type === 'DOMESTIC' ? 'UTC+8' : '',
+  timezone: type === 'DOMESTIC' ? 'Asia/Shanghai' : '',
   receivingCutoffTime: type === 'FBA' ? '' : '18:00:00',
   status: 'ACTIVE',
   remark: '',
@@ -290,7 +293,7 @@ watch(importMode, () => { importResult.value = null })
 watch(activeWarehouseType, (type) => {
   if (type === 'DOMESTIC') {
     form.countryCode = 'CN'
-    form.timezone = 'UTC+8'
+    form.timezone = 'Asia/Shanghai'
   } else if (form.countryCode === 'CN') {
     form.countryCode = 'US'
     form.province = ''
@@ -500,7 +503,7 @@ function buildSaveRequest(): SavePlatformWarehouseRequest {
   const warehouse = existing?.warehouse
   const currentAddress = existing?.addresses[0]
   const countryCode = isDomesticForm.value ? 'CN' : form.countryCode.trim().toUpperCase()
-  const timezone = isDomesticForm.value ? 'UTC+8' : form.timezone.trim()
+  const timezone = isDomesticForm.value ? 'Asia/Shanghai' : form.timezone.trim()
   const capabilities = (existing?.capabilities || []).map((capability) => ({
     capabilityCode: capability.capabilityCode,
     capabilityName: capability.capabilityName,
@@ -777,7 +780,7 @@ onMounted(() => void loadWarehouses())
                 <p v-if="formErrors.countryCode" class="field-error" role="alert">{{ formErrors.countryCode }}</p>
               </el-form-item>
               <el-form-item v-if="!isDomesticCreate" label="时区" required :class="{ 'has-field-error': formErrors.timezone }">
-                <el-select v-if="isDomesticForm" v-model="form.timezone" disabled placeholder="UTC+8"><el-option label="UTC+8" value="UTC+8" /></el-select>
+                <el-select v-if="isDomesticForm" v-model="form.timezone" disabled placeholder="Asia/Shanghai"><el-option label="Asia/Shanghai" value="Asia/Shanghai" /></el-select>
                 <el-select v-else v-model="form.timezone" filterable placeholder="请选择时区" @change="clearFieldError('timezone')"><el-option v-for="timezone in timezoneOptions" :key="timezone" :label="timezone" :value="timezone" /></el-select>
                 <p v-if="formErrors.timezone" class="field-error" role="alert">{{ formErrors.timezone }}</p>
               </el-form-item>

From 871c8c021b1489e8958b5e484d87c59905747f08 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 11:43:49 +0800
Subject: [PATCH 20/47] feat(appointments): show pickup appointments with
 source scope warnings

---
 .../AppointmentCalendarPanel.vue              | 14 +++++---
 .../AppointmentCalendarView.test.ts           | 35 +++++++++++++++---
 .../AppointmentCalendarView.vue               | 36 ++++++++++++++++---
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  3 +-
 src/modules/appointment-calendar/api.ts       | 23 ++++++++++++
 5 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index f7ae284b..3c5b269f 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -8,13 +8,14 @@ export interface CalendarEvent {
   key: string
   date: string
   time: string
-  type: 'arrival' | 'delivery'
+  type: 'arrival' | 'delivery' | 'pickup'
   title: string
   subtitle?: string
   fields: Array<{ label: string; value?: string | null }>
   inboundCodes?: Array<string | null | undefined>
   canEdit?: boolean
   canDelete?: boolean
+  sourcePath?: string
 }
 
 const props = withDefaults(defineProps<{
@@ -29,6 +30,7 @@ const emit = defineEmits<{
   create: [date: string]
   edit: [event: CalendarEvent]
   delete: [event: CalendarEvent]
+  open: [event: CalendarEvent]
 }>()
 const selectedDate = ref(props.initialDate || dateKey(new Date()))
 const mode = ref<CalendarMode>('month')
@@ -45,6 +47,7 @@ const grouped = computed(() => {
 })
 const selectedEvents = computed(() => grouped.value.get(selectedDate.value) || [])
 const weekdays = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+const eventTypeLabels = { arrival: '船舶到港', delivery: '预约送仓', pickup: '预约提柜' }
 const heading = computed(() => mode.value === 'month'
   ? `${selectedDate.value.slice(0, 4)}年${Number(selectedDate.value.slice(5, 7))}月`
   : `${dates.value[0]} — ${addDays(calendarRange(selectedDate.value, mode.value).to, -1)}`)
@@ -69,7 +72,7 @@ defineExpose({ selectedDate, mode })
         <div class="calendar-label">
           <svg width="22" height="22" viewBox="0 0 24 24" fill="none" aria-hidden="true"><rect x="3" y="5" width="18" height="16" rx="2" stroke="currentColor" stroke-width="1.8"/><path d="M8 3v4M16 3v4M3 10h18M8 15h3M14 15h3" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/></svg>
           <strong>预约日历</strong>
-          <span class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span>
+          <span class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span>
         </div>
         <div class="calendar-controls">
           <el-button v-if="canCreate" type="primary" :disabled="loading" @click="emit('create', selectedDate)">＋ 新增预约</el-button>
@@ -103,11 +106,12 @@ defineExpose({ selectedDate, mode })
       <div class="detail-events" aria-live="polite">
         <p v-if="!selectedEvents.length && !loading" class="empty-day">{{ incomplete ? '部分来源未加载，请重试后确认当天安排' : '当天暂无到港或送仓预约' }}</p>
         <article v-for="event in selectedEvents" :key="event.key" class="detail-event">
-          <div class="event-heading"><span class="event-type" :class="event.type">{{ event.type === 'arrival' ? '船舶到港' : '预约送仓' }}</span><span>{{ event.time || '—' }}</span></div>
+          <div class="event-heading"><span class="event-type" :class="event.type">{{ eventTypeLabels[event.type] }}</span><span>{{ event.time || '—' }}</span></div>
           <h3>{{ event.title }}</h3><p v-if="event.subtitle" class="event-subtitle">{{ event.subtitle }}</p>
           <dl><div v-for="field in event.fields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value || '—' }}</dd></div></dl>
           <AppointmentInboundCodes v-if="event.inboundCodes" :codes="event.inboundCodes" />
-          <footer v-if="event.canEdit || event.canDelete" class="density-actions">
+          <footer v-if="event.canEdit || event.canDelete || event.sourcePath" class="density-actions">
+            <el-button v-if="event.sourcePath" class="density-action" :disabled="loading" @click="emit('open', event)">查看来源</el-button>
             <el-button v-if="event.canEdit" class="density-action" :disabled="loading" @click="emit('edit', event)">编辑</el-button>
             <el-button v-if="event.canDelete" class="density-action" data-tone="danger" :disabled="loading" @click="emit('delete', event)">取消预约</el-button>
           </footer>
@@ -127,6 +131,7 @@ defineExpose({ selectedDate, mode })
 .legend { font-size: 12px; white-space: nowrap; }
 .legend::before { content: ''; display: inline-block; width: 7px; height: 7px; border-radius: 50%; margin-right: 5px; background: #4b78e8; }
 .legend.delivery::before { background: #27a87a; }
+.legend.pickup::before { background: #c17a20; }
 .view-toggle { display: flex; border: 1px solid #dbe3ee; border-radius: 6px; padding: 2px; background: #f7f9fc; }
 .view-toggle button, .nav-button { border: 0; border-radius: 5px; background: transparent; cursor: pointer; color: #64748b; min-width: 30px; height: 30px; }
 .view-toggle button[aria-pressed='true'] { background: #fff; color: #4167d8; font-weight: 700; }
@@ -145,6 +150,7 @@ defineExpose({ selectedDate, mode })
 .event-chip { display: block; padding: 3px 6px; line-height: 16px; border-radius: 4px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; }
 .arrival { --event-bg: #edf3ff; --event-fg: #3765d4; }
 .delivery { --event-bg: #e8f8f1; --event-fg: #18845f; }
+.pickup { --event-bg: #fff4e3; --event-fg: #995a10; }
 .event-chip, .event-type { background: var(--event-bg); color: var(--event-fg); }
 .event-chip small { display: block; margin-top: 2px; font-size: 11px; opacity: .8; }
 .event-more { padding: 1px 6px; line-height: 16px; }
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 5cc60ff4..9717ac76 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -2,18 +2,18 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCalendarView from './AppointmentCalendarView.vue'
 import { createFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
-import { listArrivalCalendar } from './api'
+import { listArrivalCalendar, listPickupCalendar } from './api'
 import { resolvePlanningSource, saveFollowup, listUnscheduledAppointments } from './planningApi'
-const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true }))
+const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true, canPickup: true }))
 vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listUnscheduledAppointments: vi.fn() }))
 import { listPlatformWarehouses } from '@/modules/warehouses'
 vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
 
 vi.mock('vue-router', () => ({ useRoute: () => routing, useRouter: () => ({ push: vi.fn() }) }))
 
-vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), deleteAppointment: vi.fn() }))
+vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), listPickupCalendar: vi.fn(), deleteAppointment: vi.fn() }))
 
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => permission !== 'source-read' || routing.canSourceRead }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => (permission !== 'source-read' || routing.canSourceRead) && (permission !== 'platform:firstleg:terminal-drayage:list' || routing.canPickup) }) }))
 vi.mock('@/modules/overseas-warehouse', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/modules/overseas-warehouse')>()),
   createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(), listFbaAppointmentCalendar: vi.fn(),
   listInboundOrders: vi.fn(), updateFbaAppointment: vi.fn(),
@@ -45,15 +45,40 @@ function render() {
 describe('appointment calendar data integration', () => {
   beforeEach(() => {
     vi.resetAllMocks()
-    routing.query = {}; routing.canSourceRead = true
+    routing.query = {}; routing.canSourceRead = true; routing.canPickup = true
     vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: ['ONT8', 'LAX9'].map(code => ({ id: code, tenantId: 0, warehouseCode: code, warehouseName: code, warehouseType: 'FBA' as const, status: 'ACTIVE' as const, internalCode: null, countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, remark: null })), page: 1, size: 50, pages: 1, total: 2 })
     vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([])
     vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [], total: 0})
     vi.mocked(listArrivalCalendar).mockResolvedValue([])
+    vi.mocked(listPickupCalendar).mockResolvedValue({records: [], truncated: false, unclassifiedCount: 0, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'})
     vi.mocked(listInboundOrders).mockResolvedValue({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
+  it('shows the original pickup time once without claiming a port time zone and retains partial-source warnings', async () => {
+    vi.mocked(listPickupCalendar).mockResolvedValueOnce({records: [{containerBookingId: '123',bookingNo: 'CB-TEST',containerNo: 'TEST-CONT',destinationPortName: 'Port',destinationWarehouseCode: 'US-W',fleetSupplierName: 'Fleet',pickupAppointmentAt: '2026-10-09T11:00:00',actualPickupAt: null}],truncated: false,unclassifiedCount: 1,scopeBasis: 'US_DESTINATION_WAREHOUSE',timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'})
+    const wrapper=render(); await flushPromises()
+    const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
+    expect(panel.props('events')).toEqual([expect.objectContaining({type:'pickup',date:'2026-10-09',time:'11:00',sourcePath:'/container-loading/overseas/123'})])
+    expect(panel.props('incomplete')).toBe(true)
+    expect(wrapper.text()).toContain('目的仓国家待核实')
+    expect(listPickupCalendar).toHaveBeenCalledTimes(1)
+  })
+  it('does not request pickup records without pickup list permission and discloses the omitted source', async () => {
+    routing.canPickup=false
+    const wrapper=render(); await flushPromises()
+    expect(listPickupCalendar).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain('无提柜查看权限')
+    expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('incomplete')).toBe(true)
+  })
+  it('keeps successful arrival data visible when the pickup source fails', async () => {
+    vi.mocked(listPickupCalendar).mockRejectedValueOnce(new Error('pickup unavailable'))
+    vi.mocked(listArrivalCalendar).mockResolvedValueOnce([{containerBookingId:'1',bookingNo:'CB-1',arrivalAt:'2026-10-09T09:00:00',arrivalType:'ESTIMATED'}])
+    const wrapper=render(); await flushPromises()
+    const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
+    expect(panel.props('events')).toEqual([expect.objectContaining({type:'arrival',key:'arrival-1'})])
+    expect(panel.props('incomplete')).toBe(true)
+  })
   it('creates one shared appointment for two customers without sending a fabricated header customer', async () => {
     const wrapper = render()
     await flushPromises()
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 2a0ce7a6..551d2078 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
 import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -24,10 +24,11 @@ import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import { calendarRange, dateKey } from './calendar'
-import { deleteAppointment, listArrivalCalendar, type ArrivalCalendarEntry } from './api'
+import { deleteAppointment, listArrivalCalendar, listPickupCalendar, type ArrivalCalendarEntry, type PickupCalendarEntry } from './api'
 
 const access = useAccessPreviewStore()
 const route = useRoute()
+const router = useRouter()
 const linkedSource = ref<ResolvedPlanningSource | null>(null)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkLoading = ref(false)
@@ -35,6 +36,8 @@ let linkRequest = 0
 const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
 const appointments = ref<FbaAppointmentDto[]>([])
 const arrivals = ref<ArrivalCalendarEntry[]>([])
+const pickups = ref<PickupCalendarEntry[]>([])
+const pickupNotice = ref('')
 const range = ref(calendarRange(dateKey(new Date()), 'month'))
 const loading = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
@@ -99,6 +102,18 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
     { label: '柜次号', value: arrival.bookingNo },
     { label: '货物去向', value: arrival.destinationWarehouseCode },
   ],
+})), ...pickups.value.map(pickup => ({
+  key: `pickup-${pickup.containerBookingId}`, type: 'pickup' as const,
+  date: pickup.pickupAppointmentAt.slice(0, 10), time: pickup.pickupAppointmentAt.slice(11, 16),
+  title: `${pickup.containerNo || pickup.bookingNo || '未关联柜号'} 预约提柜`,
+  sourcePath: `/container-loading/overseas/${encodeURIComponent(pickup.containerBookingId)}`,
+  subtitle: '美国目的仓相关提柜安排',
+  fields: [
+    { label: '柜次号', value: pickup.bookingNo }, { label: '目的港', value: pickup.destinationPortName },
+    { label: '目的仓', value: pickup.destinationWarehouseCode }, { label: '车队', value: pickup.fleetSupplierName },
+    { label: '实际提柜', value: pickup.actualPickupAt || '尚未记录' },
+    { label: '时间口径', value: '原提柜业务时间，港口时区待核实' },
+  ],
 })), ...appointments.value.map(appointment => ({
   key: appointment.appointmentNo, type: 'delivery' as const, date: (appointment.appointmentAt || appointment.plannedAt || appointment.plannedDate || '').slice(0, 10),
   time: (appointment.appointmentAt || appointment.plannedAt || '').slice(11, 16) + (appointment.appointmentEndAt ? `–${appointment.appointmentEndAt.slice(11, 16)}` : ''), title: `${appointment.fbaWarehouseCode} ${appointment.appointmentStatus === 'SUCCESS' ? '已确认送仓' : '计划送仓'}`,
@@ -127,21 +142,33 @@ async function load(nextRange = range.value) {
   errorTitle.value = '预约日历加载失败'
   appointments.value = []
   arrivals.value = []
+  pickups.value = []
+  const canReadPickup = access.can('platform:firstleg:terminal-drayage:list')
+  pickupNotice.value = canReadPickup ? '' : '无提柜查看权限，当前日历不包含提柜预约。'
   try {
-    const [result, arrivalResult] = await Promise.allSettled([
+    const [result, arrivalResult, pickupResult] = await Promise.allSettled([
       listFbaAppointmentCalendar(nextRange, calendarController.signal),
       listArrivalCalendar(nextRange, calendarController.signal),
+      canReadPickup ? listPickupCalendar(nextRange, calendarController.signal) : Promise.resolve(null),
     ])
     if (request !== calendarRequest) return
     if (result.status === 'fulfilled') appointments.value = result.value
     else sourceErrors.value.push({ title: '送仓预约加载失败', details: getApiErrorDetails(result.reason, '送仓预约加载失败') })
     if (arrivalResult.status === 'fulfilled') arrivals.value = arrivalResult.value
     else sourceErrors.value.push({ title: '船舶到港加载失败', details: getApiErrorDetails(arrivalResult.reason, '船舶到港加载失败') })
+    if (pickupResult.status === 'fulfilled' && pickupResult.value) {
+      pickups.value = pickupResult.value.records
+      if (pickupResult.value.truncated || Number(pickupResult.value.unclassifiedCount) > 0) pickupNotice.value = '提柜来源有超出数量上限或目的仓国家待核实的记录，当前统计不完整，请缩小日期范围或完善仓库资料。'
+    } else if (pickupResult.status === 'rejected') sourceErrors.value.push({ title: '提柜预约加载失败', details: getApiErrorDetails(pickupResult.reason, '提柜预约加载失败') })
   } catch (error) {
     if (request === calendarRequest) loadError.value = getApiErrorDetails(error, '预约日历加载失败')
   } finally { if (request === calendarRequest) loading.value = false }
 }
 
+function openSource(event: CalendarEvent) {
+  if (event.sourcePath) void router.push(event.sourcePath)
+}
+
 function openCreate(date: string) {
   ++candidateRequest
   ++detailRequest
@@ -325,7 +352,8 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
-    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" />
+    <p v-if="pickupNotice" role="status">{{ pickupNotice }}</p>
+    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource" />
     </div>
     <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index 9f569faf..e0954359 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -18,9 +18,10 @@
 | 整柜提柜与接仓 | 美国预约统一方案的整柜共享事项 | 独立工作视图按柜汇总，操作列左置；接仓点在行内分组，点击后共用1080px跟进弹框。整柜只选拖车/码头事项，接仓只记录对应仓库，单票只记录FBA联系；数量未知或范围不完整明确显示，不按客户复制整柜联系。首次只请求一页整柜数据，详情按点击读取；待1920×1080页面验收 |
 | 在途跨客户合批安排 | 美国预约统一方案的同起运仓、同目的仓合批 | 操作列后选择同起运仓及同目的仓，跨页累计最多100票；批量核对后在1080px弹框填写与入仓入口共用的安排表单。未知箱数保留待核实；暂扣、多目的地和已有预约不可选入。保存必须重新核对，未知结果保留同一命令供重试 |
 | 未定时安排 | 总览不得伪造时段 | 日历上方独立折叠分页列表；日期未定不补零点或09点，继续编辑仍操作原系统单号；仅有计划日期时日历显示日期，不生成确认时段 |
+| 提柜日历 | 美国业务预约统一总览 | 读取原码头提柜预约，一柜一条，点击查看来源进入清关提柜详情；按美国目的仓确认业务范围，不等于确认港口国家。保留原业务日期，明确港口时区待核实，不套用目的仓时区；未知目的仓及截断显示统计不完整。无提柜权限不请求该来源并提示范围缺失 |
 | 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
 
-结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约与到港各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
+结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约、到港及有权限的提柜来源各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
 
 本轮视觉验收：待人工1920×1080截图确认。
 
diff --git a/src/modules/appointment-calendar/api.ts b/src/modules/appointment-calendar/api.ts
index 9affcc1f..fd70b7d9 100644
--- a/src/modules/appointment-calendar/api.ts
+++ b/src/modules/appointment-calendar/api.ts
@@ -12,6 +12,29 @@ export interface ArrivalCalendarEntry {
   arrivalType: 'ACTUAL' | 'ESTIMATED'
 }
 
+export interface PickupCalendarEntry {
+  containerBookingId: string
+  bookingNo: string
+  containerNo: string | null
+  destinationPortName: string | null
+  destinationWarehouseCode: string | null
+  fleetSupplierName: string | null
+  pickupAppointmentAt: string
+  actualPickupAt: string | null
+}
+export interface PickupCalendar {
+  records: PickupCalendarEntry[]
+  truncated: boolean
+  unclassifiedCount: number
+  scopeBasis: 'US_DESTINATION_WAREHOUSE'
+  timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'
+}
+export async function listPickupCalendar(query: { from: string; to: string }, signal?: AbortSignal) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<PickupCalendar>, ApiEnvelope<PickupCalendar>>(
+    '/platform/v1/terminal-drayages/calendar', { params: query, signal },
+  ))
+}
+
 export async function listArrivalCalendar(query: { from: string; to: string }, signal?: AbortSignal) {
   const response = await http.get<ApiEnvelope<ArrivalCalendarEntry[]>, ApiEnvelope<ArrivalCalendarEntry[]>>(
     '/platform/v1/port-schedules/arrival-calendar', { params: query, signal },

From b14d22b55ee6091026f219bffdf9d6d23bb8e349 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 12:01:12 +0800
Subject: [PATCH 21/47] feat(appointments): project trip plans by origin time
 zone

---
 .../AppointmentCalendarPanel.vue              |  8 +-
 .../AppointmentCalendarView.test.ts           | 22 ++++-
 .../AppointmentCalendarView.vue               | 37 ++++++++-
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  3 +-
 .../appointment-calendar/tripCalendar.test.ts | 36 ++++++++
 .../appointment-calendar/tripCalendar.ts      | 83 +++++++++++++++++++
 6 files changed, 179 insertions(+), 10 deletions(-)
 create mode 100644 src/modules/appointment-calendar/tripCalendar.test.ts
 create mode 100644 src/modules/appointment-calendar/tripCalendar.ts

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index 3c5b269f..fbba8105 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -8,7 +8,7 @@ export interface CalendarEvent {
   key: string
   date: string
   time: string
-  type: 'arrival' | 'delivery' | 'pickup'
+  type: 'arrival' | 'delivery' | 'pickup' | 'trip'
   title: string
   subtitle?: string
   fields: Array<{ label: string; value?: string | null }>
@@ -47,7 +47,7 @@ const grouped = computed(() => {
 })
 const selectedEvents = computed(() => grouped.value.get(selectedDate.value) || [])
 const weekdays = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-const eventTypeLabels = { arrival: '船舶到港', delivery: '预约送仓', pickup: '预约提柜' }
+const eventTypeLabels = { arrival: '船舶到港', delivery: '预约送仓', pickup: '预约提柜', trip: '用车计划' }
 const heading = computed(() => mode.value === 'month'
   ? `${selectedDate.value.slice(0, 4)}年${Number(selectedDate.value.slice(5, 7))}月`
   : `${dates.value[0]} — ${addDays(calendarRange(selectedDate.value, mode.value).to, -1)}`)
@@ -72,7 +72,7 @@ defineExpose({ selectedDate, mode })
         <div class="calendar-label">
           <svg width="22" height="22" viewBox="0 0 24 24" fill="none" aria-hidden="true"><rect x="3" y="5" width="18" height="16" rx="2" stroke="currentColor" stroke-width="1.8"/><path d="M8 3v4M16 3v4M3 10h18M8 15h3M14 15h3" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/></svg>
           <strong>预约日历</strong>
-          <span class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span>
+          <span class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span><span class="legend trip">用车计划</span>
         </div>
         <div class="calendar-controls">
           <el-button v-if="canCreate" type="primary" :disabled="loading" @click="emit('create', selectedDate)">＋ 新增预约</el-button>
@@ -132,6 +132,7 @@ defineExpose({ selectedDate, mode })
 .legend::before { content: ''; display: inline-block; width: 7px; height: 7px; border-radius: 50%; margin-right: 5px; background: #4b78e8; }
 .legend.delivery::before { background: #27a87a; }
 .legend.pickup::before { background: #c17a20; }
+.legend.trip::before { background: #8562b0; }
 .view-toggle { display: flex; border: 1px solid #dbe3ee; border-radius: 6px; padding: 2px; background: #f7f9fc; }
 .view-toggle button, .nav-button { border: 0; border-radius: 5px; background: transparent; cursor: pointer; color: #64748b; min-width: 30px; height: 30px; }
 .view-toggle button[aria-pressed='true'] { background: #fff; color: #4167d8; font-weight: 700; }
@@ -151,6 +152,7 @@ defineExpose({ selectedDate, mode })
 .arrival { --event-bg: #edf3ff; --event-fg: #3765d4; }
 .delivery { --event-bg: #e8f8f1; --event-fg: #18845f; }
 .pickup { --event-bg: #fff4e3; --event-fg: #995a10; }
+.trip { --event-bg: #f2edfa; --event-fg: #725199; }
 .event-chip, .event-type { background: var(--event-bg); color: var(--event-fg); }
 .event-chip small { display: block; margin-top: 2px; font-size: 11px; opacity: .8; }
 .event-more { padding: 1px 6px; line-height: 16px; }
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 9717ac76..8fa2c24f 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -3,8 +3,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCalendarView from './AppointmentCalendarView.vue'
 import { createFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
 import { listArrivalCalendar, listPickupCalendar } from './api'
+import { listTripCalendar } from './tripCalendar'
+vi.mock('./tripCalendar', async (original) => ({...(await original<typeof import('./tripCalendar')>()),listTripCalendar:vi.fn()}))
 import { resolvePlanningSource, saveFollowup, listUnscheduledAppointments } from './planningApi'
-const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true, canPickup: true }))
+const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true, canPickup: true, canTrips: true }))
 vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listUnscheduledAppointments: vi.fn() }))
 import { listPlatformWarehouses } from '@/modules/warehouses'
 vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
@@ -13,7 +15,7 @@ vi.mock('vue-router', () => ({ useRoute: () => routing, useRouter: () => ({ push
 
 vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), listPickupCalendar: vi.fn(), deleteAppointment: vi.fn() }))
 
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => (permission !== 'source-read' || routing.canSourceRead) && (permission !== 'platform:firstleg:terminal-drayage:list' || routing.canPickup) }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => (permission !== 'source-read' || routing.canSourceRead) && (permission !== 'platform:firstleg:terminal-drayage:list' || routing.canPickup) && (permission !== 'platform:fleet:trip:list' || routing.canTrips) }) }))
 vi.mock('@/modules/overseas-warehouse', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/modules/overseas-warehouse')>()),
   createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(), listFbaAppointmentCalendar: vi.fn(),
   listInboundOrders: vi.fn(), updateFbaAppointment: vi.fn(),
@@ -45,11 +47,12 @@ function render() {
 describe('appointment calendar data integration', () => {
   beforeEach(() => {
     vi.resetAllMocks()
-    routing.query = {}; routing.canSourceRead = true; routing.canPickup = true
+    routing.query = {}; routing.canSourceRead = true; routing.canPickup = true; routing.canTrips = true
     vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: ['ONT8', 'LAX9'].map(code => ({ id: code, tenantId: 0, warehouseCode: code, warehouseName: code, warehouseType: 'FBA' as const, status: 'ACTIVE' as const, internalCode: null, countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, remark: null })), page: 1, size: 50, pages: 1, total: 2 })
     vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([])
     vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [], total: 0})
     vi.mocked(listArrivalCalendar).mockResolvedValue([])
+    vi.mocked(listTripCalendar).mockResolvedValue({records:[],unresolvedRecords:[]})
     vi.mocked(listPickupCalendar).mockResolvedValue({records: [], truncated: false, unclassifiedCount: 0, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'})
     vi.mocked(listInboundOrders).mockResolvedValue({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
@@ -79,6 +82,19 @@ describe('appointment calendar data integration', () => {
     expect(panel.props('events')).toEqual([expect.objectContaining({type:'arrival',key:'arrival-1'})])
     expect(panel.props('incomplete')).toBe(true)
   })
+  it('omits trip requests without trip list permission and keeps other sources usable', async () => {
+    routing.canTrips=false
+    const wrapper=render();await flushPromises()
+    expect(listTripCalendar).not.toHaveBeenCalled();expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
+    expect(wrapper.text()).toContain('无车次查看权限')
+  })
+  it('keeps unresolved trip origins outside daily slots and clearly labels their UTC source time', async () => {
+    vi.mocked(listTripCalendar).mockResolvedValueOnce({records:[],unresolvedRecords:[{sourceType:'TRIP_PLAN',tripNo:'TR-UNKNOWN',status:'PLANNED',originWarehouseId:null,originWarehouseCode:null,originWarehouseName:null,originCountryCode:null,originTimezone:null,originWarehouseStatus:null,plannedDepartureAt:'2026-10-10T12:00:00Z',expectedDriverEndAt:null,departedAt:null,completedAt:null,stops:[],incompleteReasons:['ORIGIN_WAREHOUSE_UNKNOWN']}]})
+    const wrapper=render();await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('events')).toEqual([])
+    expect(wrapper.text()).toContain('待核实地点的车次（1）');expect(wrapper.text()).toContain('原计划时间保留 UTC')
+    expect(listTripCalendar).toHaveBeenCalledTimes(1)
+  })
   it('creates one shared appointment for two customers without sending a fabricated header customer', async () => {
     const wrapper = render()
     await flushPromises()
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 551d2078..bd30779f 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -25,6 +25,7 @@ import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import { calendarRange, dateKey } from './calendar'
 import { deleteAppointment, listArrivalCalendar, listPickupCalendar, type ArrivalCalendarEntry, type PickupCalendarEntry } from './api'
+import { listTripCalendar, projectTripCalendar, tripIssues, type TripCalendarEntry } from './tripCalendar'
 
 const access = useAccessPreviewStore()
 const route = useRoute()
@@ -38,6 +39,18 @@ const appointments = ref<FbaAppointmentDto[]>([])
 const arrivals = ref<ArrivalCalendarEntry[]>([])
 const pickups = ref<PickupCalendarEntry[]>([])
 const pickupNotice = ref('')
+const tripEvents = ref<CalendarEvent[]>([])
+const unresolvedTrips = ref<TripCalendarEntry[]>([])
+const tripNotice = ref('')
+const unresolvedPage = ref(1), unresolvedSize = ref(10)
+const unresolvedRows = computed(() => unresolvedTrips.value.slice((unresolvedPage.value - 1) * unresolvedSize.value, unresolvedPage.value * unresolvedSize.value))
+const unresolvedColumns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 110, fixed: 'left' },
+  { prop: 'tripNo', label: '车次号', minWidth: 210 },
+  { prop: 'originWarehouseName', label: '起运仓', minWidth: 170 },
+  { prop: 'plannedDepartureAt', label: '原计划出发（UTC）', minWidth: 225 },
+  { key: 'issues', label: '待核实资料', slotName: 'issues', minWidth: 230 },
+]
 const range = ref(calendarRange(dateKey(new Date()), 'month'))
 const loading = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
@@ -129,7 +142,7 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
   inboundCodes: appointment.items.map(item => item.inboundCode),
   canEdit: access.can(permission.inboundOrderAppointment),
   canDelete: access.can('platform:appointment:delete'),
-}))])
+})), ...tripEvents.value])
 
 async function load(nextRange = range.value) {
   range.value = nextRange
@@ -143,13 +156,17 @@ async function load(nextRange = range.value) {
   appointments.value = []
   arrivals.value = []
   pickups.value = []
+  tripEvents.value = []; unresolvedTrips.value = []; unresolvedPage.value = 1
   const canReadPickup = access.can('platform:firstleg:terminal-drayage:list')
+  const canReadTrips = access.can('platform:fleet:trip:list')
   pickupNotice.value = canReadPickup ? '' : '无提柜查看权限，当前日历不包含提柜预约。'
+  tripNotice.value = canReadTrips ? '' : '无车次查看权限，当前日历不包含用车计划。'
   try {
-    const [result, arrivalResult, pickupResult] = await Promise.allSettled([
+    const [result, arrivalResult, pickupResult, tripResult] = await Promise.allSettled([
       listFbaAppointmentCalendar(nextRange, calendarController.signal),
       listArrivalCalendar(nextRange, calendarController.signal),
       canReadPickup ? listPickupCalendar(nextRange, calendarController.signal) : Promise.resolve(null),
+      canReadTrips ? listTripCalendar(nextRange, calendarController.signal) : Promise.resolve(null),
     ])
     if (request !== calendarRequest) return
     if (result.status === 'fulfilled') appointments.value = result.value
@@ -160,6 +177,11 @@ async function load(nextRange = range.value) {
       pickups.value = pickupResult.value.records
       if (pickupResult.value.truncated || Number(pickupResult.value.unclassifiedCount) > 0) pickupNotice.value = '提柜来源有超出数量上限或目的仓国家待核实的记录，当前统计不完整，请缩小日期范围或完善仓库资料。'
     } else if (pickupResult.status === 'rejected') sourceErrors.value.push({ title: '提柜预约加载失败', details: getApiErrorDetails(pickupResult.reason, '提柜预约加载失败') })
+    if (tripResult.status === 'fulfilled' && tripResult.value) {
+      const projection = projectTripCalendar(tripResult.value, nextRange)
+      tripEvents.value = projection.events; unresolvedTrips.value = projection.unresolved
+      if (projection.unresolved.length) tripNotice.value = '部分车次无法确定起运地点或当地日期，已单列待核实，未计入每日安排。'
+    } else if (tripResult.status === 'rejected') sourceErrors.value.push({ title: '用车计划加载失败', details: getApiErrorDetails(tripResult.reason, '用车计划加载失败') })
   } catch (error) {
     if (request === calendarRequest) loadError.value = getApiErrorDetails(error, '预约日历加载失败')
   } finally { if (request === calendarRequest) loading.value = false }
@@ -353,7 +375,16 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
     <p v-if="pickupNotice" role="status">{{ pickupNotice }}</p>
-    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource" />
+    <p v-if="tripNotice" role="status">{{ tripNotice }}</p>
+    <details v-if="unresolvedTrips.length" class="appointment-extra">
+      <summary>待核实地点的车次（{{ unresolvedTrips.length }}）</summary>
+      <p>检索窗口内的车次，尚无法确定当地日期。原计划时间保留 UTC，不用浏览器时区换算。</p>
+      <DataTable v-model:page="unresolvedPage" v-model:page-size="unresolvedSize" :data="unresolvedRows" :columns="unresolvedColumns" :total="unresolvedTrips.length" row-key="tripNo" @update:page-size="unresolvedPage = 1">
+        <template #actions="{ row }"><el-button class="density-action" @click="router.push(`/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`)">查看来源</el-button></template>
+        <template #issues="{ row }">{{ tripIssues(row as TripCalendarEntry) }}</template>
+      </DataTable>
+    </details>
+    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || !!tripNotice" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource" />
     </div>
     <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index e0954359..383e7487 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -19,9 +19,10 @@
 | 在途跨客户合批安排 | 美国预约统一方案的同起运仓、同目的仓合批 | 操作列后选择同起运仓及同目的仓，跨页累计最多100票；批量核对后在1080px弹框填写与入仓入口共用的安排表单。未知箱数保留待核实；暂扣、多目的地和已有预约不可选入。保存必须重新核对，未知结果保留同一命令供重试 |
 | 未定时安排 | 总览不得伪造时段 | 日历上方独立折叠分页列表；日期未定不补零点或09点，继续编辑仍操作原系统单号；仅有计划日期时日历显示日期，不生成确认时段 |
 | 提柜日历 | 美国业务预约统一总览 | 读取原码头提柜预约，一柜一条，点击查看来源进入清关提柜详情；按美国目的仓确认业务范围，不等于确认港口国家。保留原业务日期，明确港口时区待核实，不套用目的仓时区；未知目的仓及截断显示统计不完整。无提柜权限不请求该来源并提示范围缺失 |
+| 用车计划日历 | 统一总览的真实车次只读来源 | 一车一条，计划与实际出发分开，司机预计结束不当送货完成。查询一次带跨时区余量的UTC窗口，按起运仓地点时区筛回42个当地日；缺国家/时区的记录独立分页待核实，不放入每日格。路线最多3站摘要，完整路线进入原车次；不请求逐车详情，不在预约页创建车次或重算余位 |
 | 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
 
-结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约、到港及有权限的提柜来源各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
+结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约、到港及有权限的提柜、车次来源各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
 
 本轮视觉验收：待人工1920×1080截图确认。
 
diff --git a/src/modules/appointment-calendar/tripCalendar.test.ts b/src/modules/appointment-calendar/tripCalendar.test.ts
new file mode 100644
index 00000000..1b8822ef
--- /dev/null
+++ b/src/modules/appointment-calendar/tripCalendar.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it, vi } from 'vitest'
+import { listTripCalendar, projectTripCalendar, tripQueryWindow, type TripCalendarEntry } from './tripCalendar'
+import { http } from '@/shared/api/http'
+vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn() }, unwrapApiResponse: (value: {data: unknown}) => value.data }))
+const range = { from: '2026-10-01', to: '2026-11-01' }
+function trip(tripNo: string, plannedDepartureAt: string, originTimezone = 'America/Los_Angeles'): TripCalendarEntry {
+  return { sourceType: 'TRIP_PLAN', tripNo, status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'US-W', originWarehouseName: 'US warehouse', originCountryCode: 'US', originTimezone, originWarehouseStatus: 'ACTIVE', plannedDepartureAt, expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{name:'US warehouse'}, {name:'FBA'}], incompleteReasons: [] }
+}
+describe('location-based trip calendar', () => {
+  it('queries one padded UTC window for 42 location dates without frontend page scanning', async () => {
+    const localRange = {from:'2026-09-28',to:'2026-11-09'}
+    expect(tripQueryWindow(localRange)).toEqual({from:'2026-09-27T10:00:00.000Z',to:'2026-11-09T14:00:00.000Z'})
+    vi.mocked(http.get).mockResolvedValue({data:{records:[],unresolvedRecords:[]}})
+    await listTripCalendar(localRange)
+    expect(http.get).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/fleet/trips/calendar',{params:tripQueryWindow(localRange),signal:undefined})
+    expect(() => tripQueryWindow({from:'2026-10-01',to:'2026-11-20'})).toThrow()
+  })
+  it('includes the first and last local day and removes padded rows outside each origin date range', () => {
+    const records=[trip('LA-before','2026-10-01T06:30:00Z'),trip('NY-start','2026-10-01T06:30:00Z','America/New_York'),trip('LA-end','2026-11-01T06:30:00Z'),trip('NY-after','2026-11-01T06:30:00Z','America/New_York')]
+    const projected=projectTripCalendar({records,unresolvedRecords:[]},range)
+    expect(projected.events.map(event=>[event.key,event.date,event.time])).toEqual([['trip-NY-start','2026-10-01','02:30'],['trip-LA-end','2026-10-31','23:30']])
+  })
+  it('does not guess a slot for absent, fixed-offset, invalid or browser-unsupported time zones', () => {
+    const unknown={...trip('unknown','2026-10-10T12:00:00Z'),originTimezone:null,incompleteReasons:['ORIGIN_TIMEZONE_UNKNOWN']}
+    const result=projectTripCalendar({records:[trip('offset','2026-10-10T12:00:00Z','UTC-5'),trip('bad','2026-10-10T12:00:00Z','Mars/Base'),trip('naive','2026-10-10T12:00:00')],unresolvedRecords:[unknown]},range)
+    expect(result.events).toEqual([]);expect(result.unresolved.map(row=>row.tripNo)).toEqual(['unknown','offset','bad','naive'])
+  })
+  it('retains original instants through DST overlap and does not replace the plan date with actual departure', () => {
+    const row={...trip('TR-DST','2026-11-01T05:30:00Z','America/New_York'),departedAt:'2026-11-02T05:00:00Z',stops:Array.from({length:20},(_,i)=>({name:`Stop ${i}`}))}
+    const events=projectTripCalendar({records:[row,trip('TR-DST-2','2026-11-01T06:30:00Z','America/New_York')],unresolvedRecords:[]},{from:'2026-11-01',to:'2026-11-08'}).events
+    expect(events.map(event=>event.time)).toEqual(['01:30','01:30'])
+    expect(events[0]).toMatchObject({date:'2026-11-01',subtitle:'运输计划，不代表收货方预约已确认'})
+    expect(events[0]!.fields).toContainEqual({label:'计划出发（UTC）',value:'2026-11-01T05:30:00Z'})
+    expect(events[0]!.fields).toContainEqual({label:'路线',value:'Stop 0 → Stop 1 → Stop 2 等20站'})
+  })
+})
diff --git a/src/modules/appointment-calendar/tripCalendar.ts b/src/modules/appointment-calendar/tripCalendar.ts
new file mode 100644
index 00000000..be200057
--- /dev/null
+++ b/src/modules/appointment-calendar/tripCalendar.ts
@@ -0,0 +1,83 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { CalendarEvent } from './AppointmentCalendarPanel.vue'
+
+export interface TripCalendarEntry {
+  sourceType: 'TRIP_PLAN'
+  tripNo: string
+  status: string
+  originWarehouseId: string | null
+  originWarehouseCode: string | null
+  originWarehouseName: string | null
+  originCountryCode: string | null
+  originTimezone: string | null
+  originWarehouseStatus: string | null
+  plannedDepartureAt: string | null
+  expectedDriverEndAt: string | null
+  departedAt: string | null
+  completedAt: string | null
+  stops: Array<{ name: string; address?: string | null; destinationKey?: string | null }>
+  incompleteReasons: string[]
+}
+export interface TripCalendarResult { records: TripCalendarEntry[]; unresolvedRecords: TripCalendarEntry[] }
+export const tripIssueLabels: Record<string, string> = {
+  ORIGIN_WAREHOUSE_UNKNOWN: '起运仓资料缺失', ORIGIN_COUNTRY_UNKNOWN: '起运国家待核实',
+  ORIGIN_TIMEZONE_UNKNOWN: '起运仓时区待核实', ROUTE_INCOMPLETE: '路线资料不完整',
+  LOCAL_DATE_UNRESOLVED: '无法确定当地日期',
+}
+export function tripIssues(row: TripCalendarEntry) {
+  return row.incompleteReasons.map(reason => tripIssueLabels[reason] || '资料待核实').join('；')
+}
+export function tripQueryWindow(range: { from: string; to: string }) {
+  const start = Date.parse(`${range.from}T00:00:00Z`), end = Date.parse(`${range.to}T00:00:00Z`)
+  if (!Number.isFinite(start) || !Number.isFinite(end) || end <= start || end - start > 42 * 86400000) throw new Error('日历日期范围无效')
+  // Query all possible location dates, then place each record using its actual origin zone.
+  return { from: new Date(start - 14 * 3600000).toISOString(), to: new Date(end + 14 * 3600000).toISOString() }
+}
+export async function listTripCalendar(range: { from: string; to: string }, signal?: AbortSignal) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<TripCalendarResult>, ApiEnvelope<TripCalendarResult>>(
+    '/platform/v1/last-leg/fleet/trips/calendar', { params: tripQueryWindow(range), signal },
+  ))
+}
+const formatters = new Map<string, Intl.DateTimeFormat>()
+function localStamp(value: string | null, zone: string | null) {
+  if (!value || !/(Z|[+-]\d{2}:\d{2})$/.test(value) || !zone?.includes('/') || /^(Etc|SystemV)\//.test(zone)) return null
+  const instant = new Date(value)
+  if (!Number.isFinite(instant.getTime())) return null
+  try {
+    let formatter = formatters.get(zone)
+    if (!formatter) {
+      formatter = new Intl.DateTimeFormat('en-CA', { timeZone: zone, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', hourCycle: 'h23' })
+      formatters.set(zone, formatter)
+    }
+    const parts = Object.fromEntries(formatter.formatToParts(instant).map(part => [part.type, part.value]))
+    return { date: `${parts.year}-${parts.month}-${parts.day}`, time: `${parts.hour}:${parts.minute}` }
+  } catch { return null }
+}
+export function projectTripCalendar(result: TripCalendarResult, range: { from: string; to: string }) {
+  const events: CalendarEvent[] = [], unresolved = [...result.unresolvedRecords]
+  const labels: Record<string, string> = { PLANNED: '计划中', IN_TRANSIT: '运输中', COMPLETED: '货物已结案', CANCELLED: '已取消' }
+  for (const row of result.records) {
+    const planned = localStamp(row.plannedDepartureAt, row.originTimezone)
+    if (row.originCountryCode !== 'US' || !planned) {
+      unresolved.push({ ...row, incompleteReasons: [...row.incompleteReasons, 'LOCAL_DATE_UNRESOLVED'] }); continue
+    }
+    if (planned.date < range.from || planned.date >= range.to) continue
+    const actual = localStamp(row.departedAt, row.originTimezone)
+    const driverEnd = localStamp(row.expectedDriverEndAt, row.originTimezone)
+    events.push({ key: `trip-${row.tripNo}`, type: 'trip', date: planned.date, time: planned.time,
+      title: `${row.tripNo} 用车计划`, subtitle: '运输计划，不代表收货方预约已确认',
+      sourcePath: `/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`,
+      fields: [
+        { label: '车次状态', value: labels[row.status] || '待核实' },
+        { label: '起运仓', value: row.originWarehouseName || row.originWarehouseCode },
+        { label: '地点时区', value: row.originTimezone },
+        { label: '计划出发（UTC）', value: row.plannedDepartureAt },
+        { label: '路线', value: row.stops.slice(0, 3).map(stop => stop.name).join(' → ') + (row.stops.length > 3 ? ` 等${row.stops.length}站` : '') },
+        { label: '实际出发', value: actual ? `${actual.date} ${actual.time}` : row.departedAt ? '时刻待核实' : '尚未记录' },
+        { label: '预计司机结束', value: driverEnd ? `${driverEnd.date} ${driverEnd.time}` : '待核实' },
+        { label: '资料提示', value: tripIssues(row) },
+      ].filter(field => field.value),
+    })
+  }
+  return { events, unresolved }
+}

From e3038edd38279b3bc67d702b297021347ba60bd1 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 12:12:10 +0800
Subject: [PATCH 22/47] fix(appointments): let linked external cargo join
 shared arrangements

---
 .../AppointmentCalendarView.test.ts           |  7 +++-
 .../AppointmentCalendarView.vue               | 17 ++++++--
 .../AppointmentCargoPanel.vue                 | 39 +++++++++++++++--
 .../AppointmentFollowupDialog.vue             |  7 ++--
 .../AppointmentTableRendering.test.ts         | 42 ++++++++++++++++++-
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  1 +
 6 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 8fa2c24f..283b1b26 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -40,7 +40,7 @@ function render() {
     ElSelect: { name: 'ElSelect', emits: ['update:modelValue', 'change'], props: ['modelValue', 'remoteMethod'], template: '<select :value="modelValue" @change="$emit(\'update:modelValue\', $event.target.value); $emit(\'change\', $event.target.value)"><option value="">请选择</option><slot /></select>' },
     ElOption: { props: ['value', 'label'], template: '<option :value="value">{{ label }}</option>' },
     DataTable: { name: 'DataTable', props: ['data'], template: '<div><slot name="toolbar-actions" /><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
-    LoadErrorState: true, ApiErrorMeta: true, AppointmentFollowupDialog: true,
+    LoadErrorState: true, ApiErrorMeta: true, AppointmentFollowupDialog: true, AppointmentCargoPanel: { name: 'AppointmentCargoPanel', props: ['externalSource'], template: '<div>合批工作区</div>' },
   } } })
 }
 
@@ -228,6 +228,11 @@ describe('appointment calendar data integration', () => {
     expect(dialog.props('source').orderId).toBeNull()
     expect(dialog.props('coverage').status).toBe('SOURCE_NOT_MATERIALIZED')
     expect(createFbaAppointment).not.toHaveBeenCalled(); expect(saveFollowup).not.toHaveBeenCalled()
+    expect(dialog.props('canArrange')).toBe(true)
+    dialog.vm.$emit('arrange');await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentFollowupDialog'}).exists()).toBe(false)
+    expect(wrapper.findComponent({name:'AppointmentCargoPanel'}).props('externalSource')).toMatchObject({sourceKey:'BOOKING:B-1',bookingNo:'B-1',orderId:null})
+
   })
 
   it('does not trust stale destination query data or open followup after a source error', async () => {
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index bd30779f..d8440ac3 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -2,7 +2,7 @@
 import '@/styles/adminDensity.css'
 import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource } from './planningApi'
+import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource, type PlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
@@ -31,10 +31,13 @@ const access = useAccessPreviewStore()
 const route = useRoute()
 const router = useRouter()
 const linkedSource = ref<ResolvedPlanningSource | null>(null)
+const selectedSource = ref<PlanningSource | null>(null)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkLoading = ref(false)
 let linkRequest = 0
 const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
+const cargoVisited = ref(false)
+watch(workView, value => { if (value === 'cargo') cargoVisited.value = true })
 const appointments = ref<FbaAppointmentDto[]>([])
 const arrivals = ref<ArrivalCalendarEntry[]>([])
 const pickups = ref<PickupCalendarEntry[]>([])
@@ -351,6 +354,12 @@ async function resolveLink() {
   } catch (cause) { if (request === linkRequest) linkError.value = getApiErrorDetails(cause, '预约货源核对失败') }
   finally { if (request === linkRequest) linkLoading.value = false }
 }
+function arrangeLinkedSource() {
+  if (!linkedSource.value || !access.can(permission.inboundOrderAppointment) || !linkedSource.value.source.canFollowup || linkedSource.value.coverage.appointments.length) return
+  selectedSource.value = linkedSource.value.source
+  linkedSource.value = null
+  workView.value = 'cargo'
+}
 watch(() => [route.query.sourceKey, route.query.customerId, route.query.destinationKey], resolveLink, { immediate: true })
 
 onMounted(() => { void load(); void loadUnscheduled() })
@@ -361,13 +370,13 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
   <AdminPage class="admin-density">
     <p v-if="linkLoading">正在核对预约货源…</p>
     <LoadErrorState v-if="linkError" title="预约货源核对失败" :message="linkError.message" :loading="linkLoading" @retry="resolveLink" />
-    <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" @close="linkedSource = null" />
+    <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(permission.inboundOrderAppointment)" @arrange="arrangeLinkedSource" @close="linkedSource = null" />
     <div class="density-status-tabs" role="group" aria-label="预约工作视图">
       <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">整柜提柜与接仓</button>
-      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">已开船 FBA 货物</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">货物与预约合批</button>
     </div>
-    <AppointmentCargoPanel v-if="workView === 'cargo'" @created="load(); loadUnscheduled()" />
+    <div v-if="cargoVisited" v-show="workView === 'cargo'"><AppointmentCargoPanel :external-source="selectedSource" @source-accepted="selectedSource = null" @created="load(); loadUnscheduled()" /></div>
     <AppointmentContainerPanel v-if="workView === 'containers'" />
     <div v-show="workView === 'calendar'">
     <LoadErrorState v-if="loadError" :title="errorTitle" :message="loadError.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index 9422a72e..19848d92 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -10,23 +10,43 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import RowActions from '@/shared/components/RowActions.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { listPlanningCargo, resolvePlanningSource, previewPlanningBatch, createSourceAppointment, type SourceAppointmentPayload, type PlanningBatchPreview, type ResolvedPlanningSource, type PlanningCargo } from './planningApi'
+import { listPlanningCargo, resolvePlanningSource, previewPlanningBatch, createSourceAppointment, type SourceAppointmentPayload, type PlanningBatchPreview, type ResolvedPlanningSource, type PlanningCargo, type PlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 
 const router = useRouter()
 const access = useAccessPreviewStore()
-const emit = defineEmits<{ created: [] }>()
+const props = defineProps<{ externalSource?: PlanningSource | null }>()
+const emit = defineEmits<{ created: []; sourceAccepted: [] }>()
 const arrangement = reactive(createAppointmentForm())
 const creating = ref(false), createError = ref<ApiErrorDetails | null>(null)
 const pendingCreate = ref<SourceAppointmentPayload | null>(null)
 const following = ref<ResolvedPlanningSource | null>(null)
 const followupError = ref<ApiErrorDetails | null>(null)
-const selected = ref<Record<string, PlanningCargo>>({})
+type Selection = Pick<PlanningSource, 'sourceKey' | 'customerId' | 'originWarehouseId' | 'destinationWarehouseCode' | 'inboundCode'> & { bookingNo?: string | null }
+const selected = ref<Record<string, Selection>>({})
 const selectedRows = computed(() => Object.values(selected.value))
+const externalRows = computed(() => selectedRows.value.filter(row => row.sourceKey.startsWith('BOOKING:')))
 const batchPreview = ref<PlanningBatchPreview | null>(null)
 const batchLoading = ref(false), batchError = ref<ApiErrorDetails | null>(null)
 let batchRequest = 0
+function addSource(source: PlanningSource) {
+  if (!access.can(overseasWarehousePermissions.inboundOrderAppointment) || batchLoading.value || creating.value) return false
+  if (!source.canFollowup) { ElMessage.warning('当前来源尚不能安排预约'); return false }
+  const anchor = selectedRows.value[0]
+  if (anchor && (anchor.originWarehouseId !== source.originWarehouseId || anchor.destinationWarehouseCode !== source.destinationWarehouseCode)) {
+    ElMessage.warning('请先完成或清空当前合批选择；不同起运仓或目的仓不能混入'); return false
+  }
+  if (!selected.value[source.sourceKey] && selectedRows.value.length >= 100) { ElMessage.warning('每批最多选择100票'); return false }
+  selected.value[source.sourceKey] = source; batchError.value = null
+  return true
+}
+function acceptExternalSource() {
+  if (props.externalSource && addSource(props.externalSource)) emit('sourceAccepted')
+}
+function arrangeFollowing() {
+  if (following.value && !following.value.coverage.appointments.length && addSource(following.value.source)) following.value = null
+}
 function selectable(row: PlanningCargo) {
   const anchor = selectedRows.value[0]
   return !row.detained && !row.mixedDestinations && !row.hasActiveAppointment && (!anchor || (anchor.originWarehouseId === row.originWarehouseId && anchor.destinationWarehouseCode === row.destinationWarehouseCode))
@@ -124,6 +144,14 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
     </template>
     <template #filters><QueryToolbar v-model="query" ariaLabel="在途货物查询" :fields="fields" :loading="loading" @search="load(true)" /></template>
     <template #notices>
+      <div v-if="externalSource" class="cargo-note">
+        待加入来源：{{ externalSource.bookingNo || externalSource.inboundCode || '尚未关联业务编号' }} · {{ externalSource.originWarehouseName }} → {{ externalSource.destinationWarehouseCode }}
+        <el-button v-if="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :disabled="batchLoading || creating" @click="acceptExternalSource">加入本次选择</el-button>
+      </div>
+      <details v-if="externalRows.length" class="external-selection">
+        <summary>已选外接货 {{ externalRows.length }} 票（可与同仓头程货合批）</summary>
+        <div class="external-selection-list"><div v-for="row in externalRows" :key="row.sourceKey">{{ row.bookingNo || row.inboundCode || '尚未关联业务编号' }}<el-button :disabled="batchLoading || creating" @click="delete selected[row.sourceKey]">移除选择</el-button></div></div>
+      </details>
       <LoadErrorState v-if="batchError" title="所选货物暂不能合批" :message="batchError.message" :show-retry="false"><template #details><ApiErrorMeta :details="batchError" /></template></LoadErrorState>
       <LoadErrorState v-if="followupError" title="来源核对失败" :message="followupError.message" :show-retry="false" />
       <LoadErrorState v-if="error" title="已开船货物加载失败" :message="error.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
@@ -138,7 +166,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
       <span v-else>{{ row.hasInboundPlan ? '已建入仓计划，待安排' : '尚未建入仓计划' }}</span>
     </template>
   </DataTable>
-  <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" @close="following = null" />
+  <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(overseasWarehousePermissions.inboundOrderAppointment)" @arrange="arrangeFollowing" @close="following = null" />
   <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="pendingCreate ? '重试本次保存' : '保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="batchPreview = null">
     <p>{{ batchPreview.originWarehouseName }} → {{ batchPreview.destinationWarehouseCode }}</p>
     <p>{{ batchPreview.group.sourceCount }} 票 / {{ batchPreview.group.customerCount }} 个客户 / 预报 {{ batchPreview.group.packages ?? '待核实' }} 箱</p>
@@ -151,4 +179,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
 
 <style scoped>
 .cargo-note { margin: var(--admin-space-3) 0; color: var(--el-text-color-secondary); font-size: var(--admin-font-caption); }
+.external-selection { margin: var(--admin-space-3) 0; }
+.external-selection-list { max-height: 216px; overflow-y: auto; }
+.external-selection-list > div { display: flex; align-items: center; justify-content: space-between; gap: 12px; overflow-wrap: anywhere; }
 </style>
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
index b615d0bd..5e764230 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
@@ -8,14 +8,14 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getFollowups, saveFollowup, getContainerFollowups, saveContainerFollowup, type ContainerFollowupContext, type PlanningSource, type AppointmentCoverage, type FollowupRecord, type FollowupStage, type SaveFollowup } from './planningApi'
 
-const props = defineProps<({ source: PlanningSource; coverage: AppointmentCoverage; container?: never } | { container: ContainerFollowupContext; source?: never; coverage?: never }) & { canWrite: boolean }>()
-const emit = defineEmits<{ close: [] }>()
+const props = defineProps<({ source: PlanningSource; coverage: AppointmentCoverage; container?: never } | { container: ContainerFollowupContext; source?: never; coverage?: never }) & { canWrite: boolean; canArrange?: boolean }>()
+const emit = defineEmits<{ close: []; arrange: [] }>()
 const stages: Record<FollowupStage, string> = { DRAYAGE_CONTACT: '拖车联系', TERMINAL_APPOINTMENT: '码头约号', WAREHOUSE_RECEIVING: '接仓跟进', FBA_RECEIVING: 'FBA收货跟进' }
 const coverageNeeds: Record<string, string> = {
   DESTINATION: '目的仓与原安排不一致，请核对。',
   DESTINATION_UNVERIFIED: '来源目的地资料待核实，尚不能判断是否发生变更。',
   CARRIER_CONFIRMATION: '尚未确认承运，请先在原登记完成确认。',
-  REAL_CARGO_MATERIALS: '尚未关联实际货物资料，可先记录联系结果。',
+  REAL_CARGO_MATERIALS: '尚未关联实际货物资料，可先保存待确认安排；正式确认前需补齐资料。',
   CARGO_QUANTITY_REVIEW: '货量或重复关联需要核对。',
   RECEIVING_APPOINTMENT: '尚未安排收货预约。',
   UNCOVERED_CARGO: '部分货物尚未纳入收货预约。',
@@ -80,6 +80,7 @@ onBeforeUnmount(() => { ++generation })
 <template>
   <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${title}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !canFollowup || !ready || loading" @confirm="save" @update:model-value="emit('close')">
     <p v-if="source">{{ source.containerNo || '—' }} · {{ source.originWarehouseName }} → {{ source.destinationWarehouseCode }}</p>
+    <el-button v-if="source && canArrange && source.canFollowup && !coverage?.appointments.length" :disabled="saving" @click="emit('arrange')">加入预约合批</el-button>
     <p v-else>同柜多客户共用{{ container?.warehouseId ? '此接仓点' : '提柜' }}跟进记录；保存联系不自动确认预约或推进收货。</p>
     <LoadErrorState v-if="error" title="跟进记录加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="saveError" title="跟进保存未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index ffb566a0..55d4d1bd 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -4,9 +4,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, type PlanningCargo, type PlanningSource } from './planningApi'
+import { getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningSource } from './planningApi'
 
-vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn() }))
+vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn(), createSourceAppointment: vi.fn() }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
@@ -15,6 +15,35 @@ const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], ch
 
 describe('appointment tables use actual shared table slots', () => {
   beforeEach(() => vi.resetAllMocks())
+  it('combines an original external booking with first-leg cargo and retries the identical save command', async () => {
+    const external: PlanningSource={...source,sourceKey:'BOOKING:B-1',customerId:'B',bookingNo:'B-1',orderId:null,inboundCode:null,packages:null}
+    vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
+    vi.mocked(previewPlanningBatch).mockResolvedValue({group:{originWarehouseId:'100',destinationKey:'FBA:ONT8',packages:null,sourceCount:2,customerCount:2,readyFrom:null,readyTo:null,readinessIncomplete:true,unknownQuantitySources:1},originWarehouseName:'美国仓',destinationWarehouseCode:'ONT8',sources:[external,source],missingFields:['CARGO_QUANTITY_REVIEW']})
+    vi.mocked(createSourceAppointment).mockRejectedValueOnce(new Error('network interrupted')).mockResolvedValueOnce({id:'1',version:0,appointmentNo:'AP-MIXED',appointmentStatus:'PENDING',originWarehouseId:'100',fbaWarehouseCode:'ONT8',selectedCount:2,items:[]})
+    const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:external},global:{plugins:[ElementPlus],stubs:{AppDialog:{template:'<section><slot /><button data-save @click="$emit(\'confirm\')">Save</button></section>'}}}})
+    await flushPromises()
+    await wrapper.findAll('button').find(b=>b.text()==='加入本次选择')!.trigger('click')
+    await wrapper.findAll('button').find(b=>b.text()==='选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(b=>b.text().startsWith('合批核对'))!.trigger('click');await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{sourceKey:'BOOKING:B-1',customerId:'B',destinationKey:'FBA:ONT8'},{sourceKey:'ORDER:1',customerId:'A',destinationKey:'FBA:ONT8'}])
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    const first=vi.mocked(createSourceAppointment).mock.calls[0]![0]
+    expect(first).toMatchObject({originWarehouseId:'100',fbaWarehouseCode:'ONT8',details:{appointmentStatus:'PENDING',confirmationNo:null,appointmentAt:null}})
+    expect(first.sources[0]!.sourceKey).toBe('BOOKING:B-1')
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    expect(createSourceAppointment).toHaveBeenNthCalledWith(2,first);expect(wrapper.emitted('created')).toHaveLength(1)
+    expect(resolvePlanningSource).not.toHaveBeenCalled();wrapper.unmount()
+  })
+  it('retains the current selection when a linked source has a different origin', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
+    vi.mocked(previewPlanningBatch).mockRejectedValue(new Error('stop after observing request'))
+    const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:{...source,sourceKey:'BOOKING:B-2',bookingNo:'B-2',originWarehouseId:'200'}},global:{plugins:[ElementPlus]}})
+    await flushPromises();await wrapper.findAll('button').find(b=>b.text()==='选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(b=>b.text()==='加入本次选择')!.trigger('click')
+    expect(wrapper.emitted('sourceAccepted')).toBeUndefined()
+    await wrapper.findAll('button').find(b=>b.text().startsWith('合批核对'))!.trigger('click');await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{sourceKey:'ORDER:1',customerId:'A',destinationKey:'FBA:ONT8'}]);wrapper.unmount()
+  })
   it('selects multiple customers and makes one authoritative batch check without per-row resolution', async () => {
     vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo, { ...cargo, sourceKey: 'ORDER:2', orderId: '2', inboundCode: 'IN-B', customerId: 'B', customerName: '客户乙' }], page: 1, size: 20, total: 2, pages: 1 })
     vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: 40, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 0 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', sources: [source], missingFields: ['READY_WINDOW_UNVERIFIED'] })
@@ -63,6 +92,15 @@ describe('appointment tables use actual shared table slots', () => {
     expect(wrapper.findComponent(AppointmentFollowupDialog).exists()).toBe(true)
     wrapper.unmount()
   })
+  it('keeps arrangement permission independent from contact-record writes and avoids duplicate active appointments', async () => {
+    vi.mocked(getFollowups).mockResolvedValue({history:{records:[],total:0,page:1,size:10,pages:0},versions:{DRAYAGE_CONTACT:0,TERMINAL_APPOINTMENT:0,WAREHOUSE_RECEIVING:0,FBA_RECEIVING:0}})
+    const wrapper=mount(AppointmentFollowupDialog,{props:{source,coverage,canWrite:false,canArrange:true},global:{plugins:[ElementPlus],stubs:{AppDialog:{template:'<section><slot /></section>'}}}})
+    await flushPromises();await wrapper.findAll('button').find(b=>b.text()==='加入预约合批')!.trigger('click')
+    expect(wrapper.emitted('arrange')).toHaveLength(1)
+    await wrapper.setProps({canArrange:false});expect(wrapper.findAll('button').some(b=>b.text()==='加入预约合批')).toBe(false)
+    await wrapper.setProps({canArrange:true,coverage:{...coverage,appointments:[{appointmentNo:'AP-EXISTING',confirmationNo:null,status:'PENDING',confirmedAt:null,confirmedEndAt:null,timezone:null}]}})
+    expect(wrapper.findAll('button').some(b=>b.text()==='加入预约合批')).toBe(false);wrapper.unmount()
+  })
   it('renders followup stage names instead of blank table cells', async () => {
     vi.mocked(getFollowups).mockResolvedValue({ history: { records: [{ stage: 'FBA_RECEIVING', version: 1, contactedParty: null, result: '等待回复', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' }], total: 1, page: 1, size: 10, pages: 1 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 1 } })
     const wrapper = mount(AppointmentFollowupDialog, { props: { source, coverage, canWrite: false }, global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index 383e7487..8ce6001f 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -17,6 +17,7 @@
 | 在途货物及外接来源跟进 | 美国预约统一方案的提前联系需求 | 日历与已开船FBA列表切换；跟进在居中1080px弹框中承载，3列表单、联系结果及下一步整行，历史分页；BOOKING深链先由服务端核对，再展示原登记及真实预约缺项 |
 | 整柜提柜与接仓 | 美国预约统一方案的整柜共享事项 | 独立工作视图按柜汇总，操作列左置；接仓点在行内分组，点击后共用1080px跟进弹框。整柜只选拖车/码头事项，接仓只记录对应仓库，单票只记录FBA联系；数量未知或范围不完整明确显示，不按客户复制整柜联系。首次只请求一页整柜数据，详情按点击读取；待1920×1080页面验收 |
 | 在途跨客户合批安排 | 美国预约统一方案的同起运仓、同目的仓合批 | 操作列后选择同起运仓及同目的仓，跨页累计最多100票；批量核对后在1080px弹框填写与入仓入口共用的安排表单。未知箱数保留待核实；暂扣、多目的地和已有预约不可选入。保存必须重新核对，未知结果保留同一命令供重试 |
+| 外接货进入合批 | 同仓跨客户共用预约，不因未入仓而只允许跟进 | 后端核实BOOKING深链后，“加入预约合批”进入现有合批工作区，再显式加入选择；可与同起运仓/目的仓头程货混选，保留原BOOKING键与未知箱数。跨仓不清空已有选择，已有关联预约不再开放新增入口；切换日历/合批工作视图保留本页选择，外接选择默认折叠、展开216px内滚动 |
 | 未定时安排 | 总览不得伪造时段 | 日历上方独立折叠分页列表；日期未定不补零点或09点，继续编辑仍操作原系统单号；仅有计划日期时日历显示日期，不生成确认时段 |
 | 提柜日历 | 美国业务预约统一总览 | 读取原码头提柜预约，一柜一条，点击查看来源进入清关提柜详情；按美国目的仓确认业务范围，不等于确认港口国家。保留原业务日期，明确港口时区待核实，不套用目的仓时区；未知目的仓及截断显示统计不完整。无提柜权限不请求该来源并提示范围缺失 |
 | 用车计划日历 | 统一总览的真实车次只读来源 | 一车一条，计划与实际出发分开，司机预计结束不当送货完成。查询一次带跨时区余量的UTC窗口，按起运仓地点时区筛回42个当地日；缺国家/时区的记录独立分页待核实，不放入每日格。路线最多3站摘要，完整路线进入原车次；不请求逐车详情，不在预约页创建车次或重算余位 |

From 0ca12de2f4d8156022d28b3274ddb9e0279e472c Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 12:40:52 +0800
Subject: [PATCH 23/47] fix: show overnight appointments on each covered
 calendar day

---
 .../AppointmentCalendarPanel.test.ts                | 13 +++++++++++++
 .../AppointmentCalendarPanel.vue                    | 12 ++++++++----
 .../AppointmentCalendarView.vue                     |  4 +++-
 src/modules/appointment-calendar/calendar.ts        |  8 ++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
index 41d43a17..aeec06bc 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
@@ -17,6 +17,19 @@ describe('appointment calendar interactions', () => {
     expect(wrapper.get('[aria-label="当天安排"]').text()).toContain('当天暂无到港或送仓预约')
   })
 
+  it('shows an overnight slot on both days without fetching again and excludes midnight ends', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: [
+      { key: 'overnight', type: 'delivery', date: '2026-09-23', endAt: '2026-09-24T01:00:00', time: '23:00–01:00', title: '跨日送仓', fields: [] },
+      { key: 'midnight', type: 'delivery', date: '2026-09-23', endAt: '2026-09-24T00:00:00', time: '23:00–00:00', title: '午夜结束', fields: [] },
+    ] })
+    expect(wrapper.find('[aria-label="2026-09-23，2 项安排"]').exists()).toBe(true)
+    expect(wrapper.find('[aria-label="2026-09-24，1 项安排"]').exists()).toBe(true)
+    expect(wrapper.get('[aria-label="当天安排"]').text()).toContain('跨日送仓')
+    expect(wrapper.get('[aria-label="当天安排"]').text()).not.toContain('午夜结束')
+    expect(wrapper.emitted('range')).toBeUndefined()
+  })
+
   it('requests exactly one range for a view switch and navigates seven days', async () => {
     const wrapper = render()
     await wrapper.get('[aria-label="预约视图"]').findAll('button')[1]!.trigger('click')
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index fbba8105..4b44c3a9 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -2,11 +2,12 @@
 import '@/styles/adminDensity.css'
 import { computed, ref } from 'vue'
 import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
-import { addDays, calendarDates, calendarRange, dateKey, moveCalendar, type CalendarMode } from './calendar'
+import { addDays, calendarDates, calendarRange, dateKey, moveCalendar, occursOnDate, type CalendarMode } from './calendar'
 
 export interface CalendarEvent {
   key: string
   date: string
+  endAt?: string
   time: string
   type: 'arrival' | 'delivery' | 'pickup' | 'trip'
   title: string
@@ -38,9 +39,12 @@ const dates = computed(() => calendarDates(selectedDate.value, mode.value))
 const grouped = computed(() => {
   const result = new Map<string, CalendarEvent[]>()
   for (const event of props.events) {
-    const group = result.get(event.date) || []
-    group.push(event)
-    result.set(event.date, group)
+    for (const date of dates.value) {
+      if (!occursOnDate(event.date, event.endAt, date)) continue
+      const group = result.get(date) || []
+      group.push(event)
+      result.set(date, group)
+    }
   }
   for (const group of result.values()) group.sort((a, b) => a.time.localeCompare(b.time) || a.key.localeCompare(b.key))
   return result
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index d8440ac3..a2f948dd 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -132,12 +132,14 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
   ],
 })), ...appointments.value.map(appointment => ({
   key: appointment.appointmentNo, type: 'delivery' as const, date: (appointment.appointmentAt || appointment.plannedAt || appointment.plannedDate || '').slice(0, 10),
-  time: (appointment.appointmentAt || appointment.plannedAt || '').slice(11, 16) + (appointment.appointmentEndAt ? `–${appointment.appointmentEndAt.slice(11, 16)}` : ''), title: `${appointment.fbaWarehouseCode} ${appointment.appointmentStatus === 'SUCCESS' ? '已确认送仓' : '计划送仓'}`,
+  endAt: (appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt) || undefined,
+  time: (appointment.appointmentAt || appointment.plannedAt || '').slice(11, 16) + ((appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt) ? `–${(appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt)!.slice(11, 16)}` : ''), title: `${appointment.fbaWarehouseCode} ${appointment.appointmentStatus === 'SUCCESS' ? '已确认送仓' : '计划送仓'}`,
   fields: [
     { label: '预约仓库', value: appointment.fbaWarehouseCode },
     { label: '系统单号', value: appointment.appointmentNo },
     { label: '外部约号', value: appointment.confirmationNo },
     { label: '地点时区', value: appointment.timezone || '待核实' },
+    { label: '完整时段', value: `${appointment.appointmentAt || appointment.plannedAt || appointment.plannedDate || '待定'}${(appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt) ? ` — ${appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt}` : ''}` },
     { label: '预约状态', value: statusLabels[appointment.appointmentStatus] || '—' },
     { label: '货物信息', value: `${appointment.selectedCount} 票 / ${new Set(appointment.items.map(item => item.customerId)).size} 个客户` },
     { label: '预约备注', value: appointment.appointmentRemark },
diff --git a/src/modules/appointment-calendar/calendar.ts b/src/modules/appointment-calendar/calendar.ts
index c457c48e..0c4257fc 100644
--- a/src/modules/appointment-calendar/calendar.ts
+++ b/src/modules/appointment-calendar/calendar.ts
@@ -1,5 +1,13 @@
 export type CalendarMode = 'month' | 'week'
 
+/** End times are exclusive; a slot ending at midnight does not occupy the next day. */
+export function occursOnDate(startDate: string, endAt: string | undefined, date: string): boolean {
+  if (date === startDate) return true
+  if (date < startDate || !endAt) return false
+  const endDate = endAt.slice(0, 10)
+  return date < endDate || (date === endDate && /[1-9]/.test(endAt.slice(11)))
+}
+
 /** Calendar dates are warehouse-local dates, never UTC conversions. */
 export function dateKey(date: Date): string {
   return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`

From 2bf561bafe0b396cc615da95864aa1709e22ad06 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 14:01:11 +0800
Subject: [PATCH 24/47] fix(procurement): preserve correction drafts separately
 from pending commands

---
 .../components/ProcurementNodeActions.test.ts | 45 ++++++++++++
 .../components/ProcurementNodeActions.vue     | 72 ++++++++++++++-----
 .../procurementCorrectionDraft.ts             | 16 +++++
 3 files changed, 117 insertions(+), 16 deletions(-)
 create mode 100644 src/modules/overseas-business/procurementCorrectionDraft.ts

diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
index e522f75d..85766766 100644
--- a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
@@ -41,6 +41,51 @@ beforeEach(() => {
   vi.mocked(uploadProcurementFile).mockReset().mockResolvedValue({ id: '11', fileId: '101', category: 'PURCHASE', fileName: 'purchase.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' })
 })
 describe('procurement purchase node operations', () => {
+  it('saves and restores a separate correction while the immutable original request is pending, scoped to operator/customer/order', async () => {
+    const value = fixture('FINANCE_ADJUST', false)
+    value.fees = [{ id: '11', feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', confirmationOrigin: 'BUSINESS', feeItemCode: 'SAMPLE_PAYMENT', feeItemName: '样品货款', feeVersion: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeId: null, sourceFeeId: null, voucherFileId: '501', voucherFileName: 'invoice.pdf', walletStatus: 'PENDING', walletLedgerId: null, walletErrorCode: null, walletErrorMessage: null, remark: null }]
+    const original = JSON.stringify({ command: 'fees/correct-target', payload: { version: 3, idempotencyKey: 'original-request', feeId: '11', targetOriginalAmount: '11.00', reason: '原请求', voucherFileId: '501' } })
+    sessionStorage.setItem(storageKey, original)
+    let wrapper = render(value)
+    const click = async (label: string) => { await wrapper.findAll('button').find(button => button.text() === label)!.trigger('click'); await flushPromises() }
+    await click('准备费用更正草稿')
+    const dialog = wrapper.findComponent(AppDialog)
+    dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '原费用')!.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '11')
+    await dialog.find('input[placeholder="填写原费用链正确总额，最多两位小数"]').setValue('12.00')
+    await explain(wrapper, '准备下一版本')
+    await click('保存本地草稿')
+    expect(submitProcurementCommand).not.toHaveBeenCalled()
+    expect(sessionStorage.getItem(storageKey)).toBe(original)
+    expect(JSON.parse(sessionStorage.getItem(`${storageKey}:correction-draft`)!)).toMatchObject({ targetOriginalAmount: '12.00', feeId: '11', reason: '准备下一版本' })
+    expect(wrapper.findAll('button').find(button => button.text() === '核对并继续确认')!.attributes('disabled')).toBeDefined()
+    wrapper.unmount(); wrapper = render(value)
+    await click('恢复费用更正草稿')
+    expect((wrapper.findComponent(AppDialog).find('input[placeholder="填写原费用链正确总额，最多两位小数"]').element as HTMLInputElement).value).toBe('12.00')
+    await click('确认上次提交结果')
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'fees/correct-target', JSON.parse(original).payload)
+    expect(sessionStorage.getItem(`${storageKey}:correction-draft`)).not.toBeNull()
+    const latest = structuredClone(value)
+    latest.actions[0].allowed = true; latest.customerView.order.version = 9
+    latest.files = [{ id: '51', fileId: '501', category: 'VOUCHER', fileName: 'invoice.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' }]
+    await wrapper.setProps({ detail: latest })
+    await click('恢复费用更正草稿'); await click('核对并继续确认')
+    wrapper.findComponent(AppDialog).findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '本单凭证')!.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '501')
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
+    expect(wrapper.findComponent(AppDialog).text()).toContain('原实际费用及来源关联尚未完成')
+    latest.fees[0].walletStatus = 'SETTLED'; latest.fees[0].walletLedgerId = 'LEDGER-1'
+    latest.customerView.fees = [{ feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', name: '样品货款', version: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeNo: null, walletStatus: 'SETTLED', sourceLinked: true }]
+    await wrapper.setProps({ detail: structuredClone(latest) })
+    await confirm(wrapper)
+    expect(submitProcurementCommand).toHaveBeenLastCalledWith('OP-100', '10001', 'fees/correct-target', expect.objectContaining({ version: 9, targetOriginalAmount: '12.00', feeId: '11' }))
+    expect(sessionStorage.getItem(`${storageKey}:correction-draft`)).toBeNull()
+    // Restore a saved draft before changing the scope to ensure isolation is meaningful.
+    sessionStorage.setItem(`${storageKey}:correction-draft`, JSON.stringify({ feeId: '11', targetOriginalAmount: '13.00', reason: '下一目标', voucherFileId: '501', orderVersion: 9 }))
+    await wrapper.setProps({ customerId: 'OTHER' }); expect(wrapper.text()).not.toContain('恢复费用更正草稿')
+    await wrapper.setProps({ customerId: '10001', detail: { ...value, customerView: { ...value.customerView, order: { ...value.customerView.order, orderNo: 'OTHER' } } } }); expect(wrapper.text()).not.toContain('恢复费用更正草稿')
+    useAuthStore().user = { id: '8', name: '另一操作员', account: 'other', roles: [] }
+    await wrapper.setProps({ detail: value }); expect(wrapper.text()).not.toContain('恢复费用更正草稿')
+  })
   it('requires explicit remaining-goods outcomes and keeps private closure reasons separate', async () => {
     const value = fixture('EXCEPTION_CLOSE'); value.purchaseFacts.purchased_at = '2020-01-01T10:00:00'
     value.controls.remaining = [{ kind: 'PURCHASE_REMAINDER', sourceId: null, businessNo: 'OP-100', quantity: 2 }]
diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.vue b/src/modules/overseas-business/components/ProcurementNodeActions.vue
index c695c291..e54ce007 100644
--- a/src/modules/overseas-business/components/ProcurementNodeActions.vue
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.vue
@@ -11,6 +11,7 @@ import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRe
 import { listOverseasPurchaseWarehouseOptions } from '../api/platformOverseasBusiness'
 import { submitProcurementCommand, uploadProcurementFile, type ProcurementCommand, type ProcurementCommandBody } from '../api/procurementCommands'
 import { commandKey, definitelyRejected, readPendingProcurement, type PendingProcurement } from '../procurementPending'
+import { readCorrectionDraft, type ProcurementCorrectionDraft } from '../procurementCorrectionDraft'
 import type { PlatformProcurement, ProcurementAction, ProcurementFile } from '../procurementTypes'
 import type { OverseasPurchaseWarehouseOption } from '../types'
 import ProcurementControlFields from './ProcurementControlFields.vue'
@@ -29,6 +30,7 @@ const retryFees = computed(() => props.detail.fees.filter(fee => fee.active && f
 const actions = computed(() => [...props.detail.actions.filter(item => routes[item.key] && access.can(item.permission)), ...(retryFees.value.length ? [{ key: 'RETRY_FEE', label: '重试失败资金请求', permission: feeRetryPermission(retryFees.value[0]), allowed: true, reason: null }] : [])])
 const opened = ref(false); const active = ref<ProcurementAction | null>(null); const saving = ref(false); const uploading = ref(false)
 const error = ref<ApiErrorDetails | null>(null); const storageError = ref(''); const pending = ref<PendingProcurement | null>(null)
+const editingDraft = ref(false); const correctionDraft = ref<ProcurementCorrectionDraft | null>(null); const draftError = ref('')
 const warehouses = ref<OverseasPurchaseWarehouseOption[]>([]); const warehouseLoading = ref(false); const warehouseError = ref('')
 const extraFiles = ref<ProcurementFile[]>([])
 const form = reactive({ decision: 'APPROVE' as 'APPROVE' | 'REJECT', warehouseId: '', reason: '', amount: '', currency: 'CNY' as 'CNY' | 'USD', purchasedAt: '', estimatedArrivalAt: '', voucherFileId: '' })
@@ -39,8 +41,10 @@ const transport = ref(transportForm(props.detail))
 const physical = ref(physicalForm())
 const manageCommand = ref<ProcurementCommand>('dispositions')
 const key = computed(() => auth.user?.id ? `procurement-command:${auth.user.id}:${props.customerId}:${props.detail.customerView.order.orderNo}` : '')
+const draftKey = computed(() => key.value ? `${key.value}:correction-draft` : '')
+const canDraft = computed(() => !!key.value && access.can('platform:overseas-business:purchase:finance-adjust') && props.detail.fees.some(fee => !['INTERNATIONAL_ESTIMATE', 'ADJUSTMENT', 'REFUND'].includes(fee.purpose)))
 const commandPermissions: Record<ProcurementCommand, string> = { review: 'review', purchase: 'buy', 'purchase/confirm': 'buy', 'budget-authorizations': 'review', 'planned-warehouse': 'review', cancel: 'cancel', 'overseas-receipts': 'receive-overseas', 'domestic-receipts': 'receive-domestic', 'overseas-receipts/complete': 'receive-overseas', 'domestic-receipts/complete': 'receive-domestic', packing: 'pack', 'packing/confirm': 'pack', 'packing/withdraw': 'manage', dispositions: 'manage', 'receipts/correct': 'manage', 'dispositions/revoke': 'manage', labels: 'label', 'international-estimate': 'estimate', 'labels/apply': 'apply-label', 'overseas-shipment': 'ship-overseas', 'customer-shipment': 'ship-customer', 'domestic-repack': 'receive-domestic', 'charges/confirm': 'charge', 'fees/retry': 'charge', 'fees/terminate': 'finance-adjust', 'fees/release-estimate': 'finance-adjust', 'fees/correct-target': 'finance-adjust', 'fees/additional': 'finance-adjust', 'fees/replace-failed': 'finance-adjust', 'fees/refund': 'finance-adjust', 'control-notes': 'manage', 'control-notes/resolve': 'manage', 'actual-warehouse/correct': 'manage', 'exception-close': 'manage' }
-const command = computed(() => pending.value?.command ?? (active.value?.key === 'MANAGE' ? manageCommand.value : active.value?.key === 'FINANCE_ADJUST' ? financialCommand.value : active.value ? routes[active.value.key] : undefined))
+const command = computed(() => editingDraft.value ? 'fees/correct-target' : pending.value?.command ?? (active.value?.key === 'MANAGE' ? manageCommand.value : active.value?.key === 'FINANCE_ADJUST' ? financialCommand.value : active.value ? routes[active.value.key] : undefined))
 const isControl = computed(() => !!command.value && controlCommands.has(command.value))
 const isFinance = computed(() => !!command.value && financeCommands.has(command.value))
 const isTransport = computed(() => !!command.value && transportCommands.has(command.value))
@@ -53,10 +57,12 @@ const allFiles = computed(() => [...props.detail.files, ...extraFiles.value].fil
 const files = computed(() => allFiles.value.filter(file => file.category === fileCategory.value))
 const { captureBaseline } = useUnsavedWorkRegistration({ key: 'procurement-purchase-action', label: computed(() => active.value?.label || '采购节点操作'), isOpen: opened, model: reactive({ purchase: form, physical, transport, finance, control }), requiredPermission: computed(() => active.value?.permission ?? null) })
 watch(key, () => {
-  opened.value = false; pending.value = null; storageError.value = ''; extraFiles.value = []; active.value = null
+  opened.value = false; pending.value = null; storageError.value = ''; extraFiles.value = []; active.value = null; editingDraft.value = false; correctionDraft.value = null; draftError.value = ''
   if (!key.value) return
   try { pending.value = readPendingProcurement(sessionStorage.getItem(key.value)) }
   catch { storageError.value = '上次操作记录无法读取，请先联系管理员核对该订单的处理结果。' }
+  try { correctionDraft.value = readCorrectionDraft(sessionStorage.getItem(draftKey.value)) }
+  catch { draftError.value = '本浏览器的费用更正草稿无法读取，请核对后重新填写。' }
 }, { immediate: true })
 async function loadWarehouses() {
   if (warehouseLoading.value) return
@@ -67,7 +73,7 @@ async function loadWarehouses() {
 }
 function open(action: ProcurementAction) {
   if (!action.allowed || pending.value || storageError.value || saving.value) return
-  active.value = action; error.value = null; manageCommand.value = 'dispositions'; physical.value = physicalForm(props.detail)
+  editingDraft.value = false; active.value = action; error.value = null; manageCommand.value = 'dispositions'; physical.value = physicalForm(props.detail)
   control.value = controlForm(props.detail)
   finance.value = financeForm(props.detail); financialCommand.value = 'fees/correct-target'
   transport.value = transportForm(props.detail, ['SHIP_CUSTOMER', 'REPACK'].includes(action.key) ? 'DOMESTIC' : action.key === 'LABELS' ? undefined : 'OVERSEAS')
@@ -76,7 +82,37 @@ function open(action: ProcurementAction) {
   opened.value = true; captureBaseline()
   if (needsWarehouse.value) void loadWarehouses()
 }
-watch(financialCommand, () => { finance.value.feeId = ''; finance.value.targetOriginalAmount = ''; finance.value.refundAmount = ''; form.voucherFileId = ''; error.value = null })
+function openCorrectionDraft() {
+  if (!canDraft.value || saving.value || uploading.value) return
+  editingDraft.value = true
+  active.value = { key: 'CORRECTION_DRAFT', label: '费用更正草稿', permission: 'platform:overseas-business:purchase:finance-adjust', allowed: true, reason: null }
+  finance.value = financeForm(props.detail)
+  const draft = correctionDraft.value
+  finance.value.feeId = draft?.feeId || ''; finance.value.targetOriginalAmount = draft?.targetOriginalAmount || ''
+  form.reason = draft?.reason || ''; form.voucherFileId = draft?.voucherFileId || ''
+  error.value = null; opened.value = true; captureBaseline()
+}
+function saveCorrectionDraft() {
+  if (!editingDraft.value || !canDraft.value || saving.value || uploading.value) return
+  try {
+    const draft = { feeId: finance.value.feeId, targetOriginalAmount: finance.value.targetOriginalAmount, reason: form.reason, voucherFileId: form.voucherFileId, orderVersion: props.detail.customerView.order.version }
+    sessionStorage.setItem(draftKey.value, JSON.stringify(draft)); correctionDraft.value = draft; draftError.value = ''; captureBaseline()
+    ElMessage.success('更正草稿已保存在本浏览器标签页，尚未确认费用或发起资金请求')
+  } catch { draftError.value = '草稿保存失败，请保留当前输入并重试' }
+}
+function useCorrectionDraft() {
+  if (!editingDraft.value || pending.value || storageError.value || !canDraft.value) return
+  const action = actions.value.find(item => item.key === 'FINANCE_ADJUST' && item.allowed)
+  if (!action) { error.value = { message: '当前业务状态不允许财务确认，请刷新订单后核对' }; return }
+  const fee = props.detail.fees.find(row => row.id === finance.value.feeId)
+  active.value = action; financialCommand.value = fee && !fee.active && ['TERMINATED', 'RELEASED'].includes(fee.walletStatus) ? 'fees/replace-failed' : 'fees/correct-target'; editingDraft.value = false
+}
+async function retryPending() {
+  if (editingDraft.value) { saveCorrectionDraft(); if (draftError.value) return }
+  editingDraft.value = false; opened.value = false
+  await submit()
+}
+watch(financialCommand, () => { if (editingDraft.value) return; finance.value.feeId = ''; finance.value.targetOriginalAmount = ''; finance.value.refundAmount = ''; form.voucherFileId = ''; error.value = null }, { flush: 'sync' })
 watch(needsWarehouse, value => { if (value && opened.value) void loadWarehouses() })
 function build(): ProcurementCommandBody {
   const order = props.detail.customerView.order
@@ -103,6 +139,7 @@ function build(): ProcurementCommandBody {
   return base
 }
 async function submit() {
+  if (editingDraft.value) { saveCorrectionDraft(); return }
   if (saving.value || uploading.value || storageError.value || !key.value) return
   const resuming = !!pending.value
   const scope = key.value; const orderNo = props.detail.customerView.order.orderNo; const customer = props.customerId
@@ -118,10 +155,12 @@ async function submit() {
   const requiredPermission = pending.value.command === 'fees/retry' ? (retryFee ? feeRetryPermission(retryFee) : '') : `platform:overseas-business:purchase:${commandPermissions[pending.value.command]}`
   if (!requiredPermission || !access.can(requiredPermission)) { error.value = { message: '当前账号无此节点操作权限' }; return }
   saving.value = true; error.value = null
+  const confirmsCorrection = !resuming && ['fees/correct-target', 'fees/replace-failed'].includes(pending.value.command)
   try {
     await submitProcurementCommand(orderNo, customer, pending.value.command, pending.value.payload)
     sessionStorage.removeItem(scope)
     if (key.value !== scope) return
+    if (confirmsCorrection) { sessionStorage.removeItem(draftKey.value); correctionDraft.value = null }
     pending.value = null; opened.value = false; captureBaseline(); ElMessage.success('操作已保存，请核对最新业务及资金结果'); emit('changed')
   } catch (issue) {
     if (key.value !== scope) return
@@ -131,7 +170,7 @@ async function submit() {
 }
 async function upload(event: Event) {
   const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''
-  if (!file || uploading.value || pending.value) return
+  if (!file || uploading.value || (pending.value && !editingDraft.value)) return
   if (file.size > 10 * 1024 * 1024 || !['application/pdf', 'image/jpeg', 'image/png'].includes(file.type)) { ElMessage.warning('请上传不超过 10MB 的 PDF、JPG 或 PNG'); return }
   const scope = key.value; uploading.value = true
   try {
@@ -145,29 +184,30 @@ async function upload(event: Event) {
 <template>
   <section class="admin-density" aria-label="采购履约节点操作">
     <div class="density-actions purchase-actions"><el-tooltip v-for="action in actions" :key="action.key" :content="action.reason || action.label"><span><el-button class="density-action" :disabled="!action.allowed || !!pending || !!storageError || saving" @click="open(action)">{{ action.label }}</el-button></span></el-tooltip></div>
-    <el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
-    <el-alert v-if="pending" title="上次提交结果尚未确认，重试将使用原始内容与原请求编号。" type="warning" :closable="false"><p>原操作：{{ pending.command === 'review' ? (pending.payload.decision === 'APPROVE' ? '审核通过' : '审核拒绝') : actions.find(action => routes[action.key] === pending?.command)?.label || '采购节点操作' }} · {{ pending.payload.remark || pending.payload.reason }}</p><p v-if="pending.payload.amount !== undefined">原提交金额：{{ pending.payload.amount }} {{ pending.payload.currency || (['international-estimate', 'fees/refund'].includes(pending.command) ? 'CNY' : '') }}</p><el-button :loading="saving" @click="submit">确认上次提交结果</el-button></el-alert>
+    <el-button v-if="canDraft" :disabled="saving || uploading" @click="openCorrectionDraft">{{ correctionDraft ? '恢复费用更正草稿' : '准备费用更正草稿' }}</el-button><el-alert v-if="draftError" :title="draftError" type="error" :closable="false" /><el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
+    <el-alert v-if="pending" title="上次提交结果尚未确认，重试将使用原始内容与原请求编号。" type="warning" :closable="false"><p>原操作：{{ pending.command === 'review' ? (pending.payload.decision === 'APPROVE' ? '审核通过' : '审核拒绝') : actions.find(action => routes[action.key] === pending?.command)?.label || '采购节点操作' }} · {{ pending.payload.remark || pending.payload.reason }}</p><p v-if="pending.payload.amount !== undefined">原提交金额：{{ pending.payload.amount }} {{ pending.payload.currency || (['international-estimate', 'fees/refund'].includes(pending.command) ? 'CNY' : '') }}</p><el-button :loading="saving" @click="retryPending">确认上次提交结果</el-button></el-alert>
     <ApiErrorMeta v-if="error && !opened" :details="error" />
-    <AppDialog class="admin-density-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="uploading || warehouseLoading || !!storageError || !key" :confirm-text="pending ? '重试原请求' : '确认提交'" @confirm="submit">
-      <template #default><el-alert v-if="command === 'purchase'" title="记录已实际购买的商品和供应商实付总额。资金未完成时，真实购买事实仍保留。" type="info" :closable="false" />
-        <el-form class="density-form" label-position="top" :disabled="saving || uploading || !!pending">
+    <AppDialog class="admin-density-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" :confirm-text="editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交'" @confirm="submit">
+      <template #default><el-alert v-if="editingDraft" title="草稿仅保存在当前浏览器标签页，关闭标签页后可能丢失；不代表已确认费用。原请求未决时只能保存，结果明确后请刷新订单再核对确认。" type="info" :closable="false" /><el-alert v-if="command === 'purchase'" title="记录已实际购买的商品和供应商实付总额。资金未完成时，真实购买事实仍保留。" type="info" :closable="false" />
+        <el-form class="density-form" label-position="top" :disabled="saving || uploading || (!!pending && !editingDraft)">
           <el-form-item v-if="active?.key === 'MANAGE'" label="实物更正操作"><el-select v-model="manageCommand" placeholder="选择处置或更正操作"><el-option value="dispositions" label="记录差异处置" /><el-option value="receipts/correct" label="更正原实收数量" /><el-option value="dispositions/revoke" label="撤销原差异处置" /><el-option value="packing/withdraw" label="撤回未交寄的确认清单" /><el-option value="control-notes" label="追加事实说明或阻断" /><el-option value="control-notes/resolve" label="解除已处理的阻断" /><el-option value="actual-warehouse/correct" label="实际仓受控更正" /></el-select></el-form-item>
           <el-form-item v-if="active?.key === 'FINANCE_ADJUST'" label="财务处理方式"><el-select v-model="financialCommand" placeholder="选择财务处理方式"><el-option value="fees/additional" label="登记独立新发生费用" /><el-option value="fees/correct-target" label="更正原费用链目标总额" /><el-option value="fees/refund" label="关联原扣款退款" /><el-option value="fees/terminate" label="终止明确失败的费用版本" /><el-option value="fees/replace-failed" label="重新核定已终止的未扣款费用" /><el-option value="fees/release-estimate" label="释放有效预估冻结" /></el-select></el-form-item>
           <ProcurementControlFields v-if="isControl && command" v-model="control" :command="command" :detail="detail" :files="allFiles" />
-          <ProcurementFinanceFields v-if="isFinance && command" v-model="finance" :command="command" :detail="detail" :files="allFiles" :can="access.can" />
+          <template v-if="editingDraft"><el-form-item label="原费用"><el-select v-model="finance.feeId" placeholder="选择本单原实际费用"><el-option v-for="fee in detail.fees.filter(row => !['INTERNATIONAL_ESTIMATE', 'ADJUSTMENT', 'REFUND'].includes(row.purpose))" :key="fee.id" :value="fee.id" :label="`${fee.feeNo} · ${fee.feeItemName}`" /></el-select></el-form-item><el-form-item label="正确原币总额"><el-input v-model="finance.targetOriginalAmount" placeholder="填写原费用链正确总额，最多两位小数" /></el-form-item></template>
+          <ProcurementFinanceFields v-else-if="isFinance && command" v-model="finance" :command="command" :detail="detail" :files="allFiles" :can="access.can" />
           <ProcurementTransportFields v-if="isTransport && command" v-model="transport" :command="command" :detail="detail" :files="allFiles" />
           <ProcurementPhysicalFields v-if="isPhysical && command" v-model="physical" :command="command" :detail="detail" />
           <el-form-item v-if="command === 'review'" label="审核决定"><el-radio-group v-model="form.decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">拒绝</el-radio></el-radio-group></el-form-item>
           <el-form-item v-if="needsWarehouse" :label="command === 'actual-warehouse/correct' ? '更正后的实际仓' : isPhysical ? '实际海外收货仓' : '采购仓'" required><el-select v-model="form.warehouseId" :disabled="isPhysical && !!detail.purchaseFacts.actual_warehouse_id" filterable :loading="warehouseLoading" placeholder="选择有效海外收货仓"><el-option v-for="item in warehouses" :key="item.warehouseId" :value="item.warehouseId" :label="`${item.warehouseName} · ${item.warehouseCode}`" /></el-select><span v-if="warehouseError">{{ warehouseError }}<el-button link @click="loadWarehouses">重试</el-button></span></el-form-item>
           <div v-if="needsAmount" class="purchase-form-grid"><el-form-item :label="command === 'purchase' ? '供应商实付总额' : '客户授权预算总额'" required><el-input v-model="form.amount" placeholder="明确填写金额，包括零元" /></el-form-item><el-form-item label="原币" required><el-select v-model="form.currency"><el-option value="CNY" label="人民币 CNY" /><el-option value="USD" label="美元 USD" /></el-select></el-form-item></div>
           <div v-if="command === 'purchase'" class="purchase-form-grid"><el-form-item label="真实购买时间" required><el-date-picker v-model="form.purchasedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="预计到海外仓时间" required><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item></div>
-          <el-form-item v-if="command === 'exception-close'" label="上传异常处置或客户确认凭证"><input aria-label="上传异常关闭凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
-          <el-form-item v-if="['charges/confirm', 'fees/additional'].includes(command || '')" label="上传费用凭证"><input aria-label="上传费用凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
-          <el-form-item v-if="command === 'labels'" label="上传本单面单"><input aria-label="上传快递面单" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
-          <el-form-item v-if="needsAmount || needsEvidence" label="本单凭证" required><el-select v-model="form.voucherFileId" placeholder="选择已上传凭证"><el-option v-for="file in files" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select><input aria-label="上传本单凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || !!pending || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="command === 'exception-close'" label="上传异常处置或客户确认凭证"><input aria-label="上传异常关闭凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || (!!pending && !editingDraft) || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="['charges/confirm', 'fees/additional'].includes(command || '')" label="上传费用凭证"><input aria-label="上传费用凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || (!!pending && !editingDraft) || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="command === 'labels'" label="上传本单面单"><input aria-label="上传快递面单" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || (!!pending && !editingDraft) || saving" @change="upload" /></el-form-item>
+          <el-form-item v-if="needsAmount || needsEvidence" label="本单凭证" required><el-select v-model="form.voucherFileId" placeholder="选择已上传凭证"><el-option v-for="file in files" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select><input aria-label="上传本单凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || (!!pending && !editingDraft) || saving" @change="upload" /></el-form-item>
           <el-form-item label="操作说明" required><el-input v-model="form.reason" placeholder="填写本次操作的事实、依据或原因" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
         </el-form><el-alert v-if="error" :title="error.message" type="error" :closable="false" /><ApiErrorMeta v-if="error" :details="error" /></template>
-      <template #footer><el-button :disabled="saving || uploading" @click="opened = false">关闭</el-button><el-button type="primary" :loading="saving" :disabled="uploading || warehouseLoading || !!storageError || !key" @click="submit">{{ pending ? '重试原请求' : '确认提交' }}</el-button></template>
+      <template #footer><el-button :disabled="saving || uploading" @click="opened = false">关闭</el-button><el-button v-if="editingDraft" :disabled="!!pending || !!storageError || saving || uploading" @click="useCorrectionDraft">核对并继续确认</el-button><el-button type="primary" :loading="saving" :disabled="uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" @click="submit">{{ editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交' }}</el-button></template>
     </AppDialog>
   </section>
 </template>
diff --git a/src/modules/overseas-business/procurementCorrectionDraft.ts b/src/modules/overseas-business/procurementCorrectionDraft.ts
new file mode 100644
index 00000000..71bf819a
--- /dev/null
+++ b/src/modules/overseas-business/procurementCorrectionDraft.ts
@@ -0,0 +1,16 @@
+export interface ProcurementCorrectionDraft {
+  feeId: string
+  targetOriginalAmount: string
+  reason: string
+  voucherFileId: string
+  orderVersion: number
+}
+
+export function readCorrectionDraft(raw: string | null): ProcurementCorrectionDraft | null {
+  if (!raw) return null
+  const value: unknown = JSON.parse(raw)
+  if (!value || typeof value !== 'object') throw new Error('费用更正草稿无法读取')
+  const draft = value as Record<string, unknown>
+  if (!['feeId', 'targetOriginalAmount', 'reason', 'voucherFileId'].every(key => typeof draft[key] === 'string') || !Number.isSafeInteger(draft.orderVersion)) throw new Error('费用更正草稿无法读取')
+  return { feeId: draft.feeId as string, targetOriginalAmount: draft.targetOriginalAmount as string, reason: draft.reason as string, voucherFileId: draft.voucherFileId as string, orderVersion: draft.orderVersion as number }
+}

From 172cb05c78b928d658949eae413b38500a48d721 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 14:03:43 +0800
Subject: [PATCH 25/47] feat(appointments): select external cargo in shared
 planning workspace

---
 .../AppointmentCargoPanel.vue                 | 26 +++++++-
 .../AppointmentExternalCandidates.vue         | 63 +++++++++++++++++++
 .../AppointmentTableRendering.test.ts         | 22 ++++++-
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  1 +
 .../appointment-calendar/planningApi.ts       |  7 +++
 5 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 src/modules/appointment-calendar/AppointmentExternalCandidates.vue

diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index 19848d92..8286eb82 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -12,6 +12,7 @@ import RowActions from '@/shared/components/RowActions.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { listPlanningCargo, resolvePlanningSource, previewPlanningBatch, createSourceAppointment, type SourceAppointmentPayload, type PlanningBatchPreview, type ResolvedPlanningSource, type PlanningCargo, type PlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import AppointmentExternalCandidates from './AppointmentExternalCandidates.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 
 const router = useRouter()
@@ -22,6 +23,8 @@ const arrangement = reactive(createAppointmentForm())
 const creating = ref(false), createError = ref<ApiErrorDetails | null>(null)
 const pendingCreate = ref<SourceAppointmentPayload | null>(null)
 const following = ref<ResolvedPlanningSource | null>(null)
+const candidateMode = ref<'firstleg' | 'external'>('firstleg')
+const externalRevision = ref(0)
 const followupError = ref<ApiErrorDetails | null>(null)
 type Selection = Pick<PlanningSource, 'sourceKey' | 'customerId' | 'originWarehouseId' | 'destinationWarehouseCode' | 'inboundCode'> & { bookingNo?: string | null }
 const selected = ref<Record<string, Selection>>({})
@@ -76,7 +79,7 @@ async function saveArrangement() {
   try {
     const result = await createSourceAppointment(pendingCreate.value)
     pendingCreate.value = null; batchPreview.value = null; selected.value = {}
-    ElMessage.success(`预约安排 ${result.appointmentNo} 已保存`); emit('created'); await load()
+    ElMessage.success(`预约安排 ${result.appointmentNo} 已保存`); ++externalRevision.value; emit('created'); await load()
   } catch (cause) {
     createError.value = getApiErrorDetails(cause, '保存结果待核实，请重试原请求')
     if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(createError.value.code || '')) pendingCreate.value = null
@@ -122,7 +125,7 @@ async function load(reset = false) {
 function source(row: PlanningCargo) {
   return router.push({ name: 'overseas-last-mile-order-detail', params: { orderId: row.orderId }, query: { customerId: row.customerId } })
 }
-async function openFollowup(row: PlanningCargo) {
+async function openFollowup(row: Pick<PlanningCargo, 'sourceKey' | 'customerId' | 'destinationWarehouseCode'>) {
   const request = ++followupRequest
   followupError.value = null
   try {
@@ -135,7 +138,24 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
 </script>
 
 <template>
-  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="sourceKey" @update:page="load()" @update:page-size="load(true)">
+  <div role="group" aria-label="预约货源类型">
+    <el-button :type="candidateMode === 'firstleg' ? 'primary' : 'default'" @click="candidateMode = 'firstleg'">头程货物</el-button>
+    <el-button :type="candidateMode === 'external' ? 'primary' : 'default'" @click="candidateMode = 'external'">外接货物</el-button>
+  </div>
+  <AppointmentExternalCandidates v-if="candidateMode === 'external'" :key="externalRevision" :can-arrange="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :selected-keys="Object.keys(selected)" :busy="batchLoading || creating" @select="addSource" @followup="openFollowup($event.source)">
+    <template #toolbar-actions>
+      <el-button :disabled="!selectedRows.length || batchLoading" @click="selected = {}; batchError = null">清空选择</el-button>
+      <el-button type="primary" :disabled="!selectedRows.length" :loading="batchLoading" @click="previewBatch">合批核对（{{ selectedRows.length }}/100）</el-button>
+    </template>
+    <template #notices>
+      <details v-if="selectedRows.length" class="external-selection"><summary>已选 {{ selectedRows.length }} 票（切换货源保留选择）</summary>
+        <div class="external-selection-list"><div v-for="row in selectedRows" :key="row.sourceKey">{{ row.bookingNo || row.inboundCode || '尚未关联业务编号' }}<el-button :disabled="batchLoading || creating" @click="delete selected[row.sourceKey]">移除选择</el-button></div></div>
+      </details>
+      <LoadErrorState v-if="batchError" title="所选货物暂不能合批" :message="batchError.message" :show-retry="false" />
+      <LoadErrorState v-if="followupError" title="来源核对失败" :message="followupError.message" :show-retry="false" />
+    </template>
+  </AppointmentExternalCandidates>
+  <DataTable v-show="candidateMode === 'firstleg'" v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="sourceKey" @update:page="load()" @update:page-size="load(true)">
     <template #toolbar-start>已选 {{ selectedRows.length }} 票，可跨客户选择同一起运仓、同一目的仓货物</template>
     <template #toolbar-actions>
       <el-button :disabled="loading || batchLoading" @click="selectPage">选择本页可合批货物</el-button>
diff --git a/src/modules/appointment-calendar/AppointmentExternalCandidates.vue b/src/modules/appointment-calendar/AppointmentExternalCandidates.vue
new file mode 100644
index 00000000..c5bcfc62
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentExternalCandidates.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import QueryToolbar, { type QueryModel, type QueryField } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listExternalAppointmentCandidates, type ExternalAppointmentCandidate, type PlanningSource } from './planningApi'
+
+defineProps<{ canArrange: boolean; selectedKeys: string[]; busy: boolean }>()
+const emit = defineEmits<{ select: [source: PlanningSource]; followup: [row: ExternalAppointmentCandidate] }>()
+const page = ref(1), size = ref(20), total = ref(0), loading = ref(false)
+const rows = ref<ExternalAppointmentCandidate[]>([]), error = ref<ApiErrorDetails | null>(null)
+const query = ref<QueryModel>({ keyword: '' })
+const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '外接货', placeholder: '登记号、车次号、客户、来货号', width: 300 }]
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 160, fixed: 'left' },
+  { key: 'booking', label: '原登记号', slotName: 'booking', minWidth: 190 },
+  { prop: 'customerName', label: '客户', minWidth: 130 },
+  { prop: 'tripNo', label: '车次号', minWidth: 190 },
+  { key: 'origin', label: '接仓点', slotName: 'origin', minWidth: 140 },
+  { key: 'destination', label: '目的FBA仓', slotName: 'destination', width: 110 },
+  { key: 'packages', label: '箱数', slotName: 'packages', width: 90 },
+  { key: 'coverage', label: '预约情况', slotName: 'coverage', minWidth: 180 },
+]
+let request = 0
+let controller: AbortController | undefined
+async function load(reset = false) {
+  if (reset) page.value = 1
+  const current = ++request
+  controller?.abort(); controller = new AbortController()
+  loading.value = true; error.value = null
+  try {
+    const result = await listExternalAppointmentCandidates({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }, controller.signal)
+    if (current === request) { rows.value = result.records; total.value = result.total }
+  } catch (cause) {
+    if (current === request) { rows.value = []; total.value = 0; error.value = getApiErrorDetails(cause, '外接候选加载失败') }
+  } finally { if (current === request) loading.value = false }
+}
+onMounted(() => load())
+onBeforeUnmount(() => { ++request; controller?.abort() })
+</script>
+
+<template>
+  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" @update:page="load()" @update:page-size="load(true)">
+    <template #toolbar-actions><slot name="toolbar-actions" /></template>
+    <template #filters><QueryToolbar v-model="query" ariaLabel="外接预约候选查询" :fields="fields" :loading="loading" @search="load(true)" /></template>
+    <template #notices>
+      <slot name="notices" />
+      <LoadErrorState v-if="error" title="外接候选加载失败" :message="error.message" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <p v-else>已确认承运的美国FBA货物，来货前后保留同一原登记；箱数未知可先保存待确认安排。</p>
+    </template>
+    <template #actions="{ row }"><template v-if="row.source && row.coverage">
+      <el-button v-if="canArrange" link type="primary" :disabled="busy || selectedKeys.includes(row.source.sourceKey) || !row.source.canFollowup || row.coverage.appointments.length > 0" @click="emit('select', row.source)">{{ selectedKeys.includes(row.source.sourceKey) ? '已加入' : '加入合批' }}</el-button>
+      <el-button link type="primary" @click="emit('followup', row as ExternalAppointmentCandidate)">跟进</el-button>
+    </template></template>
+    <template #booking="{ row }">{{ row.source?.bookingNo || '—' }}</template>
+    <template #origin="{ row }">{{ row.source?.originWarehouseName || '—' }}</template>
+    <template #destination="{ row }">{{ row.source?.destinationWarehouseCode || '—' }}</template>
+    <template #packages="{ row }">{{ row.source?.packages ?? '待核实' }}</template>
+    <template #coverage="{ row }"><span v-if="row.source && row.coverage">{{ row.coverage.appointments.length ? (row.coverage.changeReviewRequired ? '已有预约，待复核' : '已有预约') : (row.source.canFollowup ? '待安排' : row.source.blockReasons.join('；')) }}</span></template>
+  </DataTable>
+</template>
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index 55d4d1bd..c3b3fb19 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -4,9 +4,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningSource } from './planningApi'
+import { listExternalAppointmentCandidates, getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningSource } from './planningApi'
 
-vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn(), createSourceAppointment: vi.fn() }))
+vi.mock('./planningApi', () => ({ listExternalAppointmentCandidates: vi.fn(), listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn(), createSourceAppointment: vi.fn() }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
@@ -15,6 +15,24 @@ const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], ch
 
 describe('appointment tables use actual shared table slots', () => {
   beforeEach(() => vi.resetAllMocks())
+  it('discovers external candidates lazily and mixes original bookings with selected first-leg cargo', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
+    const external: PlanningSource = { ...source, sourceKey: 'BOOKING:B-1', customerId: 'B', orderId: null, inboundCode: null, bookingNo: 'B-1', packages: null }
+    vi.mocked(listExternalAppointmentCandidates).mockResolvedValue({ records: [{ source: external, customerName: '客户乙', tripNo: 'TR-1', coverage: { status: 'UNSCHEDULED', appointments: [], missingFields: [], changeReviewRequired: false } }], total: 1 })
+    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: null, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 1 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', sources: [source, external], missingFields: [] })
+    const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
+    await flushPromises()
+    expect(listExternalAppointmentCandidates).not.toHaveBeenCalled()
+    await wrapper.findAll('button').find(b => b.text() === '选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(b => b.text() === '外接货物')!.trigger('click'); await flushPromises()
+    expect(listExternalAppointmentCandidates).toHaveBeenCalledTimes(1)
+    expect(wrapper.text()).toContain('B-1')
+    await wrapper.findAll('button').find(b => b.text() === '加入合批')!.trigger('click')
+    await wrapper.findAll('button').find(b => b.text().startsWith('合批核对') && b.isVisible())!.trigger('click'); await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{ sourceKey: 'ORDER:1', customerId: 'A', destinationKey: 'FBA:ONT8' }, { sourceKey: 'BOOKING:B-1', customerId: 'B', destinationKey: 'FBA:ONT8' }])
+    expect(resolvePlanningSource).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
   it('combines an original external booking with first-leg cargo and retries the identical save command', async () => {
     const external: PlanningSource={...source,sourceKey:'BOOKING:B-1',customerId:'B',bookingNo:'B-1',orderId:null,inboundCode:null,packages:null}
     vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index 8ce6001f..90609b6c 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -18,6 +18,7 @@
 | 整柜提柜与接仓 | 美国预约统一方案的整柜共享事项 | 独立工作视图按柜汇总，操作列左置；接仓点在行内分组，点击后共用1080px跟进弹框。整柜只选拖车/码头事项，接仓只记录对应仓库，单票只记录FBA联系；数量未知或范围不完整明确显示，不按客户复制整柜联系。首次只请求一页整柜数据，详情按点击读取；待1920×1080页面验收 |
 | 在途跨客户合批安排 | 美国预约统一方案的同起运仓、同目的仓合批 | 操作列后选择同起运仓及同目的仓，跨页累计最多100票；批量核对后在1080px弹框填写与入仓入口共用的安排表单。未知箱数保留待核实；暂扣、多目的地和已有预约不可选入。保存必须重新核对，未知结果保留同一命令供重试 |
 | 外接货进入合批 | 同仓跨客户共用预约，不因未入仓而只允许跟进 | 后端核实BOOKING深链后，“加入预约合批”进入现有合批工作区，再显式加入选择；可与同起运仓/目的仓头程货混选，保留原BOOKING键与未知箱数。跨仓不清空已有选择，已有关联预约不再开放新增入口；切换日历/合批工作视图保留本页选择，外接选择默认折叠、展开216px内滚动 |
+| 完整外接候选 | 统一方案第九节两类货源均可筹划、合批及核对覆盖 | 在同一合批工作区切换头程/外接来源列表，外接按服务端分页、关键词筛选，展示原登记、客户、车次、接仓点、目的仓、可空箱数及预约覆盖。加入选择复用原100票合批选择与保存弹框；查看跟进沿用原弹框，不新增预约数据副本。切换来源保留选择，未打开外接列表不请求；待1920×1080验收 |
 | 未定时安排 | 总览不得伪造时段 | 日历上方独立折叠分页列表；日期未定不补零点或09点，继续编辑仍操作原系统单号；仅有计划日期时日历显示日期，不生成确认时段 |
 | 提柜日历 | 美国业务预约统一总览 | 读取原码头提柜预约，一柜一条，点击查看来源进入清关提柜详情；按美国目的仓确认业务范围，不等于确认港口国家。保留原业务日期，明确港口时区待核实，不套用目的仓时区；未知目的仓及截断显示统计不完整。无提柜权限不请求该来源并提示范围缺失 |
 | 用车计划日历 | 统一总览的真实车次只读来源 | 一车一条，计划与实际出发分开，司机预计结束不当送货完成。查询一次带跨时区余量的UTC窗口，按起运仓地点时区筛回42个当地日；缺国家/时区的记录独立分页待核实，不放入每日格。路线最多3站摘要，完整路线进入原车次；不请求逐车详情，不在预约页创建车次或重算余位 |
diff --git a/src/modules/appointment-calendar/planningApi.ts b/src/modules/appointment-calendar/planningApi.ts
index 47e2ed38..613c44d4 100644
--- a/src/modules/appointment-calendar/planningApi.ts
+++ b/src/modules/appointment-calendar/planningApi.ts
@@ -65,6 +65,13 @@ export interface AppointmentCoverage {
   appointments: Array<{ appointmentNo: string; confirmationNo: string | null; status: string; confirmedAt: string | null; confirmedEndAt: string | null; timezone: string | null }>;
 }
 export interface ResolvedPlanningSource { source: PlanningSource; coverage: AppointmentCoverage }
+export interface ExternalAppointmentCandidate extends ResolvedPlanningSource { customerName: string | null; tripNo: string }
+export async function listExternalAppointmentCandidates(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{ records: ExternalAppointmentCandidate[]; total: number }>, ApiEnvelope<{ records: ExternalAppointmentCandidate[]; total: number }>>(
+    '/platform/v1/last-leg/appointment-planning/external-candidates', { params: query, signal },
+  ))
+  return { ...result, total: Number(result.total) }
+}
 export interface PlanningBatchPreview {
   group: { originWarehouseId: string; destinationKey: string; packages: number | null; sourceCount: number; customerCount: number; readinessIncomplete: boolean; readyFrom: string | null; readyTo: string | null; unknownQuantitySources: number }
   originWarehouseName: string

From b20c3ac104b7179356b245e4ad2da899baab9cba Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sat, 10 Oct 2026 14:42:41 +0800
Subject: [PATCH 26/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overseas-warehouse/api/lastMileOrders.ts  |  3 ++-
 .../pages/LastMileOrderDetailView.test.ts     | 25 +++++++++++++++++++
 .../pages/LastMileOrderDetailView.vue         | 22 ++++++++++++----
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.ts b/src/modules/overseas-warehouse/api/lastMileOrders.ts
index 5a207c50..23ba0e59 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.ts
@@ -356,7 +356,8 @@ export interface ChangeContainerReceivingWarehousePayload {
 
 export interface LastMileOrderDetailDto {
   returnReceipt?: {
-    order: { returnNo: string; receivedQuantity: number; expectedQuantity: number }
+    order: { returnNo: string; status?: string; receivedQuantity: number; expectedQuantity: number }
+    items?: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number }>
     receipts: Array<{ receiptNo: string; unitType: string; unitCode?: string; palletCode?: string; receivedQuantity: number; boxCount: number; signedAt: string }>
     cartons?: Array<{ receiptNo: string; palletCode?: string; cartonMark: string; countStatus: string; countedAt?: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }>
   } | null
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
index 517da0dc..c66388cc 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
@@ -13,6 +13,31 @@ vi.mock('../api/warehouseTransfers', () => ({ getWarehouseTransfer: vi.fn() }))
 enableAutoUnmount(afterEach)
 
 describe('LastMileOrderDetailView domestic detail alignment', () => {
+  it.each(['PENDING_REVIEW', 'PARTIALLY_RECEIVED'])('shows SKU forecast before receipt completion (%s) without forecast box counts', async status => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: status, packageCount: 30 },
+      cargo: [], fees: [], statusHistory: [], operationHistory: [],
+      returnReceipt: { order: { returnNo: 'RT-1', status, expectedQuantity: 30, receivedQuantity: 5 }, receipts: [],
+        items: [{ skuCode: 'SKU-FORECAST', productNameZh: '预报商品', expectedQuantity: 30, receivedQuantity: 5 }] } })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    expect(wrapper.get('[aria-label="基本信息"]').text()).not.toContain('箱数')
+    await wrapper.findAll('[role="tab"]').find(tab => tab.text().includes('货物信息'))!.trigger('click'); await flushPromises()
+    const panel = wrapper.get('.table-panel')
+    expect(panel.text()).toContain('SKU-FORECAST')
+    expect(panel.text()).toContain('预报商品')
+    expect(panel.text()).toContain('预报件数')
+    expect(panel.text()).toContain('30')
+    expect(panel.text()).not.toContain('箱数')
+  })
+  it('uses actual cargo after return receipt completion', async () => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: 'INBOUND_COMPLETED' },
+      cargo: [{ id: 'actual', skuCode: 'SKU-ACTUAL', productNameZh: '实收商品', productQuantity: 25, packageCount: 2 }], fees: [], statusHistory: [], operationHistory: [],
+      returnReceipt: { order: { returnNo: 'RT-1', status: 'COMPLETED', expectedQuantity: 30, receivedQuantity: 25 }, receipts: [], items: [{ skuCode: 'SKU-FORECAST', expectedQuantity: 30, receivedQuantity: 25 }] } })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    await wrapper.findAll('[role="tab"]').find(tab => tab.text().includes('货物信息'))!.trigger('click'); await flushPromises()
+    expect(wrapper.get('.table-panel').text()).toContain('SKU-ACTUAL')
+    expect(wrapper.get('.table-panel').text()).not.toContain('SKU-FORECAST')
+    expect(wrapper.get('.table-panel').text()).toContain('25')
+  })
   it('shows signed box contents and actual quantities on return orders', async () => {
     vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'tail-return', customerId: 'customer-1', orderNo: 'RETU-1', orderType: 'RETURN_RELABEL', currentStatus: 'INBOUND_COMPLETED' }, cargo: [], fees: [], statusHistory: [], operationHistory: [],
       returnReceipt: { order: { returnNo: 'RT-1', receivedQuantity: 10, expectedQuantity: 10 }, receipts: [{ receiptNo: 'RR-1', unitType: 'PALLET', unitCode: 'PLT-1', receivedQuantity: 10, boxCount: 2, signedAt: '' }],
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
index dcad996c..31a9c22f 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
@@ -56,6 +56,10 @@ function feeStatusLabel(value: string) { return ({ PENDING_REVIEW: '待审核',
 function isSingleLineBusinessField(field: DetailField) { return field.label === '入仓码' || field.label === '集装箱号' }
 
 const referenceValue = computed(() => lastMileOrderReference(detail.value?.order.orderNo, '订单编码待补充'))
+const isReturnOrder = computed(() => detail.value?.order.orderType === 'RETURN_RELABEL')
+const showReturnForecast = computed(() => isReturnOrder.value && (detail.value?.returnReceipt?.order.status
+  ? detail.value.returnReceipt.order.status !== 'COMPLETED'
+  : ['PENDING_REVIEW', 'PENDING_RECEIPT', 'PARTIALLY_RECEIVED', 'REJECTED', 'CANCELLED'].includes(detail.value?.order.currentStatus || '')))
 const orderFields = computed<DetailField[]>(() => {
   const order = detail.value?.order
   const fields: DetailField[] = [
@@ -93,7 +97,7 @@ const containerFields = computed<DetailField[]>(() => {
     { label: '实际到港时间', value: formatOverseasDateTime(order?.actualArrivalAt) },
     { label: '预计到仓时间', value: formatOverseasDateTime(order?.estimatedWarehouseAt) },
     { label: '货柜节点', value: containerNodeLabel(order?.containerNode) },
-  ]
+  ].filter(field => !isReturnOrder.value || field.label !== '箱数')
 })
 const commercialLink = computed(() => businessOrderLink(detail.value?.order.businessSource?.businessType, detail.value?.order.businessSource?.businessOrderNo, access.can))
 const basicFields = computed(() => [...orderFields.value, ...containerFields.value])
@@ -104,7 +108,8 @@ const overviewFields = computed(() => {
   return [
     { label: '客户', value: text(order?.customerName) },
     { label: '海外仓', value: text(order?.overseasWarehouseName) },
-    { label: warehouseTransfer ? (hasReceivedPackages ? '实收总箱数' : '客户预报总箱数') : '总箱数', value: (hasReceivedPackages ? order?.receivedPackageCount : order?.packageCount) == null ? '—' : `${hasReceivedPackages ? order?.receivedPackageCount : order?.packageCount} 箱` },
+    ...(isReturnOrder.value ? [{ label: showReturnForecast.value ? '预报总件数' : '实收总件数', value: `${showReturnForecast.value ? detail.value?.returnReceipt?.order.expectedQuantity ?? order?.productQuantity ?? 0 : detail.value?.returnReceipt?.order.receivedQuantity ?? order?.productQuantity ?? 0} 件` }]
+      : [{ label: warehouseTransfer ? (hasReceivedPackages ? '实收总箱数' : '客户预报总箱数') : '总箱数', value: (hasReceivedPackages ? order?.receivedPackageCount : order?.packageCount) == null ? '—' : `${hasReceivedPackages ? order?.receivedPackageCount : order?.packageCount} 箱` }]),
     { label: '总托数', value: order?.palletCount == null ? '—' : order.palletCount + ' 托' },
     { label: '货物毛重', value: order?.grossWeightKg == null ? '—' : order.grossWeightKg + ' kg' },
     { label: '货物净重', value: order?.netWeightKg == null ? '—' : order.netWeightKg + ' kg' },
@@ -130,7 +135,10 @@ const documents = computed<DocumentRow[]>(() => {
     .filter((item) => item[1]).map(([type, number]) => ({ type: String(type), number: String(number), createdAt: '—', quote: '—' } as DocumentRow))
     .concat((order.relabelApplications || []).map(application => ({ type: '换标单', number: application.relabelNo, createdAt: formatOverseasDateTime(application.createdAt), quote: '—', status: relabelApplicationStatusLabel(application.status), quantity: application.quantity })))
 })
-const cargo = computed<CargoRow[]>(() => (detail.value?.cargo || []).map((item) => ({
+const cargo = computed<CargoRow[]>(() => showReturnForecast.value && detail.value?.returnReceipt?.items?.length
+  ? detail.value.returnReceipt.items.map(item => ({ id: item.skuCode, sku: item.skuCode, productName: text(item.productNameZh),
+      quantity: item.expectedQuantity, pallets: 0, cartons: 0, weight: 0, volume: 0 }))
+  : (detail.value?.cargo || []).map((item) => ({
   id: String(item.id), sku: text(item.skuCode), productName: text(item.productNameZh), pallets: Number(item.palletCount || 0),
   cartons: Number(item.packageCount || 0), quantity: Number(item.productQuantity || 0), weight: Number(item.grossWeightKg || 0), volume: Number(item.volumeCbm || 0),
 })))
@@ -149,12 +157,16 @@ const logs = computed<LogRow[]>(() => {
   return [...statusRows, ...operationRows].sort((left, right) => right.sortAt.localeCompare(left.sortAt))
 })
 
-const cargoColumns: DataTableColumn[] = [
+const cargoColumns = computed<DataTableColumn[]>(() => showReturnForecast.value ? [
+  { key: 'sku', prop: 'sku', label: 'SKU', minWidth: 150 },
+  { key: 'productName', prop: 'productName', label: '中文品名', minWidth: 180 },
+  { key: 'quantity', prop: 'quantity', label: '预报件数', width: 120, align: 'right' },
+] : [
   { key: 'sku', prop: 'sku', label: 'SKU', minWidth: 150 }, { key: 'productName', prop: 'productName', label: '中文品名', minWidth: 180 },
   { key: 'pallets', prop: 'pallets', label: '托数', width: 100, align: 'right' }, { key: 'cartons', prop: 'cartons', label: '箱数', width: 100, align: 'right' },
   { key: 'quantity', prop: 'quantity', label: '件数', width: 100, align: 'right' }, { key: 'weight', prop: 'weight', label: '重量(kg)', width: 120, align: 'right' },
   { key: 'volume', prop: 'volume', label: '体积(m³)', width: 120, align: 'right' },
-]
+])
 const documentColumns: DataTableColumn[] = [
   { key: 'status', prop: 'status', label: '状态', minWidth: 130 }, { key: 'quantity', prop: 'quantity', label: '换标数量（件）', minWidth: 130 },
   { key: 'type', prop: 'type', label: '单据类型', minWidth: 150 }, { key: 'number', prop: 'number', label: '单据编号', minWidth: 200 },

From 40cccee2661b85690ee6c185d00c62b72cad99d0 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sat, 10 Oct 2026 14:58:15 +0800
Subject: [PATCH 27/47] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/lastMileOrders.test.ts                | 11 ++++-
 .../overseas-warehouse/api/lastMileOrders.ts  |  9 +++++
 .../pages/LastMileOrdersView.behavior.test.ts | 40 ++++++++++++++++++-
 .../pages/LastMileOrdersView.vue              | 31 +++++++++++++-
 src/modules/overseas-warehouse/permissions.ts |  1 +
 5 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.test.ts b/src/modules/overseas-warehouse/api/lastMileOrders.test.ts
index 25cf9cd9..f865432f 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.test.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
-import { reviewCargoDiscard } from './lastMileOrders'
+import { reviewCargoDiscard, updateLastMileOrderPalletMerge } from './lastMileOrders'
 import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, getContainerPlanProgress, getLastMileOrder, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, transferLastMileOrders, updateLastMileOrderHold, updateLastMileOrderManualNodes } from './lastMileOrders'
 
 vi.mock('@/shared/api/http', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: { get: vi.fn(), put: vi.fn(), post: vi.fn() } }))
@@ -148,3 +148,12 @@ describe('last-mile order overseas API', () => {
     )
   })
 })
+
+it('sets and cancels a merge group with string IDs and explicit customer scope', async () => {
+  vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: null })
+  for (const required of [true, false]) {
+    await updateLastMileOrderPalletMerge(['2092873463568596994'], '2092618717861048321', required)
+    expect(http.put).toHaveBeenLastCalledWith('/platform/v1/last-leg/orders/pallet-merge-required/batch',
+      { orderIds: ['2092873463568596994'], palletMergeRequired: required }, { params: { customerId: '2092618717861048321' } })
+  }
+})
diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.ts b/src/modules/overseas-warehouse/api/lastMileOrders.ts
index 23ba0e59..cd9a2afa 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.ts
@@ -427,6 +427,15 @@ export async function transferLastMileOrders(payload: TransferDestinationPayload
   return unwrapApiResponse(response)
 }
 
+export async function updateLastMileOrderPalletMerge(orderIds: string[], customerId: string, palletMergeRequired: boolean) {
+  const response = await http.put<ApiEnvelope<null>, ApiEnvelope<null>>(
+    '/platform/v1/last-leg/orders/pallet-merge-required/batch',
+    { orderIds, palletMergeRequired },
+    { params: { customerId } },
+  )
+  return unwrapApiResponse(response)
+}
+
 export async function listContainerPlanProgress(query: ContainerPlanProgressQuery): Promise<OverseasPageResult<ContainerPlanProgressSummaryDto>> {
   const response = await http.get<ApiEnvelope<OverseasPagePayload<ContainerPlanProgressSummaryDto>>, ApiEnvelope<OverseasPagePayload<ContainerPlanProgressSummaryDto>>>(
     '/platform/v1/last-leg/orders/container-summaries',
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
index 2cd7ef0d..25c76e1a 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts
@@ -21,6 +21,7 @@ import {
   listLastMileOrders,
   reviewCargoDiscard,
   transferLastMileOrders,
+  updateLastMileOrderPalletMerge,
   getLastMileOrderManualNodes,
   updateLastMileOrderHold,
   updateLastMileOrderManualNodes,
@@ -38,7 +39,7 @@ vi.mock('../api/lastMileOrders', () => ({
   changeContainerReceivingWarehouse: vi.fn(),
   createManualInboundPlan: vi.fn(), convertLastMileContainerToInboundPlans: vi.fn(), getContainerInboundPlanPreview: vi.fn(), transferLastMileOrders: vi.fn(),
   getLastMileOrderManualNodes: vi.fn(), updateLastMileOrderHold: vi.fn(), updateLastMileOrderManualNodes: vi.fn(),
-  reviewCargoDiscard: vi.fn(),
+  reviewCargoDiscard: vi.fn(), updateLastMileOrderPalletMerge: vi.fn(),
 }))
 
 class ResizeObserverStub implements ResizeObserver { observe() {} unobserve() {} disconnect() {} }
@@ -1189,3 +1190,40 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     expect(routerPush).toHaveBeenCalledWith({ name: 'overseas-return-inventory', query: expect.objectContaining({ packing: '1', returnNos: 'RETURN-1' }) })
   })
 })
+
+ describe('tail-leg pallet merge toolbar', () => {
+  beforeEach(() => {
+    canAccess.mockImplementation(() => true)
+    vi.mocked(listLastMileOrders).mockResolvedValue({ records: [], page: 1, size: 10, total: 0, pages: 0 })
+    vi.mocked(updateLastMileOrderPalletMerge).mockReset().mockResolvedValue(null)
+  })
+  it('submits the selected group and cancellation with the customer scope', async () => {
+    vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue('confirm' as Awaited<ReturnType<typeof ElMessageBox.confirm>>)
+    const wrapper = await mountView()
+    const row = { id: '2092873463568596994', customerId, currentStatusCode: 'PENDING_ASSIGNMENT', palletMergeFlag: '' }
+    expect(wrapper.findAll('button').find(b => b.text() === '合托')!.attributes('disabled')).toBeDefined()
+    await selectRows(wrapper, [row])
+    await wrapper.findAll('button').find(b => b.text() === '合托')!.trigger('click')
+    await flushPromises()
+    expect(updateLastMileOrderPalletMerge).toHaveBeenLastCalledWith([row.id], customerId, true)
+    await selectRows(wrapper, [{ ...row, palletMergeFlag: 'REQUIRED' }])
+    await wrapper.findAll('button').find(b => b.text() === '取消合托')!.trigger('click')
+    await flushPromises()
+    expect(updateLastMileOrderPalletMerge).toHaveBeenLastCalledWith([row.id], customerId, false)
+  })
+  it('blocks completed and mixed-customer selections and hides unauthorized actions', async () => {
+    const wrapper = await mountView()
+    for (const rows of [
+      [{ id: '1', customerId, currentStatusCode: 'INBOUND_COMPLETED', palletMergeFlag: 'REQUIRED' }],
+      [{ id: '1', customerId, palletMergeFlag: 'MERGED' }],
+      [{ id: '1', customerId }, { id: '2', customerId: 'other' }],
+    ]) {
+      await selectRows(wrapper, rows)
+      expect(wrapper.findAll('button').find(b => b.text() === '合托')!.attributes('disabled')).toBeDefined()
+      expect(wrapper.findAll('button').find(b => b.text() === '取消合托')!.attributes('disabled')).toBeDefined()
+    }
+    canAccess.mockImplementation(() => false)
+    const denied = await mountView()
+    expect(denied.findAll('button').some(b => b.text() === '合托' || b.text() === '取消合托')).toBe(false)
+  })
+})
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
index f73473c0..f33eab86 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue
@@ -16,7 +16,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
-import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, getContainerInboundPlanPreview, getContainerPlanProgress, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, reviewDirectRelabelOrder, reviewReturnOrder, transferLastMileOrders, updateLastMileOrderHold, updateLastMileOrderManualNodes, type ContainerInboundPlanPreviewDto, type ContainerInboundPlanPreviewGroupDto, type ContainerInboundPlanPreviewOrderDto, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto, type ManualNodeCode, type LastMileOrderQuery } from '../api/lastMileOrders'
+import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, getContainerInboundPlanPreview, getContainerPlanProgress, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, reviewDirectRelabelOrder, reviewReturnOrder, transferLastMileOrders, updateLastMileOrderPalletMerge, updateLastMileOrderHold, updateLastMileOrderManualNodes, type ContainerInboundPlanPreviewDto, type ContainerInboundPlanPreviewGroupDto, type ContainerInboundPlanPreviewOrderDto, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto, type ManualNodeCode, type LastMileOrderQuery } from '../api/lastMileOrders'
 import { businessOrderLink } from '../businessOrderLink'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { reviewCargoDiscard } from '../api/lastMileOrders'
@@ -64,6 +64,33 @@ function openReturnPackingPlan() {
 const exportLoading = ref(false)
 const actionLoading = ref(false)
 async function exportOrders() { exportLoading.value = true; try { await submitExport('LAST_MILE_ORDER_LIST', '尾程订单', orderQuery()) } catch (cause) { ElMessage.error(getApiErrorDetails(cause, '尾程订单导出失败，请重试').message) } finally { exportLoading.value = false } }
+const palletMergeSelectionEditable = computed(() => selectedRows.value.length > 0
+  && selectedRows.value.every(row => row.customerId && row.currentStatusCode !== 'INBOUND_COMPLETED' && row.palletMergeFlag !== 'MERGED')
+  && new Set(selectedRows.value.map(row => row.customerId)).size === 1)
+const canCancelPalletMerge = computed(() => palletMergeSelectionEditable.value
+  && selectedRows.value.every(row => row.palletMergeFlag === 'REQUIRED'))
+async function submitPalletMerge(required: boolean) {
+  if (actionLoading.value || !access.can(permission.lastMileOrderPalletMerge)
+    || !(required ? palletMergeSelectionEditable.value : canCancelPalletMerge.value)) return
+  const selection = [...selectedRows.value]
+  const label = required ? '合托' : '取消合托'
+  try {
+    await ElMessageBox.confirm(required
+      ? `将勾选的 ${selection.length} 票订单标记为同一合托组？所选订单须属于同一客户、同一目的仓，PDA 将提示现场合托。`
+      : `取消勾选的 ${selection.length} 票订单的合托标记和 PDA 提示？`, label,
+    { customClass: 'admin-density-confirm', confirmButtonText: `确认${label}`, cancelButtonText: '返回', type: 'warning' })
+  } catch { return }
+  actionLoading.value = true
+  actionError.value = null
+  try {
+    await updateLastMileOrderPalletMerge(selection.map(row => row.id), selection[0]!.customerId, required)
+    ElMessage.success(required ? '已标记合托' : '已取消合托标记')
+    selectedRows.value = []
+    await load()
+  } catch (cause) {
+    actionError.value = getApiErrorDetails(cause, `${label}失败，请重试`)
+  } finally { actionLoading.value = false }
+}
 const actionError = ref<ApiErrorDetails | null>(null)
 const actionTarget = ref<LastMileOrderListItem | null>(null)
 const inboundPlanOpen = ref(false)
@@ -1108,7 +1135,7 @@ onMounted(() => { void load() })
       </div>
     </section></template>
 
-      <template v-if="statusTab !== '柜子'" #toolbar-actions><el-button v-if="selectedReturnRows.length" type="warning" @click="openReturnPackingPlan"><PackagePlus :size="16" />创建退货合箱计划（{{ selectedReturnRows.length }}）</el-button><el-button v-if="access.can(permission.lastMileOrderExport) && access.can('platform:download:list')" plain :loading="exportLoading" @click="exportOrders"><Download :size="16" />导出订单</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || hasSelectedRejectedReturn() || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate) && selectedRows.length === 1 && canGenerateInboundPlan(selectedRows[0])" type="primary" plain :disabled="hasSelectedInboundPlan() || actionLoading" @click="openInboundPlan()">生成入库计划</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
+      <template v-if="statusTab !== '柜子'" #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderPalletMerge)" plain :disabled="!palletMergeSelectionEditable || actionLoading" @click="submitPalletMerge(true)">合托</el-button><el-button v-if="access.can(permission.lastMileOrderPalletMerge)" plain :disabled="!canCancelPalletMerge || actionLoading" @click="submitPalletMerge(false)">取消合托</el-button><el-button v-if="selectedReturnRows.length" type="warning" @click="openReturnPackingPlan"><PackagePlus :size="16" />创建退货合箱计划（{{ selectedReturnRows.length }}）</el-button><el-button v-if="access.can(permission.lastMileOrderExport) && access.can('platform:download:list')" plain :loading="exportLoading" @click="exportOrders"><Download :size="16" />导出订单</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || hasSelectedRejectedReturn() || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate) && selectedRows.length === 1 && canGenerateInboundPlan(selectedRows[0])" type="primary" plain :disabled="hasSelectedInboundPlan() || actionLoading" @click="openInboundPlan()">生成入库计划</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
       <template #relabelOrderNo="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.relabelNo }}</div><span v-if="!row.relabelApplications?.length">{{ row.relabelOrderNo }}</span></template>
       <template #relabelStatus="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.statusLabel }} · {{ application.quantity }} 件</div><span v-if="!row.relabelApplications?.length">{{ row.relabelStatus }}</span></template>
       <template #actions="{ row }"><RowActions text-actions :actions="lastMileRowActions(row as LastMileOrderListItem)" :more-label="`更多尾程订单操作 · ${(row as LastMileOrderListItem).orderNo || '当前记录'}`" @action="handleLastMileRowAction($event, row as LastMileOrderListItem)" /></template>
diff --git a/src/modules/overseas-warehouse/permissions.ts b/src/modules/overseas-warehouse/permissions.ts
index 64c2523b..8dcd5cf5 100644
--- a/src/modules/overseas-warehouse/permissions.ts
+++ b/src/modules/overseas-warehouse/permissions.ts
@@ -2,6 +2,7 @@ export const overseasWarehousePermissions = {
   lastMileOrderList: 'platform:overseas-warehouse:last-mile-order:list',
   lastMileOrderExport: 'platform:overseas-warehouse:last-mile-order:export',
   lastMileOrderTransfer: 'platform:overseas-warehouse:last-mile-order:edit',
+  lastMileOrderPalletMerge: 'platform:overseas-warehouse:last-mile-order:edit',
   warehouseTransferApprove: 'platform:overseas-warehouse:warehouse-transfer:approve',
   cargoDiscardApprove: 'lastleg:cargo-discard:approve',
   inboundOrderList: 'platform:overseas-warehouse:inbound-order:list',

From 0cb8a5c2b2392aed6d62ce353b7587e0e2921cd5 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 15:33:10 +0800
Subject: [PATCH 28/47] fix: align appointment procurement and carpool
 workflows with agreed views

---
 .../AppointmentCalendarPanel.test.ts          | 18 +++++-
 .../AppointmentCalendarPanel.vue              | 18 ++++--
 .../AppointmentCalendarView.test.ts           | 32 +++++++++-
 .../AppointmentCalendarView.vue               | 32 ++++++----
 .../AppointmentContainerPanel.vue             | 55 ++++++++++++----
 .../AppointmentImpactDialog.test.ts           | 38 +++++++++++
 .../AppointmentImpactDialog.vue               | 63 +++++++++++++++++++
 .../AppointmentTableRendering.test.ts         | 30 ++++++++-
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  5 ++
 src/modules/appointment-calendar/impactApi.ts | 31 +++++++++
 .../appointment-calendar/planningApi.test.ts  | 10 ++-
 .../appointment-calendar/planningApi.ts       |  2 +
 .../components/ProcurementNodeActions.test.ts | 21 ++++++-
 .../components/ProcurementNodeActions.vue     | 18 +++++-
 .../overseas-master-data/PROTOTYPE_MATRIX.md  |  2 +
 .../components/CapacityInquiryDialog.vue      | 45 +++++++++----
 .../pages/CapacityOffersBehavior.test.ts      | 40 ++++++++++--
 .../pages/CapacityOffersView.vue              |  5 +-
 18 files changed, 407 insertions(+), 58 deletions(-)
 create mode 100644 src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
 create mode 100644 src/modules/appointment-calendar/AppointmentImpactDialog.vue
 create mode 100644 src/modules/appointment-calendar/impactApi.ts

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
index aeec06bc..6d522a2a 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
@@ -10,11 +10,26 @@ describe('appointment calendar interactions', () => {
     global: { stubs: { ElButton: { template: '<button><slot /></button>' } }, directives: { loading: {} } },
   })
 
+  it('hides optional references by default and counts only appointments after enabling them', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: [
+      { key: 'a', type: 'delivery', date: '2026-09-24', time: '09:00', title: '收货预约', fields: [] },
+      { key: 'b', type: 'arrival', date: '2026-09-24', time: '08:00', title: '到港参考', fields: [] },
+      { key: 'c', type: 'trip', date: '2026-09-24', time: '07:00', title: '运输计划', fields: [] },
+    ] })
+    expect(wrapper.findAll('.detail-event')).toHaveLength(1)
+    const switches = wrapper.get('[aria-label="参考图层"]').findAll('input')
+    await switches[0]!.setValue(true); await switches[1]!.setValue(true)
+    expect(wrapper.findAll('.detail-event')).toHaveLength(3)
+    expect(wrapper.get('[aria-label="当天安排"] header').text()).toContain('1 项预约')
+    expect(wrapper.get('[aria-label="当天安排"] header').text()).toContain('2 条参考计划')
+    expect(wrapper.emitted('range')).toBeUndefined()
+  })
   it('selects an already loaded date without requesting data again', async () => {
     const wrapper = render()
     await wrapper.get('[aria-label="2026-09-25，0 项安排"]').trigger('click')
     expect(wrapper.emitted('range')).toBeUndefined()
-    expect(wrapper.get('[aria-label="当天安排"]').text()).toContain('当天暂无到港或送仓预约')
+    expect(wrapper.get('[aria-label="当天安排"]').text()).toContain('当天暂无预约')
   })
 
   it('shows an overnight slot on both days without fetching again and excludes midnight ends', async () => {
@@ -44,6 +59,7 @@ describe('appointment calendar interactions', () => {
       key: `arrival-${index}`, type: 'arrival' as const, date: '2026-09-24', time: '09:00',
       title: `船舶 ${index}`, fields: [],
     })) })
+    await wrapper.get('[aria-label="参考图层"] input').setValue(true)
     for (const view of ['month', 'week']) {
       if (view === 'week') await wrapper.get('[aria-label="预约视图"]').findAll('button')[1]!.trigger('click')
       const day = wrapper.get('[aria-label="2026-09-24，233 项安排"]')
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index 4b44c3a9..493ec391 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -27,18 +27,22 @@ const props = withDefaults(defineProps<{
   initialDate?: string
 }>(), { loading: false, incomplete: false, canCreate: false, initialDate: '' })
 const emit = defineEmits<{
+  layers: [layers: { arrivals: boolean; trips: boolean }]
   range: [range: { from: string; to: string }]
   create: [date: string]
   edit: [event: CalendarEvent]
   delete: [event: CalendarEvent]
   open: [event: CalendarEvent]
 }>()
+const showArrivals = ref(false), showTrips = ref(false)
+function updateLayers() { emit('layers', { arrivals: showArrivals.value, trips: showTrips.value }) }
+const visibleEvents = computed(() => props.events.filter(event => (event.type !== 'arrival' || showArrivals.value) && (event.type !== 'trip' || showTrips.value)))
 const selectedDate = ref(props.initialDate || dateKey(new Date()))
 const mode = ref<CalendarMode>('month')
 const dates = computed(() => calendarDates(selectedDate.value, mode.value))
 const grouped = computed(() => {
   const result = new Map<string, CalendarEvent[]>()
-  for (const event of props.events) {
+  for (const event of visibleEvents.value) {
     for (const date of dates.value) {
       if (!occursOnDate(event.date, event.endAt, date)) continue
       const group = result.get(date) || []
@@ -50,6 +54,7 @@ const grouped = computed(() => {
   return result
 })
 const selectedEvents = computed(() => grouped.value.get(selectedDate.value) || [])
+const appointmentCount = computed(() => selectedEvents.value.filter(event => event.type === 'delivery' || event.type === 'pickup').length)
 const weekdays = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
 const eventTypeLabels = { arrival: '船舶到港', delivery: '预约送仓', pickup: '预约提柜', trip: '用车计划' }
 const heading = computed(() => mode.value === 'month'
@@ -72,11 +77,12 @@ defineExpose({ selectedDate, mode })
 <template>
   <section class="appointment-calendar admin-density" :aria-busy="loading">
     <div class="calendar-main">
+      <div class="calendar-controls" role="group" aria-label="参考图层"><label><input v-model="showArrivals" type="checkbox" @change="updateLayers">显示到港参考</label><label><input v-model="showTrips" type="checkbox" @change="updateLayers">显示用车计划</label></div>
       <header class="calendar-toolbar">
         <div class="calendar-label">
           <svg width="22" height="22" viewBox="0 0 24 24" fill="none" aria-hidden="true"><rect x="3" y="5" width="18" height="16" rx="2" stroke="currentColor" stroke-width="1.8"/><path d="M8 3v4M16 3v4M3 10h18M8 15h3M14 15h3" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/></svg>
           <strong>预约日历</strong>
-          <span class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span><span class="legend trip">用车计划</span>
+          <span v-if="showArrivals" class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span><span v-if="showTrips" class="legend trip">用车计划</span>
         </div>
         <div class="calendar-controls">
           <el-button v-if="canCreate" type="primary" :disabled="loading" @click="emit('create', selectedDate)">＋ 新增预约</el-button>
@@ -94,10 +100,10 @@ defineExpose({ selectedDate, mode })
       <div v-loading="loading" class="calendar-grid" :class="{ 'week-grid': mode === 'week' }">
         <button v-for="date in dates" :key="date" type="button" class="calendar-day"
           :class="{ selected: selectedDate === date, outside: mode === 'month' && date.slice(0, 7) !== selectedDate.slice(0, 7) }"
-          :title="`${date}，${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（部分来源未加载）' : ''}`" :aria-label="`${date}，${(grouped.get(date) || []).length} 项安排${incomplete ? '（部分来源未加载）' : ''}`" :aria-pressed="selectedDate === date" @click="select(date)">
+          :title="`${date}，${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（当前范围不完整）' : ''}`" :aria-label="`${date}，${(grouped.get(date) || []).length} 项安排${incomplete ? '（当前范围不完整）' : ''}`" :aria-pressed="selectedDate === date" @click="select(date)">
           <span class="day-number">{{ mode === 'week' ? `${Number(date.slice(5, 7))}月` : '' }}{{ Number(date.slice(8)) }}</span>
           <span class="day-events">
-            <span v-for="event in (grouped.get(date) || []).slice(0, 3)" :key="event.key" class="event-chip" :class="event.type" :title="`${event.time} ${event.title} · 当天${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（部分来源未加载）' : ''}`">
+            <span v-for="event in (grouped.get(date) || []).slice(0, 3)" :key="event.key" class="event-chip" :class="event.type" :title="`${event.time} ${event.title} · 当天${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（当前范围不完整）' : ''}`">
               {{ event.title }}<small v-if="mode === 'week'">{{ event.time }}</small>
             </span>
             <span v-if="(grouped.get(date) || []).length > 3" class="event-more">还有 {{ (grouped.get(date) || []).length - 3 }} 条</span>
@@ -106,9 +112,9 @@ defineExpose({ selectedDate, mode })
       </div>
     </div>
     <aside class="calendar-detail" aria-label="当天安排">
-      <header><strong>{{ selectedDate }}</strong><p>{{ incomplete ? '当天已加载' : '当天共有' }} <b>{{ selectedEvents.length }}</b> 项安排<span v-if="incomplete">（部分来源未加载）</span></p></header>
+      <header><strong>{{ selectedDate }}</strong><p>{{ incomplete ? '当天已加载' : '当天共有' }} <b>{{ appointmentCount }}</b> 项预约<span v-if="selectedEvents.length > appointmentCount">，{{ selectedEvents.length - appointmentCount }} 条参考计划</span><span v-if="incomplete">（当前范围不完整）</span></p></header>
       <div class="detail-events" aria-live="polite">
-        <p v-if="!selectedEvents.length && !loading" class="empty-day">{{ incomplete ? '部分来源未加载，请重试后确认当天安排' : '当天暂无到港或送仓预约' }}</p>
+        <p v-if="!selectedEvents.length && !loading" class="empty-day">{{ incomplete ? '当前范围内暂无预约；请按上方提示核对缺失资料或失败来源' : '当天暂无预约' }}</p>
         <article v-for="event in selectedEvents" :key="event.key" class="detail-event">
           <div class="event-heading"><span class="event-type" :class="event.type">{{ eventTypeLabels[event.type] }}</span><span>{{ event.time || '—' }}</span></div>
           <h3>{{ event.title }}</h3><p v-if="event.subtitle" class="event-subtitle">{{ event.subtitle }}</p>
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 283b1b26..a7e0d4f6 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -27,10 +27,11 @@ const candidates = [
   { lineId: '9007199254740993', customerId: 'A', overseasWarehouseId: '100', fbaWarehouseCode: 'ONT8', planId: '1', planNo: 'IN-A', orderId: '10' },
   { lineId: '9007199254740994', customerId: 'B', overseasWarehouseId: '100', fbaWarehouseCode: 'ONT8', planId: '2', planNo: 'IN-B', orderId: '20' },
 ]
-function render() {
-  return mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
+function render(openCalendar = true) {
+  const wrapper = mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
     AdminPage: { template: '<main><slot /></main>' },
-    AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', props: ['events', 'incomplete'], template: '<button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button>' },
+    AppointmentContainerPanel: true,
+    AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', mounted() { this.$emit('layers', { arrivals: true, trips: true }) }, props: ['events', 'incomplete'], template: '<button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button>' },
     AppDialog: { props: ['modelValue'], template: '<div v-if="modelValue"><slot /><button data-save @click="$emit(\'confirm\')">保存</button></div>' },
     ElForm: { template: '<form><slot /></form>' },
     ElFormItem: { template: '<label><slot /></label>' },
@@ -42,6 +43,8 @@ function render() {
     DataTable: { name: 'DataTable', props: ['data'], template: '<div><slot name="toolbar-actions" /><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
     LoadErrorState: true, ApiErrorMeta: true, AppointmentFollowupDialog: true, AppointmentCargoPanel: { name: 'AppointmentCargoPanel', props: ['externalSource'], template: '<div>合批工作区</div>' },
   } } })
+  if (openCalendar) void wrapper.findAll('button').find(button => button.text() === '预约日历')!.trigger('click')
+  return wrapper
 }
 
 describe('appointment calendar data integration', () => {
@@ -58,6 +61,25 @@ describe('appointment calendar data integration', () => {
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
+  it('keeps exactly the documented three work views and defaults to the container list without calendar requests', async () => {
+    const wrapper = render(false); await flushPromises()
+    const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
+    expect(tabs.map(button => button.text())).toEqual(['提柜与到仓', '送仓与排车', '预约日历'])
+    expect(tabs[0]!.attributes('aria-pressed')).toBe('true')
+    expect(wrapper.text()).toContain('美国预约总览')
+    expect(listFbaAppointmentCalendar).not.toHaveBeenCalled()
+    expect(listArrivalCalendar).not.toHaveBeenCalled()
+    await tabs[2]!.trigger('click'); await flushPromises()
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+    await tabs[0]!.trigger('click'); await tabs[2]!.trigger('click'); await flushPromises()
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+  })
+  it('distinguishes missing country data from truncation instead of suggesting a narrower date range', async () => {
+    vi.mocked(listPickupCalendar).mockResolvedValueOnce({ records: [], truncated: false, unclassifiedCount: 74, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED' })
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.text()).toContain('74 条提柜记录')
+    expect(wrapper.text()).not.toContain('缩小日期范围')
+  })
   it('shows the original pickup time once without claiming a port time zone and retains partial-source warnings', async () => {
     vi.mocked(listPickupCalendar).mockResolvedValueOnce({records: [{containerBookingId: '123',bookingNo: 'CB-TEST',containerNo: 'TEST-CONT',destinationPortName: 'Port',destinationWarehouseCode: 'US-W',fleetSupplierName: 'Fleet',pickupAppointmentAt: '2026-10-09T11:00:00',actualPickupAt: null}],truncated: false,unclassifiedCount: 1,scopeBasis: 'US_DESTINATION_WAREHOUSE',timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'})
     const wrapper=render(); await flushPromises()
@@ -119,6 +141,7 @@ describe('appointment calendar data integration', () => {
   })
   it('only searches active FBA warehouses and loads cargo automatically after selection', async () => {
     const wrapper = render()
+    await flushPromises()
     await wrapper.get('[data-create]').trigger('click')
     await flushPromises()
     expect(listPlatformWarehouses).toHaveBeenCalledWith(expect.objectContaining({ warehouseType: 'FBA', status: 'ACTIVE', size: 50 }))
@@ -153,6 +176,7 @@ describe('appointment calendar data integration', () => {
 
   it('changing or clearing the warehouse clears prior cargo selection and blocks saving it', async () => {
     const wrapper = render()
+    await flushPromises()
     await wrapper.get('[data-create]').trigger('click')
     await flushPromises()
     await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
@@ -170,6 +194,7 @@ describe('appointment calendar data integration', () => {
     let resolveOld!: (value: Awaited<ReturnType<typeof listInboundOrders>>) => void
     vi.mocked(listInboundOrders).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
     const wrapper = render()
+    await flushPromises()
     await wrapper.get('[data-create]').trigger('click')
     await flushPromises()
     await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
@@ -183,6 +208,7 @@ describe('appointment calendar data integration', () => {
 
   it('searches by keyword and exposes warehouse failures without accepting free text', async () => {
     const wrapper = render()
+    await flushPromises()
     await wrapper.get('[data-create]').trigger('click')
     await flushPromises()
     const select = wrapper.findAllComponents({ name: 'ElSelect' }).find(item => item.props('remoteMethod'))!
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index a2f948dd..ff7679f2 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -35,9 +35,14 @@ const selectedSource = ref<PlanningSource | null>(null)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkLoading = ref(false)
 let linkRequest = 0
-const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
+const workView = ref<'calendar' | 'cargo' | 'containers'>('containers')
+const calendarVisited = ref(false)
+const showTripLayer = ref(false)
 const cargoVisited = ref(false)
-watch(workView, value => { if (value === 'cargo') cargoVisited.value = true })
+watch(workView, value => {
+  if (value === 'cargo') cargoVisited.value = true
+  if (value === 'calendar' && !calendarVisited.value) { calendarVisited.value = true; void load(); void loadUnscheduled() }
+})
 const appointments = ref<FbaAppointmentDto[]>([])
 const arrivals = ref<ArrivalCalendarEntry[]>([])
 const pickups = ref<PickupCalendarEntry[]>([])
@@ -180,7 +185,7 @@ async function load(nextRange = range.value) {
     else sourceErrors.value.push({ title: '船舶到港加载失败', details: getApiErrorDetails(arrivalResult.reason, '船舶到港加载失败') })
     if (pickupResult.status === 'fulfilled' && pickupResult.value) {
       pickups.value = pickupResult.value.records
-      if (pickupResult.value.truncated || Number(pickupResult.value.unclassifiedCount) > 0) pickupNotice.value = '提柜来源有超出数量上限或目的仓国家待核实的记录，当前统计不完整，请缩小日期范围或完善仓库资料。'
+      pickupNotice.value = [pickupResult.value.truncated ? '提柜安排超出读取上限，请缩小日期范围。' : '', Number(pickupResult.value.unclassifiedCount) > 0 ? `有 ${Number(pickupResult.value.unclassifiedCount)} 条提柜记录的目的仓国家待核实，请完善仓库资料后重新核对；这些记录未计入当前范围。` : ''].filter(Boolean).join(' ')
     } else if (pickupResult.status === 'rejected') sourceErrors.value.push({ title: '提柜预约加载失败', details: getApiErrorDetails(pickupResult.reason, '提柜预约加载失败') })
     if (tripResult.status === 'fulfilled' && tripResult.value) {
       const projection = projectTripCalendar(tripResult.value, nextRange)
@@ -364,30 +369,33 @@ function arrangeLinkedSource() {
 }
 watch(() => [route.query.sourceKey, route.query.customerId, route.query.destinationKey], resolveLink, { immediate: true })
 
-onMounted(() => { void load(); void loadUnscheduled() })
+onMounted(() => { if (!access.can(permission.lastMileOrderList)) workView.value = 'calendar' })
 onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequest; ++detailRequest; ++warehouseRequest; ++linkRequest; calendarController?.abort() })
 </script>
 
 <template>
-  <AdminPage class="admin-density">
+  <AdminPage class="admin-density" spacing="compact">
     <p v-if="linkLoading">正在核对预约货源…</p>
     <LoadErrorState v-if="linkError" title="预约货源核对失败" :message="linkError.message" :loading="linkLoading" @retry="resolveLink" />
     <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(permission.inboundOrderAppointment)" @arrange="arrangeLinkedSource" @close="linkedSource = null" />
+    <div class="appointment-heading">
+    <h2 class="density-detail-title">美国预约总览</h2>
     <div class="density-status-tabs" role="group" aria-label="预约工作视图">
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">提柜与到仓</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">送仓与排车</button>
       <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
-      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">整柜提柜与接仓</button>
-      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">货物与预约合批</button>
+    </div>
     </div>
     <div v-if="cargoVisited" v-show="workView === 'cargo'"><AppointmentCargoPanel :external-source="selectedSource" @source-accepted="selectedSource = null" @created="load(); loadUnscheduled()" /></div>
     <AppointmentContainerPanel v-if="workView === 'containers'" />
-    <div v-show="workView === 'calendar'">
+    <div v-if="calendarVisited" v-show="workView === 'calendar'">
     <LoadErrorState v-if="loadError" :title="errorTitle" :message="loadError.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
     <p v-if="pickupNotice" role="status">{{ pickupNotice }}</p>
-    <p v-if="tripNotice" role="status">{{ tripNotice }}</p>
-    <details v-if="unresolvedTrips.length" class="appointment-extra">
+    <p v-if="showTripLayer && tripNotice" role="status">{{ tripNotice }}</p>
+    <details v-if="showTripLayer && unresolvedTrips.length" class="appointment-extra">
       <summary>待核实地点的车次（{{ unresolvedTrips.length }}）</summary>
       <p>检索窗口内的车次，尚无法确定当地日期。原计划时间保留 UTC，不用浏览器时区换算。</p>
       <DataTable v-model:page="unresolvedPage" v-model:page-size="unresolvedSize" :data="unresolvedRows" :columns="unresolvedColumns" :total="unresolvedTrips.length" row-key="tripNo" @update:page-size="unresolvedPage = 1">
@@ -395,7 +403,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         <template #issues="{ row }">{{ tripIssues(row as TripCalendarEntry) }}</template>
       </DataTable>
     </details>
-    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || !!tripNotice" :can-create="access.can(permission.inboundOrderAppointment)" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource" />
+    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource" />
     </div>
     <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
@@ -429,6 +437,8 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
 </template>
 
 <style scoped>
+.appointment-heading { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-5); }
+.appointment-heading .density-status-tabs { flex: 1; margin: 0; }
 .calendar-form { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 var(--admin-space-6); }
 .calendar-form :deep(.el-select), .calendar-form :deep(.el-date-editor) { width: 100%; }
 .appointment-cargo { padding: 12px 0; line-height: 1.7; overflow-wrap: anywhere; font-size: 13px; }
diff --git a/src/modules/appointment-calendar/AppointmentContainerPanel.vue b/src/modules/appointment-calendar/AppointmentContainerPanel.vue
index f2d37cea..1b5a1e5d 100644
--- a/src/modules/appointment-calendar/AppointmentContainerPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentContainerPanel.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { onBeforeUnmount, onMounted, ref, computed } from 'vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -8,7 +8,11 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlanningContainers, resolvePlanningContainer, type PlanningContainer, type ContainerFollowupContext } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import AppointmentImpactDialog from './AppointmentImpactDialog.vue'
+import { listImpacts, refreshImpacts, impactStatus } from './impactApi'
 
+const impactReady = ref(false), impactError = ref<ApiErrorDetails | null>(null)
+const impactId = ref<string | null>(null), refreshing = ref(false), onlyChanges = ref(false)
 const access = useAccessPreviewStore()
 const query = ref<QueryModel>({ keyword: '' })
 const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '整柜', placeholder: '柜号或入仓码', width: 300 }]
@@ -16,26 +20,44 @@ const rows = ref<PlanningContainer[]>([]), page = ref(1), size = ref(20), total
 const loading = ref(false), opening = ref(false)
 const error = ref<ApiErrorDetails | null>(null), contextError = ref<ApiErrorDetails | null>(null)
 const context = ref<ContainerFollowupContext | null>(null)
+const changedCount = computed(() => rows.value.filter(row => row.impact?.status === 'OPEN').length)
+const displayedRows = computed(() => onlyChanges.value ? rows.value.filter(row => row.impact?.status === 'OPEN') : rows.value)
+async function refreshForecasts() {
+  refreshing.value = true; contextError.value = null
+  try { await refreshImpacts({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }); await load() }
+  catch (cause) { contextError.value = getApiErrorDetails(cause, '船期核对未完成，原记录保留') }
+  finally { refreshing.value = false }
+}
 let request = 0, contextRequest = 0, controller: AbortController | undefined
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', slotName: 'actions', width: 130, fixed: 'left' },
+  { key: 'actions', label: '操作', slotName: 'actions', width: 200, fixed: 'left' },
   { prop: 'containerNo', label: '集装箱号', minWidth: 170 },
   { prop: 'orderCount', label: '美国范围票数', width: 120 },
   { prop: 'customerCount', label: '客户数', width: 90 },
   { key: 'packages', label: '预报箱数', slotName: 'packages', width: 130 },
   { key: 'arrival', label: '来源预计到港', slotName: 'arrival', minWidth: 200 },
   { key: 'receiving', label: '接仓点及跟进', slotName: 'receiving', minWidth: 280, singleLine: false },
+  { key: 'impact', label: '船期跟进', slotName: 'impact', minWidth: 160 },
+  { key: 'owner', label: '负责人', slotName: 'owner', minWidth: 110 },
   { key: 'scope', label: '范围核对', slotName: 'scope', minWidth: 200 },
 ]
 async function load(reset = false) {
   if (reset) page.value = 1
   const current = ++request
   controller?.abort(); controller = new AbortController()
-  loading.value = true; error.value = null
+  loading.value = true; error.value = null; impactReady.value = false; impactError.value = null
   try {
-    const result = await listPlanningContainers({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }, controller.signal)
+    const params = { page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }
+    const [cargo, impacts] = await Promise.allSettled([listPlanningContainers(params, controller.signal), listImpacts(params, controller.signal)])
     if (current !== request) return
-    rows.value = result.records; total.value = result.total
+    if (cargo.status === 'rejected') throw cargo.reason
+    rows.value = cargo.value.records; total.value = cargo.value.total
+    if (impacts.status === 'fulfilled') {
+      const states = new Map(impacts.value.records.map(row => [row.container.containerBookingId, row.impact]))
+      rows.value = rows.value.map(row => ({ ...row, impact: states.get(row.containerBookingId) || null }))
+      impactReady.value = true
+    } else { onlyChanges.value = false; impactError.value = getApiErrorDetails(impacts.reason, '船期跟进暂不可用') }
+
   } catch (cause) { if (current === request) { error.value = getApiErrorDetails(cause, '整柜货源加载失败'); rows.value = []; total.value = 0 } }
   finally { if (current === request) loading.value = false }
 }
@@ -54,22 +76,33 @@ onBeforeUnmount(() => { ++request; ++contextRequest; controller?.abort() })
 </script>
 
 <template>
-  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="containerBookingId" @update:page="load()" @update:page-size="load(true)">
-    <template #filters><QueryToolbar v-model="query" ariaLabel="整柜提柜与接仓查询" :fields="fields" :loading="loading" @search="load(true)" /></template>
+  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="displayedRows" :total="total" :loading="loading || refreshing" :results-visible="!error" row-key="containerBookingId" @update:page="load()" @update:page-size="load(true)">
+    <template #filters><QueryToolbar v-model="query" ariaLabel="提柜与到仓查询" :fields="fields" :loading="loading" @search="load(true)">
+      <template #actions>
+        <el-button v-if="impactReady" :type="onlyChanges ? 'primary' : 'default'" @click="onlyChanges = !onlyChanges">本页待处理 {{ changedCount }}</el-button>
+        <el-button v-if="impactReady && access.can('platform:appointment:followup')" :loading="refreshing" :disabled="loading" @click="refreshForecasts">核对船期</el-button>
+      </template>
+    </QueryToolbar></template>
     <template #notices>
-      <LoadErrorState v-if="error" title="整柜货源加载失败" :message="error.message" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-      <LoadErrorState v-if="contextError" title="整柜范围核对失败" :message="contextError.message" :show-retry="false"><template #details><ApiErrorMeta :details="contextError" /></template></LoadErrorState>
-      <p>同柜多客户只记录一份提柜跟进；接仓按实际仓库分别跟进。预计到港为来源快照，不是对方确认时间。</p>
+      <LoadErrorState v-if="error" compact title="货柜列表暂时无法加载" :message="error.code === 'A0404' ? '列表服务暂不可用，请稍后重试。' : error.message" @retry="load()"><template #details><details><summary>诊断详情</summary><ApiErrorMeta :details="error" /></details></template></LoadErrorState>
+      <LoadErrorState v-if="contextError" compact title="操作未完成" :message="contextError.message" :show-retry="false"><template #details><details><summary>诊断详情</summary><ApiErrorMeta :details="contextError" /></details></template></LoadErrorState>
+      <details v-if="impactError" class="container-help"><summary>船期跟进暂不可用，货柜列表仍可查看</summary><ApiErrorMeta :details="impactError" /></details>
+      <details v-if="!error" class="container-help"><summary>说明</summary><p>同柜共用提柜跟进，接仓按仓库分别跟进。预计到港仅供参考。</p></details>
     </template>
-    <template #actions="{ row }"><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer)">提柜跟进</el-button></template>
+    <template #actions="{ row }"><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer)">提柜跟进</el-button><el-button v-if="row.impact" link type="primary" @click="impactId = row.containerBookingId">{{ row.impact.status === 'OPEN' ? '处理船期变化' : '核对记录' }}</el-button></template>
     <template #packages="{ row }">{{ row.packages ?? '待核实' }}</template>
     <template #arrival="{ row }">{{ displayTime(row.earliestArrivalAt) }}<span v-if="row.latestArrivalAt && row.latestArrivalAt !== row.earliestArrivalAt"> 至 {{ displayTime(row.latestArrivalAt) }}</span></template>
     <template #receiving="{ row }"><div v-for="warehouse in row.warehouses" :key="warehouse.warehouseId" class="receiving-row"><span>{{ warehouse.warehouseName }} · {{ warehouse.orderCount }} 票</span><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer, warehouse.warehouseId)">接仓跟进</el-button></div></template>
+    <template #impact="{ row }">{{ row.impact ? impactStatus[row.impact.status] : (impactReady ? '未核对' : '暂不可用') }}</template>
+    <template #owner="{ row }">{{ row.impact?.ownerName || '未认领' }}</template>
     <template #scope="{ row }">{{ row.incompleteScope ? '有未明确或非美国接仓点，待核对' : '接仓点已核实' }}</template>
   </DataTable>
+  <AppointmentImpactDialog v-if="impactId" :container-id="impactId" :can-write="access.can('platform:appointment:followup')" @close="impactId = null" @saved="load()" />
   <AppointmentFollowupDialog v-if="context" :container="context" :can-write="access.can('platform:appointment:followup')" @close="context = null" />
 </template>
 
 <style scoped>
+.container-help { font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.container-help summary { cursor: pointer; }
 .receiving-row { display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-3); }
 </style>
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
new file mode 100644
index 00000000..9ddc3d72
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
@@ -0,0 +1,38 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import ElementPlus from 'element-plus'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentImpactDialog from './AppointmentImpactDialog.vue'
+import { getImpact, handleImpact, type ImpactDetail } from './impactApi'
+vi.mock('./impactApi', async importOriginal => ({ ...await importOriginal<typeof import('./impactApi')>(), getImpact: vi.fn(), handleImpact: vi.fn() }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+const detail: ImpactDetail = { impact: { containerBookingId: '1', impactNo: 'AI-TEST', version: 1, status: 'OPEN', reason: 'FORECAST_CHANGED', ownerId: null, ownerName: null, baseline: { estimatedAt: '2026-10-15T09:00:00', actualAt: null, observedAt: null, providerCode: 'carrier', sourceReference: 'ref' }, latest: { estimatedAt: '2026-10-17T09:00:00', actualAt: null, observedAt: null, providerCode: 'carrier', sourceReference: 'ref' }, forecastToken: 'current', updatedAt: '2026-10-10T12:00:00' }, cargo: [{ inboundCode: 'IN-A', customerName: '客户甲', packages: 10, destination: 'ONT8' }], appointments: [{ appointmentNo: 'AP-1', status: 'SUCCESS', destination: 'ONT8', confirmedAt: '2026-10-16T09:00:00', timezone: 'America/Los_Angeles' }], transport: null, history: { records: [], total: 0 } }
+const render = (canWrite = true) => mount(AppointmentImpactDialog, { props: { containerId: '1', canWrite }, global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button></section>' } } } })
+describe('appointment impact handling', () => {
+  beforeEach(() => { vi.resetAllMocks(); vi.mocked(getImpact).mockResolvedValue(detail) })
+  it('shows separate forecasts, unchanged confirmed appointment and omitted transport permission', async () => {
+    const wrapper = render(false); await flushPromises()
+    expect(wrapper.text()).toContain('2026-10-15T09:00:00')
+    expect(wrapper.text()).toContain('2026-10-17T09:00:00')
+    expect(wrapper.text()).toContain('2026-10-16T09:00:00')
+    expect(wrapper.text()).toContain('无车次查看权限')
+    expect(wrapper.text()).not.toContain('认领跟进')
+    expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
+  })
+  it('freezes an uncertain command and retries exactly once with original version and key', async () => {
+    vi.mocked(handleImpact).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({ ...detail.impact, version: 2 })
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button').find(b => b.text() === '认领跟进')!.trigger('click'); await flushPromises()
+    const original = vi.mocked(handleImpact).mock.calls[0]![1]
+    expect(original).toMatchObject({ action: 'CLAIM', expectedVersion: 1, forecastToken: 'current' })
+    await wrapper.get('[data-close]').trigger('click'); expect(wrapper.emitted('close')).toBeUndefined()
+    await wrapper.findAll('button').find(b => b.text() === '重试本次处理')!.trigger('click'); await flushPromises()
+    expect(handleImpact).toHaveBeenNthCalledWith(2, '1', original)
+    expect(wrapper.emitted('saved')).toHaveLength(1)
+    expect(getImpact).toHaveBeenCalledTimes(2); wrapper.unmount()
+  })
+  it('does not resolve without an actual handling result', async () => {
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button').find(b => b.text() === '完成本次核对')!.trigger('click'); await flushPromises()
+    expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
+  })
+})
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.vue b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
new file mode 100644
index 00000000..8bf0cdc7
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import { onMounted, reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getImpact, handleImpact, impactStatus, type ImpactDetail, type ImpactCommand } from './impactApi'
+const props = defineProps<{ containerId: string; canWrite: boolean }>()
+const emit = defineEmits<{ close: []; saved: [] }>()
+const router = useRouter(), detail = ref<ImpactDetail | null>(null), loading = ref(false), saving = ref(false), historyPage = ref(1)
+const error = ref<ApiErrorDetails | null>(null), pending = ref<ImpactCommand | null>(null)
+const form = reactive({ result: '', nextAction: '', followupDate: '' })
+const actions: Record<string, string> = { OBSERVED: '船期核对', CLAIM: '认领', RECORD: '记录处理', RESOLVE: '完成核对' }
+async function load() {
+  loading.value = true; error.value = null
+  try { detail.value = await getImpact(props.containerId, historyPage.value) }
+  catch (cause) { error.value = getApiErrorDetails(cause, '影响详情加载失败') }
+  finally { loading.value = false }
+}
+async function save(action: ImpactCommand['action']) {
+  if (!detail.value || saving.value || !props.canWrite) return
+  if (!pending.value && action !== 'CLAIM' && !form.result.trim()) { ElMessage.warning('请填写实际处理结果'); return }
+  pending.value ||= { expectedVersion: detail.value.impact.version, forecastToken: detail.value.impact.forecastToken, idempotencyKey: crypto.randomUUID(), action, result: form.result.trim() || null, nextAction: form.nextAction.trim() || null, followupDate: form.followupDate || null }
+  saving.value = true; error.value = null
+  try { await handleImpact(props.containerId, pending.value); pending.value = null; emit('saved'); historyPage.value = 1; await load() }
+  catch (cause) { error.value = getApiErrorDetails(cause, '处理结果待核实，请重试原请求'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null }
+  finally { saving.value = false }
+}
+function close() { if (saving.value || pending.value) { ElMessage.warning('请先核实本次处理结果，再关闭'); return } emit('close') }
+onMounted(load)
+</script>
+<template>
+  <AppDialog :model-value="true" title="船期变化影响核对" width="min(1200px, calc(100vw - 48px))" :show-confirm="false" class="admin-density-dialog" @update:model-value="close">
+    <LoadErrorState v-if="error" title="核对未完成" :message="error.message" :show-retry="!pending" @retry="load" />
+    <template v-if="detail">
+      <p>{{ detail.impact.impactNo }} · {{ impactStatus[detail.impact.status] }} · 负责人：{{ detail.impact.ownerName || '未认领' }}</p>
+      <p>基准 ETA：{{ detail.impact.baseline?.estimatedAt || '待核实' }} → 最新 ETA：{{ detail.impact.latest?.estimatedAt || '待核实' }}</p>
+      <p>来源：{{ detail.impact.latest?.providerCode || '待核实' }} · {{ detail.impact.latest?.sourceReference || '—' }} · 观察时间：{{ detail.impact.latest?.observedAt || '—' }}</p>
+      <p>实际到港：{{ detail.impact.latest?.actualAt || '未记录' }}。以上为来源原始时间，时区未核实；不能据此判定跨时区违约。</p>
+      <details open><summary>直接关联货物 {{ detail.cargo.length }} 票</summary><div class="impact-list"><p v-for="(row, index) in detail.cargo" :key="index">{{ row.inboundCode || '未关联入仓码' }} · {{ row.customerName || '—' }} · {{ row.destination || '—' }} · {{ row.packages ?? '待核实' }} 箱</p></div></details>
+      <details open><summary>需复核的收货预约 {{ detail.appointments.length }} 张（确认时间不自动修改）</summary><div class="impact-list"><p v-for="row in detail.appointments" :key="row.appointmentNo">{{ row.appointmentNo }} · {{ row.destination }} · {{ row.confirmedAt || '尚未确认时段' }} {{ row.timezone || '时区待核实' }}</p></div></details>
+      <p v-if="!detail.transport">无车次查看权限，运输影响未加载。</p>
+      <template v-else>
+        <details open><summary>关联车次 {{ detail.transport.trips.length }} 辆</summary><div class="impact-list"><p v-for="row in detail.transport.trips" :key="row.tripNo"><el-button link type="primary" @click="router.push(`/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`)">{{ row.tripNo }}</el-button> · 计划出发（UTC）：{{ row.plannedDepartureAt || '待定' }}</p></div></details>
+        <details><summary>同车外接承诺 {{ detail.transport.sameTripBookings.length }} 票，仅提示运输安排复核</summary><div class="impact-list"><p v-for="row in detail.transport.sameTripBookings" :key="row.bookingNo">{{ row.bookingNo }} · {{ row.customerName || '—' }} · {{ row.tripNo }} · {{ row.destinationLabel || '—' }}</p></div></details>
+      </template>
+      <el-form v-if="canWrite && detail.impact.status === 'OPEN'" label-position="top" :disabled="saving || !!pending">
+        <el-form-item label="实际处理结果"><el-input v-model="form.result" type="textarea" maxlength="1000" placeholder="记录已联系、核对或改约的实际结果；此处不会自动改约" /></el-form-item>
+        <el-form-item label="下一步"><el-input v-model="form.nextAction" maxlength="500" placeholder="填写后续处理事项" /></el-form-item>
+        <el-form-item label="下次跟进日期"><el-date-picker v-model="form.followupDate" value-format="YYYY-MM-DD" /></el-form-item>
+      </el-form>
+      <div v-if="canWrite && detail.impact.status === 'OPEN'">
+        <el-button v-if="!pending" :disabled="saving || loading" @click="save('CLAIM')">认领跟进</el-button>
+        <el-button v-if="!pending" :disabled="saving || loading" @click="save('RECORD')">记录处理</el-button>
+        <el-button v-if="!pending" type="primary" :disabled="saving || loading" @click="save('RESOLVE')">完成本次核对</el-button>
+        <el-button v-else type="primary" :loading="saving" @click="save(pending.action)">重试本次处理</el-button>
+      </div>
+      <details><summary>观察及处理历史（{{ detail.history.total }} 条）</summary><div class="impact-list"><p v-for="row in detail.history.records" :key="row.version">{{ actions[row.action] || '核对记录' }} · {{ row.operatorName || '—' }} · {{ row.createdAt }} UTC<br>{{ row.result || '记录来源观察' }} · {{ row.nextAction || '—' }} · {{ row.followupDate || '—' }}</p></div><el-pagination v-model:current-page="historyPage" :page-size="20" :total="detail.history.total" layout="prev, pager, next" :disabled="saving || !!pending" @current-change="load" /></details>
+    </template>
+  </AppDialog>
+</template>
+<style scoped>.impact-list { max-height: 220px; overflow-y: auto; overflow-wrap: anywhere; }</style>
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index c3b3fb19..84b81833 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -1,10 +1,12 @@
 import ElementPlus from 'element-plus'
+import { listImpacts } from './impactApi'
+vi.mock('./impactApi', async original => ({ ...await original<typeof import('./impactApi')>(), listImpacts: vi.fn(), refreshImpacts: vi.fn() }))
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { listExternalAppointmentCandidates, getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningSource } from './planningApi'
+import { listExternalAppointmentCandidates, getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningContainer, type PlanningSource } from './planningApi'
 
 vi.mock('./planningApi', () => ({ listExternalAppointmentCandidates: vi.fn(), listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn(), createSourceAppointment: vi.fn() }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
@@ -14,7 +16,13 @@ const cargo: PlanningCargo = { sourceKey: source.sourceKey, customerId: 'A', cus
 const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }
 
 describe('appointment tables use actual shared table slots', () => {
-  beforeEach(() => vi.resetAllMocks())
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(listImpacts).mockImplementation(async () => {
+      const page = await vi.mocked(listPlanningContainers).mock.results.at(-1)!.value
+      return { total: page.total, records: page.records.map((container: PlanningContainer) => ({ container, impact: container.impact || null })) }
+    })
+  })
   it('discovers external candidates lazily and mixes original bookings with selected first-leg cargo', async () => {
     vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
     const external: PlanningSource = { ...source, sourceKey: 'BOOKING:B-1', customerId: 'B', orderId: null, inboundCode: null, bookingNo: 'B-1', packages: null }
@@ -76,12 +84,28 @@ describe('appointment tables use actual shared table slots', () => {
     expect(wrapper.text()).toContain('保存前尚未占用货物')
     wrapper.unmount()
   })
+  it('keeps the cargo list usable when impact service is unavailable and never reports a false zero', async () => {
+    vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [] }] })
+    vi.mocked(listImpacts).mockRejectedValueOnce(new Error('Resource not found'))
+    const wrapper = mount(AppointmentContainerPanel, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    expect(wrapper.findAll('.el-table__body-wrapper .el-table__row')).toHaveLength(1)
+    expect(wrapper.text()).toContain('CONTAINER-A')
+    expect(wrapper.text()).toContain('船期跟进暂不可用，货柜列表仍可查看')
+    expect(wrapper.text()).not.toContain('本页待处理 0')
+    expect(wrapper.find('[role="alert"]').exists()).toBe(false)
+    expect(wrapper.findAll('details').every(node => node.attributes('open') === undefined)).toBe(true)
+    expect(listPlanningContainers).toHaveBeenCalledTimes(1); expect(listImpacts).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
+  })
   it('renders one shared container and resolves each receiving warehouse without per-row requests', async () => {
-    vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [{ warehouseId: '100', warehouseName: '洛杉矶仓', orderCount: 20, customerCount: 12 }] }] })
+    vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ impact: { containerBookingId: 'C1', impactNo: 'AI-T', version: 1, status: 'OPEN', reason: 'FORECAST_CHANGED', ownerId: 'A', ownerName: '运营甲', baseline: null, latest: null, forecastToken: 'x', updatedAt: '2026-10-10T00:00:00' }, containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [{ warehouseId: '100', warehouseName: '洛杉矶仓', orderCount: 20, customerCount: 12 }] }] })
     vi.mocked(resolvePlanningContainer).mockResolvedValue({ containerBookingId: 'C1', containerNo: 'CONTAINER-A', warehouseId: '100', warehouseName: '洛杉矶仓', canFollowup: true, blockReasons: [] })
     const wrapper = mount(AppointmentContainerPanel, { global: { plugins: [ElementPlus], stubs: { AppointmentFollowupDialog: true } } })
     await flushPromises()
     expect(listPlanningContainers).toHaveBeenCalledTimes(1)
+    expect(wrapper.text()).toContain('本页待处理 1')
+    expect(wrapper.text()).toContain('处理船期变化')
+    expect(wrapper.text()).toContain('运营甲')
     expect(resolvePlanningContainer).not.toHaveBeenCalled()
     const rows = wrapper.findAll('.el-table__body-wrapper .el-table__row')
     expect(rows).toHaveLength(1)
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index 90609b6c..ded07831 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -23,9 +23,14 @@
 | 提柜日历 | 美国业务预约统一总览 | 读取原码头提柜预约，一柜一条，点击查看来源进入清关提柜详情；按美国目的仓确认业务范围，不等于确认港口国家。保留原业务日期，明确港口时区待核实，不套用目的仓时区；未知目的仓及截断显示统计不完整。无提柜权限不请求该来源并提示范围缺失 |
 | 用车计划日历 | 统一总览的真实车次只读来源 | 一车一条，计划与实际出发分开，司机预计结束不当送货完成。查询一次带跨时区余量的UTC窗口，按起运仓地点时区筛回42个当地日；缺国家/时区的记录独立分页待核实，不放入每日格。路线最多3站摘要，完整路线进入原车次；不请求逐车详情，不在预约页创建车次或重算余位 |
 | 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
+| 船期变化影响与处理 | 统一方案第十节场景16，旧/新预测、下游影响、负责人及结果闭环 | 并入提柜与到仓的货柜列表，不设第四工作视图；行内处理船期变化，本页待办计数明确标识范围；显式本页批量核对，不逐柜轮询。1200px居中详情展示直接货物/预约、关联车次与同车待复核承诺；各明细220px内滚动，历史服务端分页。认领及结果表单复用现有控件；未知提交保留原命令并禁止关闭，已确认预约不因核对动作改变。待1920×1080真实验收 |
 
 结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约、到港及有权限的提柜、车次来源各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
 
 本轮视觉验收：待人工1920×1080截图确认。
 
 视觉验收目标为1920×1080、100%缩放。该矩阵描述设计和代码边界，不代替测试环境浏览器验收证据。
+
+按用户确认收敛：主视图仅提柜与到仓、送仓与排车、预约日历，默认有权限的列表视图；日历首次进入才加载。到港参考、用车计划默认隐藏，可独立开关，不计入预约数量；缺国家资料与查询超限分开提示。送仓与排车目前仍以选货合批为主，目的仓货量汇总及7/14/30天窗口尚未完成，不因标题调整宣称完成。
+
+用户截图密度修正：业务标题复用density-detail-title并与三视图同行，不独占大标题区；船期操作并入查询栏，不单独占空白工具栏。常驻业务解释改为默认折叠“说明”；错误保留重试，诊断信息默认折叠。基础货柜与船期状态独立读取，后者失败不阻断货柜列表、不展示假的零待办。
diff --git a/src/modules/appointment-calendar/impactApi.ts b/src/modules/appointment-calendar/impactApi.ts
new file mode 100644
index 00000000..e47bc540
--- /dev/null
+++ b/src/modules/appointment-calendar/impactApi.ts
@@ -0,0 +1,31 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { PlanningContainer } from './planningApi'
+
+export interface ForecastFact { estimatedAt: string | null; actualAt: string | null; observedAt: string | null; providerCode: string | null; sourceReference: string | null }
+export interface Impact { containerBookingId: string; impactNo: string; version: number; status: string; reason: string | null; ownerName: string | null; ownerId: string | null; baseline: ForecastFact | null; latest: ForecastFact | null; forecastToken: string; updatedAt: string }
+export interface ImpactRow { container: PlanningContainer; impact: Impact | null }
+export interface ImpactDetail {
+  impact: Impact
+  cargo: Array<{ inboundCode: string | null; customerName: string | null; packages: number | null; destination: string | null }>
+  appointments: Array<{ appointmentNo: string; status: string; destination: string; confirmedAt: string | null; timezone: string | null }>
+  transport: { trips: Array<{ tripNo: string; status: string; plannedDepartureAt: string | null }>; sameTripBookings: Array<{ tripNo: string; bookingNo: string; customerName: string | null; destinationLabel: string | null; status: string }> } | null
+  history: { records: Array<{ version: number; action: string; operatorName: string | null; result: string | null; nextAction: string | null; followupDate: string | null; createdAt: string }>; total: number }
+}
+export interface ImpactCommand { expectedVersion: number; forecastToken: string; idempotencyKey: string; action: 'CLAIM' | 'RECORD' | 'RESOLVE'; result: string | null; nextAction: string | null; followupDate: string | null }
+const base = '/platform/v1/last-leg/appointment-planning/impacts'
+export async function listImpacts(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{ records: ImpactRow[]; total: number }>, ApiEnvelope<{ records: ImpactRow[]; total: number }>>(base, { params: query, signal }))
+  return { ...result, total: Number(result.total) }
+}
+export async function refreshImpacts(query: { page: number; size: number; keyword?: string }) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<Impact[]>, ApiEnvelope<Impact[]>>(`${base}/refresh`, query))
+}
+export async function getImpact(id: string, page = 1) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<ImpactDetail>, ApiEnvelope<ImpactDetail>>(`${base}/${encodeURIComponent(id)}`, { params: { page, size: 20 } }))
+  return { ...result, impact: { ...result.impact, version: Number(result.impact.version) }, history: { ...result.history, total: Number(result.history.total) } }
+}
+export async function handleImpact(id: string, command: ImpactCommand) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<Impact>, ApiEnvelope<Impact>>(`${base}/${encodeURIComponent(id)}/commands`, command))
+}
+export const impactStatus: Record<string, string> = { OPEN: '待处理', RESOLVED: '已核对处理', MONITORING: '暂无变化' }
+export const impactReason: Record<string, string> = { FORECAST_MISSING: '到港预测待核实', FORECAST_CHANGED: '到港预测变化', ACTUAL_ARRIVAL_REVIEW: '实际到港已更新', SOURCE_CHANGED: '预测来源变化', UNCHANGED: '预测未变', BASELINE_ESTABLISHED: '已建立核对基准' }
diff --git a/src/modules/appointment-calendar/planningApi.test.ts b/src/modules/appointment-calendar/planningApi.test.ts
index f965ffa9..57ccbcb2 100644
--- a/src/modules/appointment-calendar/planningApi.test.ts
+++ b/src/modules/appointment-calendar/planningApi.test.ts
@@ -1,6 +1,6 @@
 import { expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
-import { listPlanningCargo } from './planningApi'
+import { listPlanningCargo, listPlanningContainers } from './planningApi'
 vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn() }, unwrapApiResponse: <T>(value: { data: T }) => value.data }))
 
 it('uses the gateway planning route and preserves stable source IDs and null predictions', async () => {
@@ -12,3 +12,11 @@ it('uses the gateway planning route and preserves stable source IDs and null pre
   expect(result.records[0]!.estimatedArrivalAt).toBeNull()
   expect(result.total).toBe(21)
 })
+
+it('keeps basic container listing on its own endpoint rather than requiring impact persistence', async () => {
+  vi.mocked(http.get).mockClear()
+  vi.mocked(http.get).mockResolvedValue({ data: { records: [], total: '0' } })
+  const result = await listPlanningContainers({ page: 1, size: 20 })
+  expect(http.get).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/appointment-planning/containers', { params: { page: 1, size: 20 }, signal: undefined })
+  expect(result.total).toBe(0)
+})
diff --git a/src/modules/appointment-calendar/planningApi.ts b/src/modules/appointment-calendar/planningApi.ts
index 613c44d4..14e0362f 100644
--- a/src/modules/appointment-calendar/planningApi.ts
+++ b/src/modules/appointment-calendar/planningApi.ts
@@ -100,6 +100,7 @@ export async function resolvePlanningSource(query: { sourceKey: string; customer
 }
 
 export interface PlanningContainer {
+  impact?: import('./impactApi').Impact | null
   containerBookingId: string; containerNo: string | null; orderCount: number; customerCount: number;
   packages: number | null; unknownPackageOrders: number; earliestArrivalAt: string | null; latestArrivalAt: string | null;
   standardNode: string; sourceVersion: string | null; incompleteScope: boolean;
@@ -118,6 +119,7 @@ export async function listPlanningContainers(query: { page: number; size: number
     warehouses: row.warehouses.map(warehouse => ({ ...warehouse, orderCount: Number(warehouse.orderCount), customerCount: Number(warehouse.customerCount) })),
   })) }
 }
+
 export async function resolvePlanningContainer(containerId: string, warehouseId?: string) {
   return unwrapApiResponse(await http.get<ApiEnvelope<ContainerFollowupContext>, ApiEnvelope<ContainerFollowupContext>>(`${containerBase}/${encodeURIComponent(containerId)}`, { params: { warehouseId } }))
 }
diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
index 85766766..0d7b56f8 100644
--- a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
@@ -240,9 +240,26 @@ describe('procurement purchase node operations', () => {
     const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper); await confirm(wrapper)
     expect(sessionStorage.getItem(storageKey)).toBeNull(); expect(document.body.textContent).toContain('订单版本冲突'); expect(wrapper.emitted('changed')).toBeUndefined()
   })
-  it('hides actions without permission and disables actions blocked by the server', async () => {
+  it('hides unauthorized actions and preserves blocked node reasons without a submit button', async () => {
     let wrapper = render(fixture(), []); expect(wrapper.find('.purchase-actions button').exists()).toBe(false); wrapper.unmount()
-    wrapper = render(fixture('REVIEW', false)); expect(wrapper.find('.purchase-actions button').attributes('disabled')).toBeDefined()
+    wrapper = render(fixture('REVIEW', false))
+    expect(wrapper.find('.purchase-actions button').exists()).toBe(false)
+    expect(wrapper.find('details').text()).toContain('审核采购')
+    expect(wrapper.find('details').text()).toContain('业务条件不满足')
+    expect(submitProcurementCommand).not.toHaveBeenCalled()
+  })
+  it('keeps executable workflow actions in front and financial exceptions in a closed group', () => {
+    const detail = fixture('PURCHASE')
+    detail.actions.push(...fixture('FINANCE_ADJUST').actions, ...fixture('PACK', false).actions)
+    const wrapper = render(detail)
+    const primary = wrapper.get('[data-testid="current-procurement-actions"]')
+    expect(primary.text()).toContain('登记购买完成')
+    expect(primary.text()).not.toContain('费用更正与退款')
+    expect(primary.text()).not.toContain('保存装箱草稿')
+    const groups = wrapper.findAll('details')
+    expect(groups[0].text()).toContain('费用更正与退款')
+    expect(groups[0].attributes('open')).toBeUndefined()
+    expect(groups[1].text()).toContain('业务条件不满足')
   })
   it('prevents a second submit while the first command is pending', async () => {
     let complete!: () => void; vi.mocked(submitProcurementCommand).mockImplementation(() => new Promise(resolve => { complete = resolve }))
diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.vue b/src/modules/overseas-business/components/ProcurementNodeActions.vue
index e54ce007..d86ec268 100644
--- a/src/modules/overseas-business/components/ProcurementNodeActions.vue
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.vue
@@ -28,6 +28,10 @@ const auth = useAuthStore(); const access = useAccessPreviewStore()
 const routes: Record<string, ProcurementCommand> = { REVIEW: 'review', PURCHASE: 'purchase', CONFIRM_PURCHASE: 'purchase/confirm', AUTHORIZE_BUDGET: 'budget-authorizations', PLAN_WAREHOUSE: 'planned-warehouse', CANCEL: 'cancel', RECEIVE_OVERSEAS: 'overseas-receipts', RECEIVE_DOMESTIC: 'domestic-receipts', FINISH_OVERSEAS: 'overseas-receipts/complete', FINISH_DOMESTIC: 'domestic-receipts/complete', PACK: 'packing', CONFIRM_PACKING: 'packing/confirm', MANAGE: 'dispositions', LABELS: 'labels', ESTIMATE: 'international-estimate', APPLY_LABELS: 'labels/apply', SHIP_OVERSEAS: 'overseas-shipment', SHIP_CUSTOMER: 'customer-shipment', REPACK: 'domestic-repack', CONFIRM_CHARGES: 'charges/confirm', FINANCE_ADJUST: 'fees/correct-target', RETRY_FEE: 'fees/retry', EXCEPTION_CLOSE: 'exception-close' }
 const retryFees = computed(() => props.detail.fees.filter(fee => fee.active && fee.walletStatus.endsWith('_FAILED') && access.can(feeRetryPermission(fee))))
 const actions = computed(() => [...props.detail.actions.filter(item => routes[item.key] && access.can(item.permission)), ...(retryFees.value.length ? [{ key: 'RETRY_FEE', label: '重试失败资金请求', permission: feeRetryPermission(retryFees.value[0]), allowed: true, reason: null }] : [])])
+const secondaryKeys = new Set(['AUTHORIZE_BUDGET', 'PLAN_WAREHOUSE', 'MANAGE', 'FINANCE_ADJUST', 'CANCEL', 'EXCEPTION_CLOSE'])
+const currentActions = computed(() => actions.value.filter(action => action.allowed && !secondaryKeys.has(action.key)))
+const secondaryActions = computed(() => actions.value.filter(action => secondaryKeys.has(action.key)))
+const unavailableActions = computed(() => actions.value.filter(action => !action.allowed && !secondaryKeys.has(action.key)))
 const opened = ref(false); const active = ref<ProcurementAction | null>(null); const saving = ref(false); const uploading = ref(false)
 const error = ref<ApiErrorDetails | null>(null); const storageError = ref(''); const pending = ref<PendingProcurement | null>(null)
 const editingDraft = ref(false); const correctionDraft = ref<ProcurementCorrectionDraft | null>(null); const draftError = ref('')
@@ -183,8 +187,18 @@ async function upload(event: Event) {
 </script>
 <template>
   <section class="admin-density" aria-label="采购履约节点操作">
-    <div class="density-actions purchase-actions"><el-tooltip v-for="action in actions" :key="action.key" :content="action.reason || action.label"><span><el-button class="density-action" :disabled="!action.allowed || !!pending || !!storageError || saving" @click="open(action)">{{ action.label }}</el-button></span></el-tooltip></div>
-    <el-button v-if="canDraft" :disabled="saving || uploading" @click="openCorrectionDraft">{{ correctionDraft ? '恢复费用更正草稿' : '准备费用更正草稿' }}</el-button><el-alert v-if="draftError" :title="draftError" type="error" :closable="false" /><el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
+    <div class="density-actions purchase-actions" data-testid="current-procurement-actions"><el-tooltip v-for="action in currentActions" :key="action.key" :content="action.reason || action.label"><span><el-button class="density-action" :disabled="!!pending || !!storageError || saving" @click="open(action)">{{ action.label }}</el-button></span></el-tooltip></div>
+    <details v-if="secondaryActions.length || canDraft" class="purchase-secondary-actions">
+      <summary>更正、财务及异常处理</summary>
+      <div class="density-actions purchase-actions"><el-tooltip v-for="action in secondaryActions" :key="action.key" :content="action.reason || action.label"><span><el-button class="density-action" :disabled="!action.allowed || !!pending || !!storageError || saving" @click="open(action)">{{ action.label }}</el-button></span></el-tooltip>
+        <el-button v-if="canDraft" :disabled="saving || uploading" @click="openCorrectionDraft">{{ correctionDraft ? '恢复费用更正草稿' : '准备费用更正草稿' }}</el-button>
+      </div>
+    </details>
+    <details v-if="unavailableActions.length" class="purchase-secondary-actions">
+      <summary>其他履约节点及不可操作原因</summary>
+      <dl><template v-for="action in unavailableActions" :key="action.key"><dt>{{ action.label }}</dt><dd>{{ action.reason || '当前不可操作' }}</dd></template></dl>
+    </details>
+    <el-alert v-if="draftError" :title="draftError" type="error" :closable="false" /><el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
     <el-alert v-if="pending" title="上次提交结果尚未确认，重试将使用原始内容与原请求编号。" type="warning" :closable="false"><p>原操作：{{ pending.command === 'review' ? (pending.payload.decision === 'APPROVE' ? '审核通过' : '审核拒绝') : actions.find(action => routes[action.key] === pending?.command)?.label || '采购节点操作' }} · {{ pending.payload.remark || pending.payload.reason }}</p><p v-if="pending.payload.amount !== undefined">原提交金额：{{ pending.payload.amount }} {{ pending.payload.currency || (['international-estimate', 'fees/refund'].includes(pending.command) ? 'CNY' : '') }}</p><el-button :loading="saving" @click="retryPending">确认上次提交结果</el-button></el-alert>
     <ApiErrorMeta v-if="error && !opened" :details="error" />
     <AppDialog class="admin-density-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" :confirm-text="editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交'" @confirm="submit">
diff --git a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
index ab72bd56..1c3e260a 100644
--- a/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
+++ b/src/modules/overseas-master-data/PROTOTYPE_MATRIX.md
@@ -146,3 +146,5 @@
 | 车次准备 | 选择合格排车、新建或加入车次、连续发布 | 1080px居中，复用车次与发布表单 | 来源带入、版本和失败续办，未授权的预约事实不由此生成 |
 
 本次无新增文件预览、删除或停用方式；未改变的操作沿既有矩阵。代码测试与真实页面验收分别报告。
+
+2026-10-10 拼车简化收口：调度默认待我处理，销售默认可拼车次；登记仍为1080px居中弹框，默认只展开客户和卸货站，已知货量与确认前资料分区展开；只读跟进仅突出当前有权限的主要动作，其他操作与关联单据收起。沿原请求、权限与真实作业节点；本次视觉变更待1920×1080、100%缩放人工截图确认。
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index ef17bd4e..86ff707d 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -16,6 +16,27 @@ const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ offer: CapacityOffer | null; inquiry: CapacityInquiry | null; readonly: boolean; confirmMode?: boolean }>()
 const emit = defineEmits<{ saved: [value: InquiryResult]; refresh: []; action: [key: string, row: CapacityInquiry] }>()
 const access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
+const followupActions = computed(() => {
+  const row = props.inquiry
+  if (!row) return []
+  const manage = access.can('platform:fleet:capacity-offer:manage')
+  return [
+    { key: 'edit', label: '补充资料', visible: row.actions.canEdit && (manage || access.can('platform:fleet:capacity-offer:inquiry-edit')) },
+    { key: 'confirm', label: '核对并确认', visible: manage && (row.actions.canEdit || row.actions.canConfirm) },
+    { key: 'incoming', label: '安排来货', visible: manage && row.progress.primaryAction === 'INCOMING' && access.can('platform:fleet:trip:booking-edit') },
+    { key: 'receipt', label: '核对实收与运费', visible: manage && row.progress.primaryAction === 'RECEIPT' && access.can('platform:fleet:trip:booking-confirm') },
+    { key: 'bind', label: '确认排入本车', visible: manage && row.progress.primaryAction === 'BIND' && access.can('platform:fleet:trip:booking-edit') && access.can('platform:fleet:trip:edit') && access.can('platform:overseas-warehouse:inbound-order:smart-dispatch') },
+    { key: 'fulfillment', label: '查看收货进度', visible: !!row.incomingNo },
+    { key: 'dispatch', label: '查看排车详情', visible: !!row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list') },
+    { key: 'trip', label: '前往车次审核', visible: !!row.dispatchNo && access.can('platform:fleet:trip:list') },
+  ].filter(action => action.visible)
+})
+const primaryFollowup = computed(() => {
+  const key = props.inquiry?.progress.primaryAction
+  if (key === 'VIEW') return followupActions.value.find(action => action.key === (props.inquiry?.dispatchNo ? 'dispatch' : 'fulfillment'))
+  return followupActions.value.find(action => action.key.toUpperCase() === key)
+})
+const secondaryFollowups = computed(() => followupActions.value.filter(action => action !== primaryFollowup.value))
 const blankCargo = (): TripBookingCargo => ({ destinationKey: '', cargoName: null, packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null, priceBasis: 'PALLET', unitPrice: null, currency: 'USD', contactName: null, contactPhone: null, remark: null })
 const form = reactive({ customerId: '', businessType: 'LOCAL_LOOSEBOARD' as CapacityInquiry['businessType'], deliveryMode: 'SELF_DELIVERY' as CapacityInquiry['deliveryMode'], estimatedArrivalAt: null as string | null, expectedPalletCount: null as number | null, cargo: blankCargo(), quoteRef: null as FleetQuoteReference | null })
 const quoteSource = ref<FleetQuoteSourceSnapshot | null>(null), customers = ref<OfferCustomerOption[]>([]), customerLoading = ref(false)
@@ -86,19 +107,29 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
     <p v-if="pending" role="status">上次提交结果尚未确定，请保留原内容重试或核对。</p>
     <p v-if="offer">{{ offer.offerNo }} · {{ offer.warehouseName }} · {{ offer.blockReason || '询价不占位，调度确认承运后占位。' }}</p>
     <section v-if="inquiry" aria-label="本票处理进度"><strong>{{ inquiry.progress.label }} · {{ inquiry.progress.reservation }}</strong><p>下一步负责人：{{ inquiry.progress.owner }} · {{ inquiry.progress.message }}</p></section>
-    <p v-else>保存后调度可见，尚不保位。已知货量可先填，未知可留空，确认承运前再补齐。</p>
+    <p v-else>先选客户即可登记；多站车次需选择卸货站。保存后调度可见，尚不保位。</p>
+    <p v-if="!inquiry">业务类型：{{ form.businessType === 'US_TRUCK' ? '本土卡车' : '本土散板' }}，可在“确认承运前待补资料”中调整。</p>
     <p v-if="offer">计划发车：{{ offerTime(offer.plannedDepartureAt) }} · 最晚送仓：{{ offerTime(offer.cutoffAt) }}</p>
     <p v-if="inquiry?.actions.blockReason">{{ inquiry.actions.blockReason }}</p>
+    <section v-if="inquiry && readonly" aria-label="继续处理本票货物">
+      <el-button v-if="primaryFollowup" type="primary" @click="emit('action', primaryFollowup.key, inquiry)">{{ primaryFollowup.label }}</el-button>
+      <details v-if="secondaryFollowups.length"><summary>其他操作与关联单据</summary><div class="density-actions">
+        <el-button v-for="action in secondaryFollowups" :key="action.key" @click="emit('action', action.key, inquiry)">{{ action.label }}</el-button>
+      </div></details>
+    </section>
     <el-form label-position="top" class="density-form capacity-inquiry-form" :disabled="lock">
       <el-form-item label="委托客户" required><el-select v-model="form.customerId" filterable remote :remote-method="searchCustomers" :loading="customerLoading" :disabled="!!inquiry" placeholder="按客户编号或名称搜索" @focus="searchCustomers()"><el-option v-if="inquiry" :value="inquiry.customerId" :label="`${inquiry.customerCode} · ${inquiry.customerName}`" /><el-option v-for="customer in customers" :key="customer.id" :value="customer.id" :label="`${customer.code} · ${customer.name}`" /></el-select><span v-if="customerSearched && !customers.length">暂无可选客户</span></el-form-item>
-      <el-form-item label="本土业务类型"><el-select v-model="form.businessType"><el-option value="LOCAL_LOOSEBOARD" label="本土散板" /><el-option value="US_TRUCK" label="本土卡车" /></el-select></el-form-item>
       <el-form-item label="本车卸货站" required><el-select v-model="form.cargo.destinationKey" :disabled="offer?.destinations.length === 1" placeholder="选择本车既有卸货站"><el-option v-for="stop in offer?.destinations || []" :key="stop.destinationKey" :value="stop.destinationKey" :label="stop.name" /><el-option v-if="!offer && inquiry" :value="inquiry.cargo.destinationKey" :label="inquiry.destinationLabel" /></el-select></el-form-item>
+      <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>已知货量（可先填写，未知可留空）</summary><div class="capacity-inquiry-form">
       <el-form-item label="预计箱数"><el-input-number v-model="form.cargo.packageCount" :min="1" :precision="0" placeholder="未知可留空" /></el-form-item>
       <el-form-item label="预计实托数"><el-input-number v-model="form.expectedPalletCount" :min="1" :precision="0" placeholder="卡车确认承运前必填" /></el-form-item>
       <el-form-item label="预计标准托位"><el-input-number v-model="form.cargo.palletSpaces" :min="1" :precision="0" placeholder="确认承运前填写" /></el-form-item>
       <el-form-item label="预计重量（kg）"><el-input-number v-model="form.cargo.weightKg" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
       <el-form-item label="预计体积（m³）"><el-input-number v-model="form.cargo.volumeCbm" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
+      </div></details>
       <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>确认承运前待补资料{{ inquiry?.progress.missingFields.length ? `（还需：${inquiry.progress.missingFields.join('、')}）` : '（货名、价格、到仓及联系信息）' }}</summary><div class="capacity-inquiry-form">
+      <el-form-item label="本土业务类型"><el-select v-model="form.businessType"><el-option value="LOCAL_LOOSEBOARD" label="本土散板" /><el-option value="US_TRUCK" label="本土卡车" /></el-select></el-form-item>
+
       <el-form-item label="货物名称"><el-input v-model="form.cargo.cargoName" placeholder="填写货物名称（确认承运前必填）" /></el-form-item>
       <el-form-item label="交货方式"><el-select v-model="form.deliveryMode"><el-option value="SELF_DELIVERY" label="客户自行送至我仓" /><el-option value="MANUAL_PICKUP_TO_WAREHOUSE" label="线下安排提货回我仓" /></el-select></el-form-item>
       <el-form-item label="预计到仓"><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>
@@ -118,16 +149,6 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
         <p v-if="quoteSearched && !quoteRows.length">暂无适用报价，可继续手工询价。</p><div v-if="quotePages > 1"><el-button :disabled="quoteLoading || quotePage <= 1" @click="queryQuotes(quotePage - 1)">上一页</el-button> {{ quotePage }} / {{ quotePages }} <el-button :disabled="quoteLoading || quotePage >= quotePages" @click="queryQuotes(quotePage + 1)">下一页</el-button></div>
       </template><p v-if="quoteError" role="alert">{{ quoteError.message }}<ApiErrorMeta :details="quoteError" /></p>
     </section></details>
-    <section v-if="inquiry && readonly" aria-label="继续处理本票货物" class="density-actions">
-      <el-button v-if="inquiry.actions.canEdit" @click="emit('action', 'edit', inquiry)">补充资料</el-button>
-      <el-button v-if="access.can('platform:fleet:capacity-offer:manage') && (inquiry.actions.canEdit || inquiry.actions.canConfirm)" @click="emit('action', 'confirm', inquiry)">核对并确认</el-button>
-      <el-button v-if="inquiry.progress.primaryAction === 'INCOMING' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-edit')" @click="emit('action', 'incoming', inquiry)">安排来货</el-button>
-      <el-button v-if="inquiry.progress.primaryAction === 'RECEIPT' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-confirm')" @click="emit('action', 'receipt', inquiry)">核对实收与运费</el-button>
-      <el-button v-if="inquiry.progress.primaryAction === 'BIND' && access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:booking-edit') && access.can('platform:fleet:trip:edit') && access.can('platform:overseas-warehouse:inbound-order:smart-dispatch')" @click="emit('action', 'bind', inquiry)">确认排入本车</el-button>
-      <el-button v-if="inquiry.incomingNo" @click="emit('action', 'fulfillment', inquiry)">查看收货进度</el-button>
-      <el-button v-if="inquiry.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')" @click="emit('action', 'dispatch', inquiry)">查看排车详情</el-button>
-      <el-button v-if="inquiry.dispatchNo && access.can('platform:fleet:trip:list')" @click="emit('action', 'trip', inquiry)">前往车次审核</el-button>
-    </section>
     <section v-if="inquiry?.appointmentCoverage" aria-label="收货预约覆盖">
       <h3>收货预约覆盖</h3><el-button v-if="access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')" @click="emit('action', 'appointment', inquiry)">预约跟进</el-button><p>{{ appointmentCoverageLabels[inquiry.appointmentCoverage.status] || '预约结果待核对' }}。承运保位不代表收货方已接受本票货物。</p>
       <p v-if="inquiry.appointmentCoverage.missingFields.length">待处理：{{ inquiry.appointmentCoverage.missingFields.map(key => appointmentMissingLabels[key] || '请预约人员核对来源资料').join('、') }}</p>
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index 290ade91..6cbbb897 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -21,7 +21,7 @@ const pageOf = <T,>(records: T[], total = records.length) => ({ records, total,
 const wrappers: VueWrapper[] = []
 const layout = { template: '<div><slot name="header"/><slot/></div>' }
 const field = { props: ['modelValue'], emits: ['update:modelValue', 'focus'], template: '<input />' }
-function mount(component: object, props: Record<string, unknown> = {}) {
+function mount(component: object, props: Record<string, unknown> = {}): { wrapper: VueWrapper; pinia: ReturnType<typeof createPinia> } {
   const pinia = createPinia()
   const wrapper = shallowMount(component, { props, global: { plugins: [pinia], directives: { loading: () => undefined }, stubs: {
     AdminPage: layout, ListPageLayout: layout, DetailPageLayout: layout,
@@ -69,7 +69,7 @@ it('reads detail once, permits drafting while capacity is unknown, and never pre
 it('preserves nullable estimates and retries the original immutable create request after an uncertain result', async () => {
   vi.mocked(api.saveCapacityInquiry).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ offer, inquiry, replayed: true })
   const { wrapper, pinia } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: null, readonly: false }); await flushPromises()
-  const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0]!.vm.$emit('update:modelValue', inquiry.customerId); selects[2]!.vm.$emit('update:modelValue', inquiry.cargo.destinationKey); await flushPromises()
+  const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0]!.vm.$emit('update:modelValue', inquiry.customerId); selects[1]!.vm.$emit('update:modelValue', inquiry.cargo.destinationKey); await flushPromises()
   const dialog = wrapper.findComponent({ name: 'AppDialog' }); dialog.vm.$emit('confirm'); await flushPromises()
   const first = vi.mocked(api.saveCapacityInquiry).mock.calls[0]![2]
   expect(first).toMatchObject({ expectedPalletCount: null, cargo: { packageCount: null, palletSpaces: null }, idempotencyKey: expect.any(String) })
@@ -136,10 +136,14 @@ it('keeps the create button disabled with a reason after cutoff, while hiding it
   const readonly = mount(CapacityOfferDetailView); await flushPromises()
   expect(readonly.wrapper.findAll('button').some(node => node.text() === '登记客户货物')).toBe(false)
 })
-it('defaults administrators to available offers and requires an explicit history filter', async () => {
+it('defaults minimal managers to their TODO inquiries without loading offers, and explicitly switches to available offers', async () => {
   state.manage = true
   const { wrapper } = mount(CapacityOffersView); await flushPromises()
-  expect(api.listCapacityOffers).toHaveBeenLastCalledWith(expect.objectContaining({ scope: 'AVAILABLE' }))
+  expect(api.listCapacityInquiries).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ scope: 'TODO' }))
+  expect(api.listCapacityOffers).not.toHaveBeenCalled()
+  expect(state.links.size).toBe(0)
+  await button(wrapper, '可拼车次').trigger('click'); await flushPromises()
+  expect(api.listCapacityOffers).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ scope: 'AVAILABLE' }))
   const query = wrapper.findComponent({ name: 'QueryToolbar' })
   query.vm.$emit('update:modelValue', { scope: 'ALL' }); await flushPromises(); query.vm.$emit('search'); await flushPromises()
   expect(api.listCapacityOffers).toHaveBeenLastCalledWith(expect.objectContaining({ scope: 'ALL' }))
@@ -191,3 +195,31 @@ it('shows follow-up destinations only with the matching read permission', async
   expect(second.wrapper.emitted('action')).toEqual([['trip', row]])
   expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
 })
+
+it('keeps initial inputs compact, reveals confirmation fields, and keeps unknown amounts null', async () => {
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: null, readonly: false })
+  await flushPromises()
+  const visibleInputs = wrapper.findAll('input').filter(input => !input.element.closest('details:not([open])'))
+  expect(visibleInputs).toHaveLength(2)
+  expect(wrapper.text()).toContain('业务类型：本土散板')
+  const cargo = wrapper.findAll('details').find(section => section.find('summary').text().startsWith('已知货量'))!
+  expect(cargo.attributes('open')).toBeUndefined()
+  await wrapper.setProps({ confirmMode: true }); await flushPromises()
+  expect(cargo.attributes('open')).toBeDefined()
+  expect(wrapper.findAll('details').find(section => section.find('summary').text().startsWith('确认承运前待补资料'))!.attributes('open')).toBeDefined()
+})
+it('highlights only the allowed current step and keeps other actions secondary', async () => {
+  state.manage = true
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry, readonly: true })
+  await flushPromises()
+  const section = wrapper.find('[aria-label="继续处理本票货物"]')
+  expect(section.findAll('button').filter(item => !item.element.closest('details')).map(item => item.text())).toEqual(['补充资料'])
+  expect(section.find('details').text()).toContain('核对并确认')
+  await button(wrapper, '补充资料').trigger('click')
+  expect(wrapper.emitted('action')?.[0]).toEqual(['edit', inquiry])
+  await wrapper.setProps({ inquiry: { ...inquiry, progress: { ...inquiry.progress, primaryAction: 'INCOMING' }, actions: { ...inquiry.actions, canEdit: false, canConfirm: false } } })
+  expect(section.findAll('button').filter(item => !item.element.closest('details'))).toHaveLength(0)
+  state.links.add('platform:fleet:trip:booking-edit')
+  await wrapper.setProps({ inquiry: { ...inquiry, progress: { ...inquiry.progress, primaryAction: 'INCOMING' } } })
+  expect(section.findAll('button').filter(item => !item.element.closest('details')).map(item => item.text())).toEqual(['安排来货'])
+})
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersView.vue b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
index efd2a71c..050af4df 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
@@ -17,7 +17,9 @@ import { listCapacityOffers, listCapacityInquiries, getCapacityOffer, getCapacit
 import { offerStatusLabels, inquiryStatusLabels, offerTime, loadText, type CapacityOffer, type CapacityInquiry, type InquiryResult, type OfferQuery, type InquiryQuery } from '../capacityOfferTypes'
 import { useCapacityInquiryCommands } from '../useCapacityInquiryCommands'
 const router = useRouter(), access = useAccessPreviewStore()
-const tab = ref<'offers' | 'inquiries'>('offers'), filters = ref<QueryModel>({}), applied = ref<QueryModel>({})
+const manage = computed(() => access.can('platform:fleet:capacity-offer:manage'))
+const tab = ref<'offers' | 'inquiries'>(manage.value ? 'inquiries' : 'offers')
+const filters = ref<QueryModel>(manage.value ? { scope: 'TODO' } : {}), applied = ref<QueryModel>({ ...filters.value })
 const page = ref(1), size = ref(20), total = ref(0), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
 const offers = ref<CapacityOffer[]>([]), inquiries = ref<CapacityInquiry[]>([])
 const editorOpen = ref(false), editing = ref<CapacityInquiry | null>(null), selectedOffer = ref<CapacityOffer | null>(null), readonly = ref(true)
@@ -33,7 +35,6 @@ function openFulfillment(key: string, row: CapacityInquiry) {
   return true
 }
 let sequence = 0, editorSequence = 0
-const manage = computed(() => access.can('platform:fleet:capacity-offer:manage'))
 const fields = computed<QueryField[]>(() => tab.value === 'offers' ? [
   { key: 'origin', label: '起运仓', type: 'input', placeholder: '起运仓名称', width: 170 }, { key: 'destination', label: '目的站', type: 'input', placeholder: '目的站名称', width: 170 },
   { key: 'departureFrom', label: '发车起日', type: 'date', placeholder: '发车起日', width: 170 }, { key: 'departureTo', label: '发车止日', type: 'date', placeholder: '发车止日', width: 170 },

From 453549ece1c002bb24b57050caa18758ad6697ee Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 15:38:44 +0800
Subject: [PATCH 29/47] style(appointments): simplify calendar toolbar and
 remove redundant heading

---
 .../AppointmentCalendarPanel.vue              | 45 +++++++++++--------
 .../AppointmentCalendarView.test.ts           |  2 +-
 .../AppointmentCalendarView.vue               |  8 ++--
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  2 +
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index 493ec391..ba3eeff9 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -77,12 +77,10 @@ defineExpose({ selectedDate, mode })
 <template>
   <section class="appointment-calendar admin-density" :aria-busy="loading">
     <div class="calendar-main">
-      <div class="calendar-controls" role="group" aria-label="参考图层"><label><input v-model="showArrivals" type="checkbox" @change="updateLayers">显示到港参考</label><label><input v-model="showTrips" type="checkbox" @change="updateLayers">显示用车计划</label></div>
       <header class="calendar-toolbar">
         <div class="calendar-label">
           <svg width="22" height="22" viewBox="0 0 24 24" fill="none" aria-hidden="true"><rect x="3" y="5" width="18" height="16" rx="2" stroke="currentColor" stroke-width="1.8"/><path d="M8 3v4M16 3v4M3 10h18M8 15h3M14 15h3" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/></svg>
           <strong>预约日历</strong>
-          <span v-if="showArrivals" class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span><span v-if="showTrips" class="legend trip">用车计划</span>
         </div>
         <div class="calendar-controls">
           <el-button v-if="canCreate" type="primary" :disabled="loading" @click="emit('create', selectedDate)">＋ 新增预约</el-button>
@@ -96,6 +94,10 @@ defineExpose({ selectedDate, mode })
           <el-button @click="select(dateKey(new Date()))">今天</el-button>
         </div>
       </header>
+      <div class="calendar-options">
+        <div class="calendar-legend"><span v-if="showArrivals" class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span><span v-if="showTrips" class="legend trip">用车计划</span></div>
+      <div class="calendar-layers" role="group" aria-label="参考图层"><label><input v-model="showArrivals" type="checkbox" @change="updateLayers">显示到港参考</label><label><input v-model="showTrips" type="checkbox" @change="updateLayers">显示用车计划</label></div>
+      </div>
       <div class="weekdays"><span v-for="day in weekdays" :key="day">{{ day }}</span></div>
       <div v-loading="loading" class="calendar-grid" :class="{ 'week-grid': mode === 'week' }">
         <button v-for="date in dates" :key="date" type="button" class="calendar-day"
@@ -118,7 +120,7 @@ defineExpose({ selectedDate, mode })
         <article v-for="event in selectedEvents" :key="event.key" class="detail-event">
           <div class="event-heading"><span class="event-type" :class="event.type">{{ eventTypeLabels[event.type] }}</span><span>{{ event.time || '—' }}</span></div>
           <h3>{{ event.title }}</h3><p v-if="event.subtitle" class="event-subtitle">{{ event.subtitle }}</p>
-          <dl><div v-for="field in event.fields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value || '—' }}</dd></div></dl>
+          <dl><div v-for="field in event.fields" :key="field.label" :class="{ 'wide-field': ['系统单号', '完整时段', '预约备注'].includes(field.label) }"><dt>{{ field.label }}</dt><dd>{{ field.value || '—' }}</dd></div></dl>
           <AppointmentInboundCodes v-if="event.inboundCodes" :codes="event.inboundCodes" />
           <footer v-if="event.canEdit || event.canDelete || event.sourcePath" class="density-actions">
             <el-button v-if="event.sourcePath" class="density-action" :disabled="loading" @click="emit('open', event)">查看来源</el-button>
@@ -132,12 +134,16 @@ defineExpose({ selectedDate, mode })
 </template>
 
 <style scoped>
-.appointment-calendar { display: grid; align-items: start; grid-template-columns: minmax(0, 2.5fr) minmax(320px, 1fr); gap: 16px; color: #344054; }
+.appointment-calendar { display: grid; align-items: start; grid-template-columns: minmax(0, 1fr) 360px; gap: var(--admin-space-5); color: #344054; }
 .calendar-main, .calendar-detail { background: #fff; border: 1px solid #e4e9f2; border-radius: 10px; overflow: hidden; }
-.calendar-toolbar { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: 12px; padding: 16px; border-bottom: 1px solid #edf0f6; }
+.calendar-toolbar { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: var(--admin-space-3); padding: var(--admin-space-5); border-bottom: 1px solid #edf0f6; }
 .calendar-label, .calendar-controls { display: flex; align-items: center; gap: 10px; }
 .calendar-label > svg { color: #617ce9; }
-.calendar-label > strong { font-size: 16px; }
+.calendar-label > strong { font-size: var(--admin-font-section); }
+.calendar-options { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; gap: var(--admin-space-3); padding: var(--admin-space-3) var(--admin-space-5); border-bottom: 1px solid var(--admin-table-border); }
+.calendar-legend, .calendar-layers { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-5); }
+.calendar-layers label { display: inline-flex; align-items: center; gap: var(--admin-space-1); cursor: pointer; font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.calendar-layers input { margin: 0; accent-color: var(--el-color-primary); }
 .legend { font-size: 12px; white-space: nowrap; }
 .legend::before { content: ''; display: inline-block; width: 7px; height: 7px; border-radius: 50%; margin-right: 5px; background: #4b78e8; }
 .legend.delivery::before { background: #27a87a; }
@@ -149,16 +155,16 @@ defineExpose({ selectedDate, mode })
 .nav-button { border: 1px solid #dbe3ee; font-size: 22px; }
 .calendar-period { font-size: 14px; white-space: nowrap; }
 .weekdays, .calendar-grid { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); }
-.weekdays { text-align: center; color: #8491a5; background: #f8faff; padding: 12px 14px; font-size: 13px; }
-.calendar-grid { gap: 7px; padding: 12px; background: #fbfcff; }
-.calendar-day { display: flex; flex-direction: column; align-items: stretch; justify-content: flex-start; height: 128px; min-width: 0; padding: 8px; border: 1px solid #e5eaf2; border-radius: 8px; background: #fff; text-align: left; cursor: pointer; color: inherit; font: inherit; overflow: hidden; }
+.weekdays { text-align: center; color: #8491a5; background: #f8faff; padding: var(--admin-space-3) var(--admin-space-5); font-size: var(--admin-font-caption); }
+.calendar-grid { gap: var(--admin-space-2); padding: var(--admin-space-3); background: #fbfcff; }
+.calendar-day { display: flex; flex-direction: column; align-items: stretch; justify-content: flex-start; height: 112px; min-width: 0; padding: var(--admin-space-2); border: 1px solid #e5eaf2; border-radius: 8px; background: #fff; text-align: left; cursor: pointer; color: inherit; font: inherit; overflow: hidden; }
 .calendar-day.outside { background: #f7f8fa; color: #98a2b3; }
 .calendar-day:hover { border-color: #bac8ed; background: #f8faff; }
 .calendar-day.selected { border-color: #617ce9; background: #f5f7ff; }
 .calendar-day:focus-visible, .nav-button:focus-visible, .view-toggle button:focus-visible { outline: 2px solid #4167d8; outline-offset: 2px; }
 .day-number { display: block; font-size: 12px; font-weight: 600; }
-.day-events { display: flex; flex-direction: column; gap: 3px; margin-top: 6px; }
-.event-chip { display: block; padding: 3px 6px; line-height: 16px; border-radius: 4px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; }
+.day-events { display: flex; flex-direction: column; gap: 2px; margin-top: var(--admin-space-1); }
+.event-chip { display: block; padding: 1px 6px; line-height: 16px; border-radius: 4px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; }
 .arrival { --event-bg: #edf3ff; --event-fg: #3765d4; }
 .delivery { --event-bg: #e8f8f1; --event-fg: #18845f; }
 .pickup { --event-bg: #fff4e3; --event-fg: #995a10; }
@@ -169,17 +175,18 @@ defineExpose({ selectedDate, mode })
 .event-more, .empty-day { color: #667085; font-size: 12px; }
 .week-grid .calendar-day { height: 220px; }
 .calendar-detail { align-self: start; }
-.calendar-detail > header { padding: 18px; border-bottom: 1px solid #edf0f6; }
-.calendar-detail > header > strong { font-size: 17px; }
-.calendar-detail header p { margin: 10px 0 0; font-size: 13px; color: #8491a5; }
-.calendar-detail header b { color: #617ce9; font-size: 17px; }
-.detail-events { padding: 14px; max-height: 650px; overflow-y: auto; }
-.detail-event + .detail-event { border-top: 1px solid #e4e9f2; margin-top: 16px; padding-top: 16px; }
+.calendar-detail > header { padding: var(--admin-space-5); border-bottom: 1px solid #edf0f6; }
+.calendar-detail > header > strong { font-size: var(--admin-font-title); }
+.calendar-detail header p { margin: var(--admin-space-1) 0 0; font-size: var(--admin-font-caption); color: #8491a5; }
+.calendar-detail header b { color: #617ce9; font-size: var(--admin-font-title); }
+.detail-events { padding: var(--admin-space-5); max-height: 660px; overflow-y: auto; }
+.detail-event + .detail-event { border-top: 1px solid #e4e9f2; margin-top: var(--admin-space-5); padding-top: var(--admin-space-5); }
 .event-heading { display: flex; justify-content: space-between; align-items: center; gap: 10px; font-size: 12px; }
 .event-type { padding: 5px 8px; border-radius: 4px; font-weight: 600; }
-.detail-event h3 { font-size: 15px; margin: 14px 0 8px; overflow-wrap: anywhere; }
+.detail-event h3 { font-size: var(--admin-font-section); margin: var(--admin-space-3) 0; overflow-wrap: anywhere; }
 .event-subtitle { color: #667085; font-size: 13px; overflow-wrap: anywhere; }
-.detail-event dl { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; margin: 16px 0; }
+.detail-event dl { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-3) var(--admin-space-5); margin: var(--admin-space-3) 0; }
+.detail-event .wide-field { grid-column: 1 / -1; }
 .detail-event dt { font-size: 12px; color: #8491a5; }
 .detail-event dd { margin: 4px 0 0; font-size: 13px; overflow-wrap: anywhere; }
 .detail-event footer { display: flex; justify-content: flex-end; border-top: 1px solid #edf0f6; padding-top: 10px; }
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index a7e0d4f6..b94ee0ba 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -66,7 +66,7 @@ describe('appointment calendar data integration', () => {
     const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
     expect(tabs.map(button => button.text())).toEqual(['提柜与到仓', '送仓与排车', '预约日历'])
     expect(tabs[0]!.attributes('aria-pressed')).toBe('true')
-    expect(wrapper.text()).toContain('美国预约总览')
+    expect(wrapper.text()).not.toContain('美国预约总览')
     expect(listFbaAppointmentCalendar).not.toHaveBeenCalled()
     expect(listArrivalCalendar).not.toHaveBeenCalled()
     await tabs[2]!.trigger('click'); await flushPromises()
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index ff7679f2..2aaafe8d 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -379,7 +379,6 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-if="linkError" title="预约货源核对失败" :message="linkError.message" :loading="linkLoading" @retry="resolveLink" />
     <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(permission.inboundOrderAppointment)" @arrange="arrangeLinkedSource" @close="linkedSource = null" />
     <div class="appointment-heading">
-    <h2 class="density-detail-title">美国预约总览</h2>
     <div class="density-status-tabs" role="group" aria-label="预约工作视图">
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">提柜与到仓</button>
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">送仓与排车</button>
@@ -393,8 +392,8 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
-    <p v-if="pickupNotice" role="status">{{ pickupNotice }}</p>
-    <p v-if="showTripLayer && tripNotice" role="status">{{ tripNotice }}</p>
+    <details v-if="pickupNotice" class="calendar-notice"><summary>部分提柜记录待核实</summary><p>{{ pickupNotice }}</p></details>
+    <details v-if="showTripLayer && tripNotice" class="calendar-notice"><summary>部分用车计划待核实</summary><p>{{ tripNotice }}</p></details>
     <details v-if="showTripLayer && unresolvedTrips.length" class="appointment-extra">
       <summary>待核实地点的车次（{{ unresolvedTrips.length }}）</summary>
       <p>检索窗口内的车次，尚无法确定当地日期。原计划时间保留 UTC，不用浏览器时区换算。</p>
@@ -437,6 +436,9 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
 </template>
 
 <style scoped>
+.calendar-notice { margin: var(--admin-space-2) 0; font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.calendar-notice summary { cursor: pointer; }
+.calendar-notice p { margin: var(--admin-space-2) 0; }
 .appointment-heading { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-5); }
 .appointment-heading .density-status-tabs { flex: 1; margin: 0; }
 .calendar-form { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 var(--admin-space-6); }
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index ded07831..db9f29c8 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -34,3 +34,5 @@
 按用户确认收敛：主视图仅提柜与到仓、送仓与排车、预约日历，默认有权限的列表视图；日历首次进入才加载。到港参考、用车计划默认隐藏，可独立开关，不计入预约数量；缺国家资料与查询超限分开提示。送仓与排车目前仍以选货合批为主，目的仓货量汇总及7/14/30天窗口尚未完成，不因标题调整宣称完成。
 
 用户截图密度修正：业务标题复用density-detail-title并与三视图同行，不独占大标题区；船期操作并入查询栏，不单独占空白工具栏。常驻业务解释改为默认折叠“说明”；错误保留重试，诊断信息默认折叠。基础货柜与船期状态独立读取，后者失败不阻断货柜列表、不展示假的零待办。
+
+用户最新截图确认：移除“美国预约总览”文字，仅保留三视图导航；日历图例和图层开关归入有内边距的辅助栏，长范围提示默认折叠，月格112px仍容纳3条摘要及剩余数；右侧固定360px，系统单号/完整时段/备注跨整行。该项以当前用户要求覆盖原标题建议，待1920×1080实际页面确认。

From a564850e2377aa545362e3ef0bff81af13c184f3 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sat, 10 Oct 2026 15:45:20 +0800
Subject: [PATCH 30/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/LastMileOrderDetailView.test.ts             | 11 ++++++-----
 .../pages/LastMileOrderDetailView.vue                 |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
index c66388cc..d8a44f82 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.test.ts
@@ -13,7 +13,7 @@ vi.mock('../api/warehouseTransfers', () => ({ getWarehouseTransfer: vi.fn() }))
 enableAutoUnmount(afterEach)
 
 describe('LastMileOrderDetailView domestic detail alignment', () => {
-  it.each(['PENDING_REVIEW', 'PARTIALLY_RECEIVED'])('shows SKU forecast before receipt completion (%s) without forecast box counts', async status => {
+  it.each(['PENDING_REVIEW', 'PARTIALLY_RECEIVED', 'COMPLETED'])('shows only customer SKU forecast regardless of receipt status (%s)', async status => {
     vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: status, packageCount: 30 },
       cargo: [], fees: [], statusHistory: [], operationHistory: [],
       returnReceipt: { order: { returnNo: 'RT-1', status, expectedQuantity: 30, receivedQuantity: 5 }, receipts: [],
@@ -28,15 +28,16 @@ describe('LastMileOrderDetailView domestic detail alignment', () => {
     expect(panel.text()).toContain('30')
     expect(panel.text()).not.toContain('箱数')
   })
-  it('uses actual cargo after return receipt completion', async () => {
+  it('keeps customer forecast after completion instead of using actual signed cargo', async () => {
     vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: 'INBOUND_COMPLETED' },
       cargo: [{ id: 'actual', skuCode: 'SKU-ACTUAL', productNameZh: '实收商品', productQuantity: 25, packageCount: 2 }], fees: [], statusHistory: [], operationHistory: [],
       returnReceipt: { order: { returnNo: 'RT-1', status: 'COMPLETED', expectedQuantity: 30, receivedQuantity: 25 }, receipts: [], items: [{ skuCode: 'SKU-FORECAST', expectedQuantity: 30, receivedQuantity: 25 }] } })
     const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises()
     await wrapper.findAll('[role="tab"]').find(tab => tab.text().includes('货物信息'))!.trigger('click'); await flushPromises()
-    expect(wrapper.get('.table-panel').text()).toContain('SKU-ACTUAL')
-    expect(wrapper.get('.table-panel').text()).not.toContain('SKU-FORECAST')
-    expect(wrapper.get('.table-panel').text()).toContain('25')
+    expect(wrapper.get('.table-panel').text()).not.toContain('SKU-ACTUAL')
+    expect(wrapper.get('.table-panel').text()).toContain('SKU-FORECAST')
+    expect(wrapper.get('.table-panel').text()).toContain('30')
+    expect(wrapper.get('.table-panel').text()).not.toContain('箱数')
   })
   it('shows signed box contents and actual quantities on return orders', async () => {
     vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'tail-return', customerId: 'customer-1', orderNo: 'RETU-1', orderType: 'RETURN_RELABEL', currentStatus: 'INBOUND_COMPLETED' }, cargo: [], fees: [], statusHistory: [], operationHistory: [],
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
index 31a9c22f..3d4d34ee 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
@@ -135,8 +135,8 @@ const documents = computed<DocumentRow[]>(() => {
     .filter((item) => item[1]).map(([type, number]) => ({ type: String(type), number: String(number), createdAt: '—', quote: '—' } as DocumentRow))
     .concat((order.relabelApplications || []).map(application => ({ type: '换标单', number: application.relabelNo, createdAt: formatOverseasDateTime(application.createdAt), quote: '—', status: relabelApplicationStatusLabel(application.status), quantity: application.quantity })))
 })
-const cargo = computed<CargoRow[]>(() => showReturnForecast.value && detail.value?.returnReceipt?.items?.length
-  ? detail.value.returnReceipt.items.map(item => ({ id: item.skuCode, sku: item.skuCode, productName: text(item.productNameZh),
+const cargo = computed<CargoRow[]>(() => isReturnOrder.value
+  ? (detail.value?.returnReceipt?.items || []).map(item => ({ id: item.skuCode, sku: item.skuCode, productName: text(item.productNameZh),
       quantity: item.expectedQuantity, pallets: 0, cartons: 0, weight: 0, volume: 0 }))
   : (detail.value?.cargo || []).map((item) => ({
   id: String(item.id), sku: text(item.skuCode), productName: text(item.productNameZh), pallets: Number(item.palletCount || 0),
@@ -157,7 +157,7 @@ const logs = computed<LogRow[]>(() => {
   return [...statusRows, ...operationRows].sort((left, right) => right.sortAt.localeCompare(left.sortAt))
 })
 
-const cargoColumns = computed<DataTableColumn[]>(() => showReturnForecast.value ? [
+const cargoColumns = computed<DataTableColumn[]>(() => isReturnOrder.value ? [
   { key: 'sku', prop: 'sku', label: 'SKU', minWidth: 150 },
   { key: 'productName', prop: 'productName', label: '中文品名', minWidth: 180 },
   { key: 'quantity', prop: 'quantity', label: '预报件数', width: 120, align: 'right' },
@@ -238,7 +238,7 @@ onMounted(load)
             <div v-for="field in basicFields" :key="field.label" :class="{ wide: field.wide }"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field), 'package-difference--nonzero': isNonzeroDifference(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div>
           </dl>
         </el-tab-pane>
-        <el-tab-pane name="cargo"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>货物信息</span></template><section class="table-panel"><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" empty-text="暂无货物明细"></DataTable></section></el-tab-pane>
+        <el-tab-pane name="cargo"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>货物信息</span></template><section class="table-panel"><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" :empty-text="isReturnOrder ? '暂无客户预报货物明细' : '暂无货物明细'"></DataTable></section></el-tab-pane>
         <el-tab-pane v-if="detail?.order.orderType === 'RETURN_RELABEL'" name="return-receipt"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>退货签收与箱内清点</span></template>
           <section v-if="detail.returnReceipt" class="table-panel" aria-label="退货签收与箱内清点">
             <h3>{{ detail.returnReceipt.order.returnNo }} · 实收 {{ detail.returnReceipt.order.receivedQuantity }} / 预报 {{ detail.returnReceipt.order.expectedQuantity }} 件</h3>

From e404fe10496bce285bd84b87d5048c1a0b7e2f48 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 16:08:25 +0800
Subject: [PATCH 31/47] fix(appointments): prioritize calendar and collapse
 data notices

---
 .../AppointmentCalendarPanel.vue              | 10 ++++++-
 .../AppointmentCalendarView.test.ts           | 27 ++++++++++--------
 .../AppointmentCalendarView.vue               | 28 +++++++++----------
 .../appointment-calendar/PROTOTYPE_MATRIX.md  |  4 +++
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index ba3eeff9..6e88fc04 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -20,12 +20,13 @@ export interface CalendarEvent {
 }
 
 const props = withDefaults(defineProps<{
+  notices?: string[]
   events: CalendarEvent[]
   loading?: boolean
   incomplete?: boolean
   canCreate?: boolean
   initialDate?: string
-}>(), { loading: false, incomplete: false, canCreate: false, initialDate: '' })
+}>(), { notices: () => [], loading: false, incomplete: false, canCreate: false, initialDate: '' })
 const emit = defineEmits<{
   layers: [layers: { arrivals: boolean; trips: boolean }]
   range: [range: { from: string; to: string }]
@@ -83,6 +84,7 @@ defineExpose({ selectedDate, mode })
           <strong>预约日历</strong>
         </div>
         <div class="calendar-controls">
+          <details v-if="notices.length" class="calendar-data-notices"><summary>数据提示 · {{ notices.length }}</summary><div class="calendar-notice-content" role="status"><p v-for="notice in notices" :key="notice">{{ notice }}</p><slot name="notice-actions" /></div></details>
           <el-button v-if="canCreate" type="primary" :disabled="loading" @click="emit('create', selectedDate)">＋ 新增预约</el-button>
           <div class="view-toggle" role="group" aria-label="预约视图">
             <button type="button" :aria-pressed="mode === 'month'" @click="changeMode('month')">月</button>
@@ -134,6 +136,12 @@ defineExpose({ selectedDate, mode })
 </template>
 
 <style scoped>
+.calendar-data-notices { position: relative; font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.calendar-data-notices summary { cursor: pointer; padding: var(--admin-space-2) var(--admin-space-3); }
+.calendar-notice-content { position: absolute; top: 100%; right: 0; z-index: 5; width: 320px; padding: var(--admin-space-5); border: 1px solid var(--admin-table-border); border-radius: var(--admin-radius); background: var(--admin-surface); box-shadow: var(--el-box-shadow-light); }
+.calendar-notice-content p { margin: 0; line-height: 1.6; }
+.calendar-notice-content p + p { margin-top: var(--admin-space-3); }
+
 .appointment-calendar { display: grid; align-items: start; grid-template-columns: minmax(0, 1fr) 360px; gap: var(--admin-space-5); color: #344054; }
 .calendar-main, .calendar-detail { background: #fff; border: 1px solid #e4e9f2; border-radius: 10px; overflow: hidden; }
 .calendar-toolbar { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: var(--admin-space-3); padding: var(--admin-space-5); border-bottom: 1px solid #edf0f6; }
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index b94ee0ba..8c85a47c 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -31,7 +31,7 @@ function render(openCalendar = true) {
   const wrapper = mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
     AdminPage: { template: '<main><slot /></main>' },
     AppointmentContainerPanel: true,
-    AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', mounted() { this.$emit('layers', { arrivals: true, trips: true }) }, props: ['events', 'incomplete'], template: '<button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button>' },
+    AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', mounted() { this.$emit('layers', { arrivals: true, trips: true }) }, props: ['events', 'incomplete', 'notices'], template: '<div><button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button><slot name="notice-actions" /></div>' },
     AppDialog: { props: ['modelValue'], template: '<div v-if="modelValue"><slot /><button data-save @click="$emit(\'confirm\')">保存</button></div>' },
     ElForm: { template: '<form><slot /></form>' },
     ElFormItem: { template: '<label><slot /></label>' },
@@ -61,23 +61,23 @@ describe('appointment calendar data integration', () => {
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
-  it('keeps exactly the documented three work views and defaults to the container list without calendar requests', async () => {
+  it('puts calendar first and opens it by default without reloading when switching back', async () => {
     const wrapper = render(false); await flushPromises()
     const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
-    expect(tabs.map(button => button.text())).toEqual(['提柜与到仓', '送仓与排车', '预约日历'])
+    expect(tabs.map(button => button.text())).toEqual(['预约日历', '提柜与到仓', '送仓与排车'])
     expect(tabs[0]!.attributes('aria-pressed')).toBe('true')
     expect(wrapper.text()).not.toContain('美国预约总览')
-    expect(listFbaAppointmentCalendar).not.toHaveBeenCalled()
-    expect(listArrivalCalendar).not.toHaveBeenCalled()
-    await tabs[2]!.trigger('click'); await flushPromises()
     expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
-    await tabs[0]!.trigger('click'); await tabs[2]!.trigger('click'); await flushPromises()
+    expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
+    await tabs[1]!.trigger('click'); await flushPromises()
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+    await tabs[0]!.trigger('click'); await flushPromises()
     expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
   })
   it('distinguishes missing country data from truncation instead of suggesting a narrower date range', async () => {
     vi.mocked(listPickupCalendar).mockResolvedValueOnce({ records: [], truncated: false, unclassifiedCount: 74, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED' })
     const wrapper = render(); await flushPromises()
-    expect(wrapper.text()).toContain('74 条提柜记录')
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('74 条提柜记录')
     expect(wrapper.text()).not.toContain('缩小日期范围')
   })
   it('shows the original pickup time once without claiming a port time zone and retains partial-source warnings', async () => {
@@ -86,14 +86,14 @@ describe('appointment calendar data integration', () => {
     const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
     expect(panel.props('events')).toEqual([expect.objectContaining({type:'pickup',date:'2026-10-09',time:'11:00',sourcePath:'/container-loading/overseas/123'})])
     expect(panel.props('incomplete')).toBe(true)
-    expect(wrapper.text()).toContain('目的仓国家待核实')
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('目的仓国家待核实')
     expect(listPickupCalendar).toHaveBeenCalledTimes(1)
   })
   it('does not request pickup records without pickup list permission and discloses the omitted source', async () => {
     routing.canPickup=false
     const wrapper=render(); await flushPromises()
     expect(listPickupCalendar).not.toHaveBeenCalled()
-    expect(wrapper.text()).toContain('无提柜查看权限')
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('无提柜查看权限')
     expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('incomplete')).toBe(true)
   })
   it('keeps successful arrival data visible when the pickup source fails', async () => {
@@ -108,13 +108,16 @@ describe('appointment calendar data integration', () => {
     routing.canTrips=false
     const wrapper=render();await flushPromises()
     expect(listTripCalendar).not.toHaveBeenCalled();expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
-    expect(wrapper.text()).toContain('无车次查看权限')
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('无车次查看权限')
   })
   it('keeps unresolved trip origins outside daily slots and clearly labels their UTC source time', async () => {
     vi.mocked(listTripCalendar).mockResolvedValueOnce({records:[],unresolvedRecords:[{sourceType:'TRIP_PLAN',tripNo:'TR-UNKNOWN',status:'PLANNED',originWarehouseId:null,originWarehouseCode:null,originWarehouseName:null,originCountryCode:null,originTimezone:null,originWarehouseStatus:null,plannedDepartureAt:'2026-10-10T12:00:00Z',expectedDriverEndAt:null,departedAt:null,completedAt:null,stops:[],incompleteReasons:['ORIGIN_WAREHOUSE_UNKNOWN']}]})
     const wrapper=render();await flushPromises()
     expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('events')).toEqual([])
-    expect(wrapper.text()).toContain('待核实地点的车次（1）');expect(wrapper.text()).toContain('原计划时间保留 UTC')
+    expect(wrapper.find('.appointment-extra').exists()).toBe(false)
+    expect(wrapper.text()).not.toContain('原计划时间保留 UTC')
+    await wrapper.findAll('button').find(button => button.text() === '查看待核实车次（1）')!.trigger('click')
+    expect(wrapper.text()).toContain('原计划时间保留 UTC')
     expect(listTripCalendar).toHaveBeenCalledTimes(1)
   })
   it('creates one shared appointment for two customers without sending a fabricated header customer', async () => {
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 2aaafe8d..cb846659 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -35,8 +35,8 @@ const selectedSource = ref<PlanningSource | null>(null)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkLoading = ref(false)
 let linkRequest = 0
-const workView = ref<'calendar' | 'cargo' | 'containers'>('containers')
-const calendarVisited = ref(false)
+const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
+const calendarVisited = ref(true)
 const showTripLayer = ref(false)
 const cargoVisited = ref(false)
 watch(workView, value => {
@@ -50,6 +50,7 @@ const pickupNotice = ref('')
 const tripEvents = ref<CalendarEvent[]>([])
 const unresolvedTrips = ref<TripCalendarEntry[]>([])
 const tripNotice = ref('')
+const unresolvedDialogOpen = ref(false)
 const unresolvedPage = ref(1), unresolvedSize = ref(10)
 const unresolvedRows = computed(() => unresolvedTrips.value.slice((unresolvedPage.value - 1) * unresolvedSize.value, unresolvedPage.value * unresolvedSize.value))
 const unresolvedColumns: DataTableColumn[] = [
@@ -155,6 +156,7 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
 })), ...tripEvents.value])
 
 async function load(nextRange = range.value) {
+  unresolvedDialogOpen.value = false
   range.value = nextRange
   const request = ++calendarRequest
   calendarController?.abort()
@@ -369,7 +371,7 @@ function arrangeLinkedSource() {
 }
 watch(() => [route.query.sourceKey, route.query.customerId, route.query.destinationKey], resolveLink, { immediate: true })
 
-onMounted(() => { if (!access.can(permission.lastMileOrderList)) workView.value = 'calendar' })
+onMounted(() => { void load(); void loadUnscheduled() })
 onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequest; ++detailRequest; ++warehouseRequest; ++linkRequest; calendarController?.abort() })
 </script>
 
@@ -380,9 +382,9 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(permission.inboundOrderAppointment)" @arrange="arrangeLinkedSource" @close="linkedSource = null" />
     <div class="appointment-heading">
     <div class="density-status-tabs" role="group" aria-label="预约工作视图">
+      <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">提柜与到仓</button>
       <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">送仓与排车</button>
-      <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
     </div>
     </div>
     <div v-if="cargoVisited" v-show="workView === 'cargo'"><AppointmentCargoPanel :external-source="selectedSource" @source-accepted="selectedSource = null" @created="load(); loadUnscheduled()" /></div>
@@ -392,18 +394,17 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
-    <details v-if="pickupNotice" class="calendar-notice"><summary>部分提柜记录待核实</summary><p>{{ pickupNotice }}</p></details>
-    <details v-if="showTripLayer && tripNotice" class="calendar-notice"><summary>部分用车计划待核实</summary><p>{{ tripNotice }}</p></details>
-    <details v-if="showTripLayer && unresolvedTrips.length" class="appointment-extra">
-      <summary>待核实地点的车次（{{ unresolvedTrips.length }}）</summary>
-      <p>检索窗口内的车次，尚无法确定当地日期。原计划时间保留 UTC，不用浏览器时区换算。</p>
+    <AppointmentCalendarPanel :notices="[pickupNotice, showTripLayer ? tripNotice : ''].filter(Boolean)" :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource">
+      <template #notice-actions><el-button v-if="showTripLayer && unresolvedTrips.length" link type="primary" @click="unresolvedDialogOpen = true">查看待核实车次（{{ unresolvedTrips.length }}）</el-button></template>
+    </AppointmentCalendarPanel>
+    </div>
+    <AppDialog v-if="unresolvedDialogOpen" v-model="unresolvedDialogOpen" :title="`待核实车次（${unresolvedTrips.length}）`" width="min(1000px, calc(100vw - 48px))" :show-confirm="false" class="admin-density-dialog">
+      <p>这些车次缺少地点或时区，暂未计入日历。原计划时间保留 UTC。</p>
       <DataTable v-model:page="unresolvedPage" v-model:page-size="unresolvedSize" :data="unresolvedRows" :columns="unresolvedColumns" :total="unresolvedTrips.length" row-key="tripNo" @update:page-size="unresolvedPage = 1">
         <template #actions="{ row }"><el-button class="density-action" @click="router.push(`/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`)">查看来源</el-button></template>
         <template #issues="{ row }">{{ tripIssues(row as TripCalendarEntry) }}</template>
       </DataTable>
-    </details>
-    <AppointmentCalendarPanel :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource" />
-    </div>
+    </AppDialog>
     <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
       <div v-loading="detailLoading">
@@ -436,9 +437,6 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
 </template>
 
 <style scoped>
-.calendar-notice { margin: var(--admin-space-2) 0; font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
-.calendar-notice summary { cursor: pointer; }
-.calendar-notice p { margin: var(--admin-space-2) 0; }
 .appointment-heading { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-5); }
 .appointment-heading .density-status-tabs { flex: 1; margin: 0; }
 .calendar-form { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 var(--admin-space-6); }
diff --git a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
index db9f29c8..67ba78d0 100644
--- a/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
+++ b/src/modules/appointment-calendar/PROTOTYPE_MATRIX.md
@@ -36,3 +36,7 @@
 用户截图密度修正：业务标题复用density-detail-title并与三视图同行，不独占大标题区；船期操作并入查询栏，不单独占空白工具栏。常驻业务解释改为默认折叠“说明”；错误保留重试，诊断信息默认折叠。基础货柜与船期状态独立读取，后者失败不阻断货柜列表、不展示假的零待办。
 
 用户最新截图确认：移除“美国预约总览”文字，仅保留三视图导航；日历图例和图层开关归入有内边距的辅助栏，长范围提示默认折叠，月格112px仍容纳3条摘要及剩余数；右侧固定360px，系统单号/完整时段/备注跨整行。该项以当前用户要求覆盖原标题建议，待1920×1080实际页面确认。
+
+用户最新确认覆盖默认列表建议：预约日历排第一并默认打开，之后为提柜与到仓、送仓与排车；范围资料提示移入日历工具栏“数据提示”，点击展开浮层，不在日历上方占行。真实接口错误仍保留错误与重试入口。
+
+用户确认待核实车次不占日历顶部：入口并入“数据提示”，显式点击后打开1000px居中分页明细；保留原UTC、缺项及查看来源操作，未打开不渲染明细，不增加查询；日期范围变化关闭旧明细。

From 081f79a9a1a764ec265759064d095a5de66a0d8c Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sat, 10 Oct 2026 16:12:38 +0800
Subject: [PATCH 32/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/OutboundsView.returnSku.test.ts     | 28 +++++++------
 .../pages/OutboundsView.selection.test.ts     | 39 ++++++++++++++++++-
 .../pages/OutboundsView.vue                   |  6 ++-
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
index 84a31009..d91791da 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
@@ -10,11 +10,12 @@ vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn().mockRes
 vi.mock('../api/outbounds', () => ({ listOutbounds: vi.fn().mockResolvedValue({ records: [], total: 0 }), listOneClickOutboundCandidates: vi.fn().mockResolvedValue([]), listReturnOutboundCandidates: vi.fn().mockResolvedValue([]), createReturnOutbound: api.create }))
 vi.mock('../api/returnInventory', () => ({ listReturnStock: api.stock, listReturnCartons: api.cartons, getReturnCarton: api.detail }))
 const sources = [
-  { cartonMark: 'BOX-A', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
-  { cartonMark: 'BOX-B', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
+  { cartonMark: 'LOOSE-A', sourceUnitType: 'PARCEL', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
+  { cartonMark: 'LOOSE-B', sourceUnitType: 'PARCEL', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
   { cartonMark: 'PARCEL', sourceUnitType: 'PARCEL', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-B', quantity: 6, availableQuantity: 6 }] },
+  { cartonMark: 'PACKED', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 5, availableQuantity: 5 }] },
   { cartonMark: 'MIXED', sourceUnitType: 'BOX', sourceReturnNo: 'RT-1', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 3 }, { skuCode: 'SKU-B', quantity: 2 }] },
-  { cartonMark: 'OTHER-ORDER', sourceUnitType: 'BOX', sourceReturnNo: 'RT-2', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 100 }] },
+  { cartonMark: 'OTHER-ORDER', sourceUnitType: 'PARCEL', sourceReturnNo: 'RT-2', status: 'AVAILABLE', items: [{ skuCode: 'SKU-A', quantity: 100 }] },
 ]
 let wrapper: VueWrapper
 beforeEach(() => {
@@ -44,21 +45,24 @@ async function open(sku: string) {
 }
 function right() { return wrapper.findAllComponents({ name: 'ElTable' }).filter(table => table.classes().includes('return-result-table'))[1]! }
 async function selectMarks(marks: string[]) {
-  for (const mark of marks) right().findAllComponents(ElCheckbox).find(check => check.element.closest('tr')?.textContent?.includes(mark === 'PARCEL' ? '包裹散件（按 SKU 拣货）' : mark))!.vm.$emit('change', true)
+  for (const mark of marks) {
+    const rows = right().props('data') as Array<{ cartonMark: string }>
+    right().findAllComponents(ElCheckbox)[rows.findIndex(row => row.cartonMark === mark)]!.vm.$emit('change', true)
+  }
   await flushPromises()
 }
 describe('single SKU outbound source and piece quantity', () => {
-  it('selects packed single-SKU boxes, scopes quantities to the return order and excludes mixed boxes', async () => {
+  it('selects only loose SKU sources scoped to the return order and excludes packed boxes', async () => {
     await open('SKU-A')
-    expect(right().props('data').map((row: { cartonMark: string }) => row.cartonMark)).toEqual(['BOX-A', 'BOX-B'])
+    expect(right().props('data').map((row: { cartonMark: string }) => row.cartonMark)).toEqual(['LOOSE-A', 'LOOSE-B'])
     expect(wrapper.text()).not.toContain('OTHER-ORDER')
-    await selectMarks(['BOX-A', 'BOX-B'])
+    await selectMarks(['LOOSE-A', 'LOOSE-B'])
     expect(wrapper.findComponent(ElInputNumber).props('modelValue')).toBe(10)
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
-    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ skuCode: 'SKU-A', quantity: 10, cartonMarks: ['BOX-A', 'BOX-B'] }))
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ skuCode: 'SKU-A', quantity: 10, cartonMarks: ['LOOSE-A', 'LOOSE-B'] }))
   })
-  it('submits six pieces from two five-piece boxes', async () => {
-    await open('SKU-A'); await selectMarks(['BOX-A', 'BOX-B'])
+  it('submits six pieces from two five-piece loose sources', async () => {
+    await open('SKU-A'); await selectMarks(['LOOSE-A', 'LOOSE-B'])
     wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', 6); await flushPromises()
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
     expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ quantity: 6 }))
@@ -77,13 +81,13 @@ describe('single SKU outbound source and piece quantity', () => {
     expect(right().text()).not.toContain('包裹散件')
   })
   it.each([[0,1],[11,10]])('clamps input %s to the allowed bound %s', async (quantity, expected) => {
-    await open('SKU-A'); await selectMarks(['BOX-A', 'BOX-B'])
+    await open('SKU-A'); await selectMarks(['LOOSE-A', 'LOOSE-B'])
     wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', quantity); await flushPromises()
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
     expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({quantity: expected}))
   })
   it.each([1.5])('blocks invalid quantity %s before creating an order', async quantity => {
-    await open('SKU-A'); await selectMarks(['BOX-A', 'BOX-B'])
+    await open('SKU-A'); await selectMarks(['LOOSE-A', 'LOOSE-B'])
     wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', quantity); await flushPromises()
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
     expect(api.create).not.toHaveBeenCalled()
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts
index 99e785b4..308067a5 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts
@@ -4,7 +4,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import OutboundsView from './OutboundsView.vue'
 import { listPlatformTenants } from '@/modules/iam'
 
-const api = vi.hoisted(() => ({ candidates: vi.fn(), create: vi.fn(), warehouses: vi.fn() }))
+const api = vi.hoisted(() => ({ candidates: vi.fn(), create: vi.fn(), warehouses: vi.fn(), returnCandidates: vi.fn(), stock: vi.fn(), cartons: vi.fn(), carton: vi.fn() }))
+vi.mock('../api/returnInventory', () => ({ listReturnStock: api.stock, listReturnCartons: api.cartons, getReturnCarton: api.carton }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn().mockResolvedValue({ records: [] }) }))
@@ -13,7 +14,7 @@ vi.mock('../api/outbounds', () => ({
   listOutbounds: vi.fn().mockResolvedValue({ records: [], total: 0 }),
   listOneClickOutboundCandidates: api.candidates,
   createOneClickDropshipOutbound: api.create,
-  cancelOutbound: vi.fn(), createReturnOutbound: vi.fn(), listReturnOutboundCandidates: vi.fn(),
+  cancelOutbound: vi.fn(), createReturnOutbound: vi.fn(), listReturnOutboundCandidates: api.returnCandidates,
 }))
 
 const fixtures = Array.from({ length: 7 }, (_, index) => ({
@@ -48,6 +49,40 @@ async function selectBothPages() {
 }
 
 describe('outbound candidate search and selection', () => {
+  it('limits single SKU quantities and selectable sources to loose stock of the selected return, excluding pallet and box contents', async () => {
+    vi.mocked(listPlatformTenants).mockResolvedValue({ records: [{ id: 'customer-a', tenantName: '客户甲', status: 'ACTIVE' }], page: 1, size: 200, total: 1, pages: 1 } as Awaited<ReturnType<typeof listPlatformTenants>>)
+    const sources = [
+      { cartonMark: 'P-A', sourceUnitType: 'PALLET', skuCode: 'SKU-A', quantity: 5 },
+      { cartonMark: 'P-B', sourceUnitType: 'PALLET', skuCode: 'SKU-B', quantity: 6 },
+      { cartonMark: 'BOX-A', sourceUnitType: 'BOX', skuCode: 'SKU-A', quantity: 3 },
+      { cartonMark: 'SP-A', sourceUnitType: 'PARCEL', skuCode: 'SKU-A', quantity: 1 },
+      { cartonMark: 'SP-B', sourceUnitType: 'PARCEL', skuCode: 'SKU-B', quantity: 5 },
+      { cartonMark: 'SP-OTHER', sourceUnitType: 'PARCEL', skuCode: 'SKU-A', quantity: 20 },
+    ].map(row => ({ ...row, status: 'AVAILABLE', sourceReturnNo: row.cartonMark === 'SP-OTHER' ? 'RT-OTHER' : 'RT-MIXED' }))
+    api.returnCandidates.mockResolvedValue([])
+    api.stock.mockResolvedValue({ records: [{ skuCode: 'SKU-A', availableQuantity: 29 }, { skuCode: 'SKU-B', availableQuantity: 11 }] })
+    api.cartons.mockResolvedValue({ records: sources })
+    api.carton.mockImplementation(async (mark: string) => { const row = sources.find(row => row.cartonMark === mark)!; return { ...row, items: [{ skuCode: row.skuCode, quantity: row.quantity, availableQuantity: row.quantity }] } })
+    await openCreate()
+    const type = wrapper.findComponent({ name: 'ElRadioGroup' })
+    type.vm.$emit('update:modelValue', 'RETURN_OUTBOUND'); type.vm.$emit('change'); await flushPromises()
+    const customer = wrapper.findAllComponents(ElSelect).find(row => row.props('placeholder') === '请选择客户')!
+    customer.vm.$emit('update:modelValue', 'customer-a'); customer.vm.$emit('change'); await flushPromises()
+    const order = wrapper.findAllComponents(ElSelect).find(row => row.props('placeholder') === '选择已签收入库的退货单')!
+    order.vm.$emit('update:modelValue', 'RT-MIXED'); order.vm.$emit('change'); await flushPromises()
+    const mode = wrapper.findAllComponents({ name: 'ElRadioGroup' }).find(row => row.text().includes('单 SKU'))!
+    mode.vm.$emit('update:modelValue', 'SKU'); mode.vm.$emit('change'); await flushPromises()
+    const stock = wrapper.findAll('.return-list-card')[0]!
+    expect(stock.findAll('tbody tr').map(row => row.text().replace(/\s/g, ''))).toEqual(['SKU-A1', 'SKU-B5'])
+    stock.findAllComponents(ElCheckbox)[0]!.vm.$emit('change', true); await flushPromises()
+    const sourceTable = wrapper.findAll('.return-list-card')[1]!
+    expect(sourceTable.findAll('tbody tr')).toHaveLength(1)
+    expect(sourceTable.text()).toContain('SKU-A × 1')
+    sourceTable.findAllComponents(ElCheckbox)[0]!.vm.$emit('change', true); await flushPromises()
+    expect(wrapper.text()).toContain('所选散件来源可用 1 件')
+    mode.vm.$emit('update:modelValue', 'BOX'); mode.vm.$emit('change'); await flushPromises()
+    expect(wrapper.findAll('.return-list-card')[1]!.findAll('tbody tr')).toHaveLength(3)
+  })
   beforeEach(() => {
     vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
     vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.vue b/src/modules/overseas-warehouse/pages/OutboundsView.vue
index 2985199d..e7e21a5e 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.vue
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.vue
@@ -68,6 +68,7 @@ function transferCustomerName(row: WarehouseTransferOutboundCandidate) {
 const selectedReturnStock = computed(() => returnStockRows.value.map((item) => {
   if (returnPickMode.value !== 'SKU') return item
   const quantity = selectedReturnCartons.value.reduce((sum, carton) => {
+    if (carton.sourceUnitType !== 'PARCEL') return sum
     if (selectedReturnNo.value && !(carton.sourceReturnNo || '').split(',').includes(selectedReturnNo.value)) return sum
     const items = returnCartonDetails.value[carton.cartonMark]?.items
     return items?.length === 1 && items[0]?.skuCode === item.skuCode ? sum + Number(items[0].availableQuantity ?? items[0].quantity) : sum
@@ -88,6 +89,7 @@ const filteredReturnCartons = computed(() => selectedReturnCartons.value.filter(
   if (returnPickMode.value === 'BOX' && item.sourceUnitType === 'PARCEL') return false
   if (selectedReturnNo.value && !(item.sourceReturnNo || returnCandidateByMark.value[item.cartonMark]?.returnNo || '').split(',').includes(selectedReturnNo.value)) return false
   if (returnPickMode.value === 'SKU') {
+    if (item.sourceUnitType !== 'PARCEL') return false
     const detail = returnCartonDetails.value[item.cartonMark]
     if (!selectedReturnSkus.value.length || detail?.items?.length !== 1 || detail.items[0]?.skuCode !== selectedReturnSkus.value[0]) return false
   }
@@ -222,7 +224,7 @@ async function submit() {
       }
       if (!selectedReturnMarks.value.length) {
         ElMessage.warning(returnPickMode.value === 'SKU'
-          ? filteredReturnCartons.value.length ? '请在右侧选择该 SKU 的来源箱或散件记录' : '该退货单没有此 SKU 的可用单 SKU 箱或散件库存；混合箱请先拆箱'
+          ? filteredReturnCartons.value.length ? '请在右侧选择该 SKU 的散件来源记录' : '该退货单没有此 SKU 的可用散件库存；箱内库存请按箱／托出库'
           : '请选择出库箱号或托盘')
         return
       }
@@ -346,7 +348,7 @@ onMounted(load)
         <el-form-item label="收件信息" required><el-input v-model="recipient" placeholder="请输入收件人、电话和地址" /></el-form-item>
         <el-form-item label="海外仓" required><el-select v-model="selectedWarehouseId" :disabled="!selectedCustomerId" filterable placeholder="请选择海外仓" @change="loadReturnCandidates"><el-option v-for="item in warehouseOptions" :key="item.value" :value="item.value" :label="item.label" /></el-select></el-form-item>
         <el-form-item label="退货单" required><el-select v-model="selectedReturnNo" filterable placeholder="选择已签收入库的退货单" @change="selectedReturnMarks = []"><el-option v-for="no in returnOrderOptions" :key="no" :label="no" :value="no" /></el-select></el-form-item>
-        <p v-if="returnPickMode === 'SKU'" class="candidate-hint">单 SKU 模式可填写全部或部分件数；已装箱货物由 PDA 扫箱唛按计划件数拣货，剩余数量保留在原箱。</p><el-form-item v-if="returnPickMode === 'SKU'" label="出库数量（件）" required><el-input-number v-model="returnQuantity" :min="1" :max="selectedReturnQuantity || 1" :precision="0" placeholder="选择来源后填写件数" /><span class="candidate-hint">所选来源可用 {{ selectedReturnQuantity }} 件；按来源箱号顺序分配</span></el-form-item><el-form-item label="出库维度"><el-radio-group v-model="returnPickMode" @change="changeReturnPickMode"><el-radio-button value="BOX">箱 / 托</el-radio-button><el-radio-button value="SKU">单 SKU</el-radio-button></el-radio-group></el-form-item>
+        <p v-if="returnPickMode === 'SKU'" class="candidate-hint">单 SKU 只展示该退货单的可用散件库存，可填写全部或部分件数，由 PDA 扫描 SKU 拣货。</p><el-form-item v-if="returnPickMode === 'SKU'" label="出库数量（件）" required><el-input-number v-model="returnQuantity" :min="1" :max="selectedReturnQuantity || 1" :precision="0" placeholder="选择来源后填写件数" /><span class="candidate-hint">所选散件来源可用 {{ selectedReturnQuantity }} 件</span></el-form-item><el-form-item label="出库维度"><el-radio-group v-model="returnPickMode" @change="changeReturnPickMode"><el-radio-button value="BOX">箱 / 托</el-radio-button><el-radio-button value="SKU">单 SKU</el-radio-button></el-radio-group></el-form-item>
         <el-form-item v-if="returnPickMode === 'BOX'" label="箱托方式"><el-radio-group v-model="returnUnitType" @change="changeReturnUnitType"><el-radio-button value="BOX">按箱号出库</el-radio-button><el-radio-button value="PALLET">按托盘出库</el-radio-button></el-radio-group></el-form-item>
         <el-form-item v-if="returnPickMode === 'BOX' && returnUnitType === 'PALLET' && returnPallets.length" label="整托选择"><div class="return-pallet-options"><el-checkbox v-for="code in returnPallets" :key="code" :model-value="returnCandidates.filter(item => item.palletCode === code && item.cartonMark).every(item => selectedReturnMarks.includes(item.cartonMark!))" @change="toggleReturnPallet(code, $event)">{{ code }}</el-checkbox></div></el-form-item>
         <div class="return-lists">

From c0155b82938e1619e7d100a2495f3a70416f5688 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sat, 10 Oct 2026 16:58:21 +0800
Subject: [PATCH 33/47] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overseas-warehouse/api/outbounds.ts       |  2 +-
 .../pages/OutboundsView.returnSku.test.ts     | 29 ++++++++---
 .../pages/OutboundsView.selection.test.ts     |  2 +-
 .../pages/OutboundsView.test.ts               |  2 +-
 .../pages/OutboundsView.vue                   | 49 ++++++++++++-------
 5 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/modules/overseas-warehouse/api/outbounds.ts b/src/modules/overseas-warehouse/api/outbounds.ts
index 187b7c49..5dd50015 100644
--- a/src/modules/overseas-warehouse/api/outbounds.ts
+++ b/src/modules/overseas-warehouse/api/outbounds.ts
@@ -52,7 +52,7 @@ export async function listReturnOutboundCandidates(customerId: string, warehouse
   const response = await http.get<ApiEnvelope<ReturnOutboundCandidate[]>, ApiEnvelope<ReturnOutboundCandidate[]>>('/platform/v1/last-leg/outbound-orders/return/candidates', { params: { customerId, warehouseId } })
   return unwrapApiResponse(response)
 }
-export async function createReturnOutbound(customerId: string, payload: { recipient: string; overseasWarehouseId: string; returnNo: string; cartonMarks: string[]; skuCode?: string; quantity?: number; unitType?: 'BOX' | 'PALLET'; remark?: string; idempotencyKey: string }) {
+export async function createReturnOutbound(customerId: string, payload: { recipient: string; overseasWarehouseId: string; returnNo: string; cartonMarks: string[]; skuCode?: string; quantity?: number; items?: Array<{ cartonMark: string; skuCode: string; quantity: number }>; unitType?: 'BOX' | 'PALLET'; remark?: string; idempotencyKey: string }) {
   const response = await http.post<ApiEnvelope<OutboundRow>, ApiEnvelope<OutboundRow>>('/platform/v1/last-leg/outbound-orders/return', payload, { params: { customerId } })
   return unwrapApiResponse(response)
 }
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
index d91791da..3f3bea3a 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.returnSku.test.ts
@@ -52,26 +52,41 @@ async function selectMarks(marks: string[]) {
   await flushPromises()
 }
 describe('single SKU outbound source and piece quantity', () => {
+  it('creates one outbound with multiple SKUs and independent quantities on source rows', async () => {
+    await open('SKU-A')
+    const left = wrapper.findAllComponents({ name: 'ElTable' }).filter(table => table.classes().includes('return-result-table'))[0]!
+    left.findAllComponents(ElCheckbox).find(check => check.element.closest('tr')?.textContent?.includes('SKU-B'))!.vm.$emit('change', true); await flushPromises()
+    expect(right().props('data')).toHaveLength(3)
+    await selectMarks(['LOOSE-A', 'PARCEL'])
+    const inputs = wrapper.findAllComponents(ElInputNumber)
+    inputs[0]!.vm.$emit('update:modelValue', 3)
+    inputs[2]!.vm.$emit('update:modelValue', 2)
+    await flushPromises()
+    await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ items: [{ cartonMark: 'LOOSE-A', skuCode: 'SKU-A', quantity: 3 }, { cartonMark: 'PARCEL', skuCode: 'SKU-B', quantity: 2 }] }))
+    expect(api.create.mock.calls[0][1].skuCode).toBeUndefined()
+    expect(wrapper.text()).not.toContain('选择来源后填写件数')
+  })
   it('selects only loose SKU sources scoped to the return order and excludes packed boxes', async () => {
     await open('SKU-A')
     expect(right().props('data').map((row: { cartonMark: string }) => row.cartonMark)).toEqual(['LOOSE-A', 'LOOSE-B'])
     expect(wrapper.text()).not.toContain('OTHER-ORDER')
     await selectMarks(['LOOSE-A', 'LOOSE-B'])
-    expect(wrapper.findComponent(ElInputNumber).props('modelValue')).toBe(10)
+    expect(wrapper.findAllComponents(ElInputNumber).map(input => input.props('modelValue'))).toEqual([5, 5])
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
-    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ skuCode: 'SKU-A', quantity: 10, cartonMarks: ['LOOSE-A', 'LOOSE-B'] }))
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ items: [{ cartonMark: 'LOOSE-A', skuCode: 'SKU-A', quantity: 5 }, { cartonMark: 'LOOSE-B', skuCode: 'SKU-A', quantity: 5 }], cartonMarks: ['LOOSE-A', 'LOOSE-B'] }))
   })
   it('submits six pieces from two five-piece loose sources', async () => {
     await open('SKU-A'); await selectMarks(['LOOSE-A', 'LOOSE-B'])
-    wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', 6); await flushPromises()
+    wrapper.findAllComponents(ElInputNumber)[1]!.vm.$emit('update:modelValue', 1); await flushPromises()
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
-    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ quantity: 6 }))
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ items: [{ cartonMark: 'LOOSE-A', skuCode: 'SKU-A', quantity: 5 }, { cartonMark: 'LOOSE-B', skuCode: 'SKU-A', quantity: 1 }] }))
   })
   it('allows loose PARCEL sources even when the box/pallet candidate endpoint excludes them', async () => {
     await open('SKU-B'); expect(right().props('data').map((row: { cartonMark: string }) => row.cartonMark)).toEqual(['PARCEL'])
     await selectMarks(['PARCEL']); wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', 2); await flushPromises()
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
-    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ skuCode: 'SKU-B', quantity: 2, cartonMarks: ['PARCEL'] }))
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({ items: [{ cartonMark: 'PARCEL', skuCode: 'SKU-B', quantity: 2 }], cartonMarks: ['PARCEL'] }))
   })
   it('never offers a parcel as a physical box in box/pallet mode', async () => {
     await open('SKU-B')
@@ -80,11 +95,11 @@ describe('single SKU outbound source and piece quantity', () => {
     expect(right().props('data').some((row: { sourceUnitType: string }) => row.sourceUnitType === 'PARCEL')).toBe(false)
     expect(right().text()).not.toContain('包裹散件')
   })
-  it.each([[0,1],[11,10]])('clamps input %s to the allowed bound %s', async (quantity, expected) => {
+  it.each([[0,1],[11,5]])('clamps input %s to the allowed bound %s', async (quantity, expected) => {
     await open('SKU-A'); await selectMarks(['LOOSE-A', 'LOOSE-B'])
     wrapper.findComponent(ElInputNumber).vm.$emit('update:modelValue', quantity); await flushPromises()
     await wrapper.get('[data-test="submit"]').trigger('click'); await flushPromises()
-    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({quantity: expected}))
+    expect(api.create).toHaveBeenCalledWith('C1', expect.objectContaining({items: expect.arrayContaining([expect.objectContaining({cartonMark: 'LOOSE-A', quantity: expected})])}))
   })
   it.each([1.5])('blocks invalid quantity %s before creating an order', async quantity => {
     await open('SKU-A'); await selectMarks(['LOOSE-A', 'LOOSE-B'])
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts
index 308067a5..cce1b5d2 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.selection.test.ts
@@ -79,7 +79,7 @@ describe('outbound candidate search and selection', () => {
     expect(sourceTable.findAll('tbody tr')).toHaveLength(1)
     expect(sourceTable.text()).toContain('SKU-A × 1')
     sourceTable.findAllComponents(ElCheckbox)[0]!.vm.$emit('change', true); await flushPromises()
-    expect(wrapper.text()).toContain('所选散件来源可用 1 件')
+    expect(wrapper.findComponent({ name: 'ElInputNumber' }).props('modelValue')).toBe(1)
     mode.vm.$emit('update:modelValue', 'BOX'); mode.vm.$emit('change'); await flushPromises()
     expect(wrapper.findAll('.return-list-card')[1]!.findAll('tbody tr')).toHaveLength(3)
   })
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.test.ts
index e8efdefb..98157ae4 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.test.ts
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.test.ts
@@ -79,7 +79,7 @@ describe('OutboundsView permissions and navigation', () => {
     expect(source).toContain('@click="searchReturnSkus"')
     expect(source).toContain('@click="searchReturnCartons"')
     expect(source).toContain(':page-sizes="[5, 10, 20, 50]"')
-    expect(source).toContain('width="min(1320px, calc(100vw - 32px))"')
+    expect(source).toContain('width="min(1760px, calc(100vw - 32px))" fullscreenable')
   })
 
   it('resolves warehouse-transfer customer names from the platform customer list', () => {
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.vue b/src/modules/overseas-warehouse/pages/OutboundsView.vue
index e7e21a5e..43cdcc63 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.vue
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.vue
@@ -38,7 +38,7 @@ const returnStockRows = ref<ReturnStockRow[]>([])
 const returnCartonRows = ref<ReturnCartonRow[]>([])
 const selectedReturnSkus = ref<string[]>([])
 const returnPickMode = ref<'BOX' | 'SKU'>('BOX')
-const returnQuantity = ref<number | undefined>()
+const returnSourceQuantities = ref<Record<string, number | undefined>>({})
 const returnSkuQueryInput = ref(''); const returnSkuQuery = ref('')
 const returnCartonQueryInput = ref(''); const returnCartonQuery = ref('')
 const returnSkuPage = ref(1); const returnCartonPage = ref(1); const returnUnitType = ref<'BOX' | 'PALLET'>('BOX')
@@ -91,7 +91,7 @@ const filteredReturnCartons = computed(() => selectedReturnCartons.value.filter(
   if (returnPickMode.value === 'SKU') {
     if (item.sourceUnitType !== 'PARCEL') return false
     const detail = returnCartonDetails.value[item.cartonMark]
-    if (!selectedReturnSkus.value.length || detail?.items?.length !== 1 || detail.items[0]?.skuCode !== selectedReturnSkus.value[0]) return false
+    if (!selectedReturnSkus.value.length || detail?.items?.length !== 1 || !selectedReturnSkus.value.includes(detail.items[0]?.skuCode || '')) return false
   }
   const detailSkus = returnCartonDetails.value[item.cartonMark]?.items?.map((detail) => detail.skuCode).join(',') || ''
   return matchesAnyToken(`${item.cartonMark},${item.fbaCartonMark || ''},${detailSkus}`, returnCartonQuery.value)
@@ -99,11 +99,13 @@ const filteredReturnCartons = computed(() => selectedReturnCartons.value.filter(
 const pagedReturnStocks = computed(() => filteredReturnStocks.value.slice((returnSkuPage.value - 1) * returnSkuPageSize.value, returnSkuPage.value * returnSkuPageSize.value))
 const pagedReturnCartons = computed(() => filteredReturnCartons.value.slice((returnCartonPage.value - 1) * returnCartonPageSize.value, returnCartonPage.value * returnCartonPageSize.value))
 const effectiveReturnMarks = computed(() => [...new Set(selectedReturnMarks.value)].filter(Boolean) as string[])
-const selectedReturnQuantity = computed(() => effectiveReturnMarks.value.reduce((sum, mark) => {
-  const line = returnCartonDetails.value[mark]?.items.find(item => item.skuCode === selectedReturnSkus.value[0])
-  return sum + Number(line?.availableQuantity ?? line?.quantity ?? 0)
-}, 0))
-watch(selectedReturnQuantity, quantity => { returnQuantity.value = quantity || undefined })
+function returnSourceAvailable(mark: string) {
+  const item = returnCartonDetails.value[mark]?.items[0]
+  return Number(item?.availableQuantity ?? item?.quantity ?? 0)
+}
+watch([selectedReturnNo, selectedCustomerId, selectedWarehouseId], () => {
+  selectedReturnSkus.value = []; selectedReturnMarks.value = []; returnSourceQuantities.value = {}
+})
 const returnMarksModel = computed({ get: () => selectedReturnMarks.value, set: (value: string[]) => { selectedReturnMarks.value = value } })
 const filteredDropshipCandidates = computed(() => dropshipCandidates.value.filter(item => !dropshipQuery.value.trim() || [item.orderNo, item.inboundCode, item.customerName, item.palletNo, item.skuCode, item.productName].join(' ').toLowerCase().includes(dropshipQuery.value.trim().toLowerCase())))
 const pagedDropshipCandidates = computed(() => filteredDropshipCandidates.value.slice((dropshipPage.value - 1) * dropshipPageSize.value, dropshipPage.value * dropshipPageSize.value))
@@ -194,10 +196,16 @@ function resetDropshipCandidates() { dropshipQueryInput.value = ''; dropshipQuer
 function normalizeBatchQuery(value: string) { return value.split(/[,，\n]+/).map((item) => item.replace(/\s+/g, '')).filter(Boolean).join(',') }
 function searchReturnSkus() { returnSkuQueryInput.value = normalizeBatchQuery(returnSkuQueryInput.value); returnSkuQuery.value = returnSkuQueryInput.value; returnSkuPage.value = 1 }
 function searchReturnCartons() { returnCartonQueryInput.value = normalizeBatchQuery(returnCartonQueryInput.value); returnCartonQuery.value = returnCartonQueryInput.value; returnCartonPage.value = 1 }
-function toggleReturnSku(sku: string, checked: boolean | string | number) { selectedReturnSkus.value = checked ? [sku] : []; selectedReturnMarks.value = [] }
+function toggleReturnSku(sku: string, checked: boolean | string | number) {
+  selectedReturnSkus.value = checked ? [...new Set([...selectedReturnSkus.value, sku])] : selectedReturnSkus.value.filter(value => value !== sku)
+  if (!checked) selectedReturnMarks.value = selectedReturnMarks.value.filter(mark => returnCartonDetails.value[mark]?.items[0]?.skuCode !== sku)
+}
 function changeReturnPickMode() { selectedReturnSkus.value = []; selectedReturnMarks.value = []; returnUnitType.value = 'BOX' }
 function changeReturnUnitType() { selectedReturnMarks.value = [] }
-function toggleReturnCarton(cartonMark: string, checked: boolean | string | number) { selectedReturnMarks.value = checked ? [...new Set([...selectedReturnMarks.value, cartonMark])] : selectedReturnMarks.value.filter((value) => value !== cartonMark) }
+function toggleReturnCarton(cartonMark: string, checked: boolean | string | number) {
+  selectedReturnMarks.value = checked ? [...new Set([...selectedReturnMarks.value, cartonMark])] : selectedReturnMarks.value.filter(value => value !== cartonMark)
+  if (checked && returnPickMode.value === 'SKU') returnSourceQuantities.value[cartonMark] = returnSourceAvailable(cartonMark)
+}
 function toggleReturnPallet(palletCode: string, checked: boolean | string | number) {
   const marks = returnCandidates.value.filter(item => item.palletCode === palletCode && item.cartonMark).map(item => item.cartonMark!)
   selectedReturnMarks.value = checked ? [...new Set([...selectedReturnMarks.value, ...marks])] : selectedReturnMarks.value.filter(mark => !marks.includes(mark))
@@ -218,9 +226,16 @@ async function submit() {
     } else if (outboundType.value === 'RETURN_OUTBOUND') {
       if (!recipient.value.trim()) { ElMessage.warning('请填写收件信息'); return }
       if (!selectedReturnNo.value) { ElMessage.warning('请选择退货单'); return }
-      if (returnPickMode.value === 'SKU' && selectedReturnSkus.value.length !== 1) { ElMessage.warning('请选择一个 SKU'); return }
-      if (returnPickMode.value === 'SKU' && (!Number.isSafeInteger(returnQuantity.value) || Number(returnQuantity.value) <= 0 || Number(returnQuantity.value) > selectedReturnQuantity.value)) {
-        ElMessage.warning(`请填写 1-${selectedReturnQuantity.value} 件的出库数量`); return
+      if (returnPickMode.value === 'SKU') {
+        if (!selectedReturnSkus.value.length) { ElMessage.warning('请至少选择一个 SKU'); return }
+        if (selectedReturnSkus.value.some(sku => !effectiveReturnMarks.value.some(mark => returnCartonDetails.value[mark]?.items[0]?.skuCode === sku))) {
+          ElMessage.warning('请为每个已选 SKU 选择散件来源并填写出库数量'); return
+        }
+        if (effectiveReturnMarks.value.some(mark => !filteredReturnCartons.value.some(row => row.cartonMark === mark)
+          || !Number.isSafeInteger(returnSourceQuantities.value[mark]) || Number(returnSourceQuantities.value[mark]) <= 0
+          || Number(returnSourceQuantities.value[mark]) > returnSourceAvailable(mark))) {
+          ElMessage.warning('请在明细中填写大于0且不超过来源可用数量的整数'); return
+        }
       }
       if (!selectedReturnMarks.value.length) {
         ElMessage.warning(returnPickMode.value === 'SKU'
@@ -228,7 +243,7 @@ async function submit() {
           : '请选择出库箱号或托盘')
         return
       }
-      await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, skuCode: returnPickMode.value === 'SKU' ? selectedReturnSkus.value[0] : undefined, quantity: returnPickMode.value === 'SKU' ? returnQuantity.value : undefined, unitType: returnPickMode.value === 'SKU' ? 'BOX' : returnUnitType.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` })
+      await createReturnOutbound(selectedCustomerId.value, { recipient: recipient.value.trim(), overseasWarehouseId: selectedWarehouseId.value, returnNo: selectedReturnNo.value, cartonMarks: selectedReturnMarks.value, items: returnPickMode.value === 'SKU' ? effectiveReturnMarks.value.map(mark => ({ cartonMark: mark, skuCode: returnCartonDetails.value[mark]!.items[0]!.skuCode, quantity: Number(returnSourceQuantities.value[mark]) })) : undefined, unitType: returnPickMode.value === 'SKU' ? 'BOX' : returnUnitType.value, remark: remark.value.trim() || undefined, idempotencyKey: `web-return-${Date.now()}` })
       ElMessage.success('退货出库单和待派送单已创建，作业已推送 PDA')
     } else {
       const selected = dropshipCandidates.value.filter(item => selectedDropshipIds.value.includes(dropshipCandidateKey(item)))
@@ -266,7 +281,7 @@ onMounted(load)
       <template #status="{ row }"><StatusBadge :status="row.status === 'CANCELLED' ? '已取消' : row.status === 'OUTBOUNDED' ? '已出库' : row.status === 'PICKED' ? '已拣货' : row.status === 'WAIT_OUTBOUND' ? '待出库' : row.status === 'PICKING' ? '拣货中' : row.status === 'WAIT_PICK' ? '待拣货' : '未知状态'" /></template>
     </DataTable></section>
   </ListPageLayout></AdminPage>
-  <AppDialog class="admin-density-dialog" v-model="createOpen" title="新建出库单" width="min(1320px, calc(100vw - 32px))" :confirm-text="outboundType === 'WAREHOUSE_TRANSFER_OUTBOUND' ? '绑定目的地并进入排车' : '生成出库单并推送PDA'" :confirm-loading="saving" @confirm="submit">
+  <AppDialog class="admin-density-dialog" v-model="createOpen" title="新建出库单" width="min(1760px, calc(100vw - 32px))" fullscreenable :confirm-text="outboundType === 'WAREHOUSE_TRANSFER_OUTBOUND' ? '绑定目的地并进入排车' : '生成出库单并推送PDA'" :confirm-loading="saving" @confirm="submit">
     <el-form class="create-outbound-form density-form" label-position="top">
       <el-form-item label="出库类型" required>
         <el-radio-group v-model="outboundType" @change="changeOutboundType">
@@ -348,7 +363,7 @@ onMounted(load)
         <el-form-item label="收件信息" required><el-input v-model="recipient" placeholder="请输入收件人、电话和地址" /></el-form-item>
         <el-form-item label="海外仓" required><el-select v-model="selectedWarehouseId" :disabled="!selectedCustomerId" filterable placeholder="请选择海外仓" @change="loadReturnCandidates"><el-option v-for="item in warehouseOptions" :key="item.value" :value="item.value" :label="item.label" /></el-select></el-form-item>
         <el-form-item label="退货单" required><el-select v-model="selectedReturnNo" filterable placeholder="选择已签收入库的退货单" @change="selectedReturnMarks = []"><el-option v-for="no in returnOrderOptions" :key="no" :label="no" :value="no" /></el-select></el-form-item>
-        <p v-if="returnPickMode === 'SKU'" class="candidate-hint">单 SKU 只展示该退货单的可用散件库存，可填写全部或部分件数，由 PDA 扫描 SKU 拣货。</p><el-form-item v-if="returnPickMode === 'SKU'" label="出库数量（件）" required><el-input-number v-model="returnQuantity" :min="1" :max="selectedReturnQuantity || 1" :precision="0" placeholder="选择来源后填写件数" /><span class="candidate-hint">所选散件来源可用 {{ selectedReturnQuantity }} 件</span></el-form-item><el-form-item label="出库维度"><el-radio-group v-model="returnPickMode" @change="changeReturnPickMode"><el-radio-button value="BOX">箱 / 托</el-radio-button><el-radio-button value="SKU">单 SKU</el-radio-button></el-radio-group></el-form-item>
+        <p v-if="returnPickMode === 'SKU'" class="candidate-hint">单 SKU 只展示该退货单的可用散件库存，可填写全部或部分件数，由 PDA 扫描 SKU 拣货。</p><el-form-item label="出库维度"><el-radio-group v-model="returnPickMode" @change="changeReturnPickMode"><el-radio-button value="BOX">箱 / 托</el-radio-button><el-radio-button value="SKU">单 SKU</el-radio-button></el-radio-group></el-form-item>
         <el-form-item v-if="returnPickMode === 'BOX'" label="箱托方式"><el-radio-group v-model="returnUnitType" @change="changeReturnUnitType"><el-radio-button value="BOX">按箱号出库</el-radio-button><el-radio-button value="PALLET">按托盘出库</el-radio-button></el-radio-group></el-form-item>
         <el-form-item v-if="returnPickMode === 'BOX' && returnUnitType === 'PALLET' && returnPallets.length" label="整托选择"><div class="return-pallet-options"><el-checkbox v-for="code in returnPallets" :key="code" :model-value="returnCandidates.filter(item => item.palletCode === code && item.cartonMark).every(item => selectedReturnMarks.includes(item.cartonMark!))" @change="toggleReturnPallet(code, $event)">{{ code }}</el-checkbox></div></el-form-item>
         <div class="return-lists">
@@ -361,7 +376,7 @@ onMounted(load)
           <section class="return-list-card">
             <div class="list-title"><span>{{ returnPickMode === 'SKU' ? 'SKU 来源明细' : '箱号列表' }}</span><small>支持多个箱号或 SKU，用英文逗号分隔</small></div>
             <div class="candidate-query"><el-input v-model="returnCartonQueryInput" clearable placeholder="如：RC001,RC002 或 SKU001,SKU002" /><el-button type="primary" @click="searchReturnCartons">查询</el-button></div>
-            <el-table :data="pagedReturnCartons" border stripe class="return-result-table" max-height="400"><el-table-column label="选择" width="60" align="center"><template #default="{ row }"><el-checkbox :model-value="selectedReturnMarks.includes(row.cartonMark)" @change="toggleReturnCarton(row.cartonMark, $event)" /></template></el-table-column><el-table-column :label="returnPickMode === 'SKU' ? '库存来源' : '箱号'" min-width="190" show-overflow-tooltip><template #default="{ row }">{{ row.sourceUnitType === 'PARCEL' ? '包裹散件（按 SKU 拣货）' : row.cartonMark }}</template></el-table-column><el-table-column label="托盘" min-width="150"><template #default="{ row }">{{ row.sourceUnitType === 'PARCEL' ? '无需托盘' : returnCandidateByMark[row.cartonMark]?.palletCode || '散箱' }}</template></el-table-column><el-table-column label="箱内SKU及数量" min-width="230"><template #default="{ row }">{{ returnCartonDetails[row.cartonMark]?.items?.map((item) => `${item.skuCode} × ${item.quantity}`).join('，') || '加载中' }}</template></el-table-column></el-table>
+            <el-table :data="pagedReturnCartons" border stripe class="return-result-table" max-height="400"><el-table-column label="选择" width="60" align="center" fixed="left"><template #default="{ row }"><el-checkbox :model-value="selectedReturnMarks.includes(row.cartonMark)" @change="toggleReturnCarton(row.cartonMark, $event)" /></template></el-table-column><el-table-column :label="returnPickMode === 'SKU' ? '库存来源' : '箱号'" min-width="160" show-overflow-tooltip><template #default="{ row }">{{ row.sourceUnitType === 'PARCEL' ? '包裹散件（按 SKU 拣货）' : row.cartonMark }}</template></el-table-column><el-table-column v-if="returnPickMode !== 'SKU'" label="托盘" min-width="150"><template #default="{ row }">{{ row.sourceUnitType === 'PARCEL' ? '无需托盘' : returnCandidateByMark[row.cartonMark]?.palletCode || '散箱' }}</template></el-table-column><el-table-column :label="returnPickMode === 'SKU' ? 'SKU及可用数量' : '箱内SKU及数量'" min-width="230"><template #default="{ row }">{{ returnCartonDetails[row.cartonMark]?.items?.map((item) => `${item.skuCode} × ${item.quantity}`).join('，') || '加载中' }}</template></el-table-column><el-table-column v-if="returnPickMode === 'SKU'" label="出库数量（件）" width="150" fixed="right"><template #default="{ row }"><el-input-number v-model="returnSourceQuantities[row.cartonMark]" :disabled="!selectedReturnMarks.includes(row.cartonMark)" :min="1" :max="returnSourceAvailable(row.cartonMark)" :precision="0" controls-position="right" size="small" placeholder="数量" style="width: 120px" :aria-label="`出库数量 ${returnCartonDetails[row.cartonMark]?.items[0]?.skuCode} ${row.cartonMark}`" /></template></el-table-column></el-table>
             <div class="return-pagination"><span>已选择 {{ selectedReturnMarks.length }} 个{{ returnPickMode === 'SKU' ? '来源' : '箱号' }}</span><el-pagination v-model:current-page="returnCartonPage" v-model:page-size="returnCartonPageSize" :page-sizes="[5, 10, 20, 50]" :total="filteredReturnCartons.length" layout="total, sizes, prev, pager, next" @size-change="returnCartonPage = 1" /></div>
           </section>
         </div>
@@ -394,7 +409,7 @@ onMounted(load)
 .candidate-pagination :deep(.el-pagination__sizes), .return-pagination :deep(.el-pagination__sizes) { flex: 0 0 128px; }
 .candidate-pagination :deep(.el-pagination__sizes .el-select), .return-pagination :deep(.el-pagination__sizes .el-select) { width: 128px; }
 .candidate-pagination :deep(.el-pagination__jump .el-input) { width: 56px; }
-.return-lists { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); gap: var(--admin-space-5); width: 100%; margin: var(--admin-space-1) 0 var(--admin-space-5); }
+.return-lists { display: grid; grid-template-columns: minmax(0, 0.85fr) minmax(0, 1.15fr); gap: var(--admin-space-5); width: 100%; margin: var(--admin-space-1) 0 var(--admin-space-5); }
 .return-pallet-options { display: flex; flex-wrap: wrap; gap: 8px 16px; }
 .return-list-card { min-width: 0; padding: var(--admin-space-5); border: 1px solid var(--el-border-color-light); border-radius: var(--admin-radius); background: var(--el-fill-color-extra-light); }
 .list-title { display: flex; align-items: baseline; justify-content: space-between; gap: var(--admin-space-5); margin-bottom: var(--admin-space-5); }

From 67bd3e6e53c75529b536457186b91ecf52eeaff7 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 17:36:36 +0800
Subject: [PATCH 34/47] fix(appointments): show full candidate business
 identifiers

---
 .../appointment-calendar/AppointmentCalendarView.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index cb846659..22d25403 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -105,13 +105,13 @@ async function loadUnscheduled() {
 const statusLabels: Record<string, string> = { PENDING: '安排待确认', SUCCESS: '对方已确认', FAILED: '未约成', CANCELLED: '已取消' }
 const columns: DataTableColumn[] = [
   { key: 'selection', type: 'selection', reserveSelection: true, width: 46, selectable: (row: InboundOrderSummaryDto) => row.fbaWarehouseCode === searchedWarehouse.value && (!row.appointmentStatus || ['FAILED', 'CANCELLED'].includes(row.appointmentStatus)) },
-  { prop: 'inboundCode', label: '入仓码', minWidth: 150 },
-  { prop: 'customerName', label: '客户', slotName: 'customer', minWidth: 150 },
+  { prop: 'inboundCode', label: '入仓码', minWidth: 220, singleLine: false, showOverflowTooltip: false },
+  { prop: 'customerName', label: '客户', slotName: 'customer', minWidth: 180, singleLine: false, showOverflowTooltip: false },
   { prop: 'fbaWarehouseCode', label: '目的仓', width: 110 },
-  { prop: 'overseasWarehouseName', label: '海外仓', minWidth: 150 },
+  { prop: 'overseasWarehouseName', label: '海外仓', minWidth: 150, singleLine: false, showOverflowTooltip: false },
   { prop: 'packageCount', label: '箱数', width: 80 },
   { prop: 'palletCount', label: '托数', width: 80 },
-  { prop: 'appointmentNo', label: '已有预约号', minWidth: 160 },
+  { prop: 'appointmentNo', label: '已有预约号', minWidth: 160, singleLine: false, showOverflowTooltip: false },
 ]
 const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival => ({
   key: `arrival-${arrival.containerBookingId}`, type: 'arrival' as const,

From 7f39adf9f5a2f73a523f8cf0bcaf938b4e8577dc Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 18:15:39 +0800
Subject: [PATCH 35/47] fix(fleet): lock destination in readonly inquiry dialog

---
 .../components/CapacityInquiryDialog.test.ts  | 33 +++++++++++++++++++
 .../components/CapacityInquiryDialog.vue      |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts b/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts
index 78444e8d..51b2cf4c 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts
@@ -59,3 +59,36 @@ it.each(scenarios)('uses explicit offer quote queries, pagination and negotiated
   expect(listOfferQuotes).toHaveBeenCalledTimes(2)
   expect(wrapper.emitted('saved')).toHaveLength(1)
 })
+
+it('locks the destination in readonly follow-up even without offer detail, while allowing multi-stop editing', async () => {
+  permissions.values = new Set(['platform:fleet:capacity-offer:manage'])
+  const multi = { ...offer, destinations: [...offer.destinations, { destinationKey: 'FBA:ACY2', name: 'ACY2', deliveryIndex: 2, remaining: null }] }
+  const row: CapacityInquiry = {
+    bookingNo: 'FB-READONLY', offerNo: offer.offerNo, tripNo: offer.tripNo, status: 'DRAFT', recordVersion: 1,
+    offerRecordVersion: offer.recordVersion, tripRecordVersion: offer.tripRecordVersion, salesOwnerUserId: '17',
+    customerId: '19', customerCode: 'C-19', customerName: '测试客户', businessType: 'LOCAL_LOOSEBOARD', deliveryMode: 'SELF_DELIVERY',
+    estimatedArrivalAt: null, expectedPalletCount: null,
+    cargo: { destinationKey: 'FBA:ACY2', cargoName: null, packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null, priceBasis: 'PALLET', unitPrice: null, currency: 'USD', contactName: null, contactPhone: null, remark: null },
+    destinationLabel: 'ACY2', agreedAmount: null, quoteSource: null, businessOrderNo: null, incomingNo: null, dispatchNo: null,
+    updatedAt: '2026-10-10T00:00:00Z', actions: { canEdit: true, canConfirm: false, canCancel: true, blockReason: null }, appointmentCoverage: null,
+    progress: { stage: 'NEEDS_DETAILS', label: '待补资料', reservation: '尚未保位', owner: '销售', primaryAction: 'EDIT', message: '待补资料', missingFields: [] },
+  }
+  const wrapper = mount(CapacityInquiryDialog, { attachTo: document.body, props: { modelValue: true, offer: null, inquiry: row, readonly: true }, global: { plugins: [createPinia(), ElementPlus] } })
+  wrappers.push(wrapper); await flushPromises()
+  const destination = () => formItem(wrapper, '本车卸货站').findComponent({ name: 'ElSelect' })
+  expect(destination().get('input[role="combobox"]').attributes('disabled')).toBeDefined()
+  await destination().find('.el-select__wrapper').trigger('click'); await flushPromises()
+  expect(destination().get('input[role="combobox"]').attributes('aria-expanded')).toBe('false')
+  expect(destination().props('modelValue')).toBe('FBA:ACY2')
+  await wrapper.setProps({ offer: multi, readonly: false }); await flushPromises()
+  expect(destination().get('input[role="combobox"]').attributes('disabled')).toBeUndefined()
+  await destination().find('.el-select__wrapper').trigger('click'); await flushPromises()
+  expect(destination().get('input[role="combobox"]').attributes('aria-expanded')).toBe('true')
+  await select(wrapper, '本车卸货站', 'FBA:ONT8')
+  expect(destination().props('modelValue')).toBe('FBA:ONT8')
+  await wrapper.setProps({ inquiry: null }); await flushPromises()
+  expect(destination().get('input[role="combobox"]').attributes('disabled')).toBeUndefined()
+  await wrapper.setProps({ offer }); await flushPromises()
+  expect(destination().get('input[role="combobox"]').attributes('disabled')).toBeDefined()
+  expect(saveCapacityInquiry).not.toHaveBeenCalled()
+})
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index 86ff707d..75ea25ea 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -119,7 +119,7 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
     </section>
     <el-form label-position="top" class="density-form capacity-inquiry-form" :disabled="lock">
       <el-form-item label="委托客户" required><el-select v-model="form.customerId" filterable remote :remote-method="searchCustomers" :loading="customerLoading" :disabled="!!inquiry" placeholder="按客户编号或名称搜索" @focus="searchCustomers()"><el-option v-if="inquiry" :value="inquiry.customerId" :label="`${inquiry.customerCode} · ${inquiry.customerName}`" /><el-option v-for="customer in customers" :key="customer.id" :value="customer.id" :label="`${customer.code} · ${customer.name}`" /></el-select><span v-if="customerSearched && !customers.length">暂无可选客户</span></el-form-item>
-      <el-form-item label="本车卸货站" required><el-select v-model="form.cargo.destinationKey" :disabled="offer?.destinations.length === 1" placeholder="选择本车既有卸货站"><el-option v-for="stop in offer?.destinations || []" :key="stop.destinationKey" :value="stop.destinationKey" :label="stop.name" /><el-option v-if="!offer && inquiry" :value="inquiry.cargo.destinationKey" :label="inquiry.destinationLabel" /></el-select></el-form-item>
+      <el-form-item label="本车卸货站" required><el-select v-model="form.cargo.destinationKey" :disabled="lock || offer?.destinations.length === 1" placeholder="选择本车既有卸货站"><el-option v-for="stop in offer?.destinations || []" :key="stop.destinationKey" :value="stop.destinationKey" :label="stop.name" /><el-option v-if="!offer && inquiry" :value="inquiry.cargo.destinationKey" :label="inquiry.destinationLabel" /></el-select></el-form-item>
       <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>已知货量（可先填写，未知可留空）</summary><div class="capacity-inquiry-form">
       <el-form-item label="预计箱数"><el-input-number v-model="form.cargo.packageCount" :min="1" :precision="0" placeholder="未知可留空" /></el-form-item>
       <el-form-item label="预计实托数"><el-input-number v-model="form.expectedPalletCount" :min="1" :precision="0" placeholder="卡车确认承运前必填" /></el-form-item>

From ebff6f816771005639facdfacb5a182f4a471af7 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 18:38:08 +0800
Subject: [PATCH 36/47] fix(appointments): show authoritative timezone and
 business source

---
 .../appointment-calendar/AppointmentCargoPanel.vue  |  5 +++--
 .../AppointmentImpactDialog.test.ts                 | 13 +++++++++++++
 .../AppointmentImpactDialog.vue                     |  5 +++--
 .../AppointmentTableRendering.test.ts               | 12 ++++++++----
 src/modules/appointment-calendar/planningApi.ts     |  1 +
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index 8286eb82..e3f38e1d 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -105,7 +105,7 @@ const columns: DataTableColumn[] = [
   { prop: 'packages', label: '预报箱数', width: 100 },
   { prop: 'receivedPackages', label: '实收箱数', width: 100 },
   { prop: 'estimatedArrivalAt', label: '来源预计到港', minWidth: 170 },
-  { prop: 'estimatedWarehouseAt', label: '已保存预计到仓', minWidth: 170 },
+  { prop: 'estimatedWarehouseAt', label: '已保存预计到仓', minWidth: 180, slotName: 'warehouseEta', singleLine: false },
   { key: 'progress', label: '当前事项', slotName: 'progress', minWidth: 170 },
 ]
 
@@ -179,6 +179,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
     </template>
     <template #actions="{ row }"><RowActions :actions="[{ key: 'followup', label: '跟进' }, { key: 'source', label: '查看来源' }]" text-actions @action="key => key === 'followup' ? openFollowup(row as PlanningCargo) : source(row as PlanningCargo)" /></template>
     <template #select="{ row }"><el-checkbox :model-value="!!selected[row.sourceKey]" :aria-label="`选择 ${row.inboundCode || '未关联入仓码'}`" :disabled="batchLoading || (!selected[row.sourceKey] && (!selectable(row as PlanningCargo) || selectedRows.length >= 100))" @change="(value: boolean | string | number) => toggle(row as PlanningCargo, value)" /></template>
+    <template #warehouseEta="{ row }"><span>{{ row.estimatedWarehouseAt?.replace('T', ' ') || '—' }}</span><div v-if="row.estimatedWarehouseAt" class="cargo-note">来源时区未明确</div></template>
     <template #progress="{ row }">
       <span v-if="row.detained">暂扣，待处理</span>
       <span v-else-if="row.mixedDestinations">含多个目的地，待核对</span>
@@ -193,7 +194,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
     <p v-if="batchPreview.group.readinessIncomplete">货物备妥窗口待核实；预计到港或预计到仓不能替代备妥时间。</p>
     <p>保存前尚未占用货物；先保存安排不代表已取得对方确认。</p>
     <LoadErrorState v-if="createError" title="预约安排保存未完成" :message="createError.message" :show-retry="false"><template #details><ApiErrorMeta :details="createError" /></template></LoadErrorState>
-    <FbaAppointmentFields :model="arrangement" :disabled="creating || !!pendingCreate" />
+    <FbaAppointmentFields :timezone="batchPreview.destinationTimezone" :model="arrangement" :disabled="creating || !!pendingCreate" />
   </AppDialog>
 </template>
 
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
index 9ddc3d72..b6bfef33 100644
--- a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
@@ -15,9 +15,22 @@ describe('appointment impact handling', () => {
     expect(wrapper.text()).toContain('2026-10-17T09:00:00')
     expect(wrapper.text()).toContain('2026-10-16T09:00:00')
     expect(wrapper.text()).toContain('无车次查看权限')
+    expect(wrapper.text()).toContain('来源：carrier')
+    expect(wrapper.text()).toContain('核对原因：到港预测变化')
     expect(wrapper.text()).not.toContain('认领跟进')
     expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
   })
+  it('labels manual observations without exposing internal operator references and explains missing forecasts', async () => {
+    vi.mocked(getImpact).mockResolvedValueOnce({ ...detail, impact: { ...detail.impact, reason: 'FORECAST_MISSING', latest: { ...detail.impact.latest!, providerCode: 'MANUAL', sourceReference: 'MANUAL:1000001', estimatedAt: null } } })
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.text()).toContain('来源：人工维护')
+    expect(wrapper.text()).toContain('来源预计到港缺失，待核实')
+    expect(wrapper.text()).not.toContain('1000001')
+    expect(wrapper.text()).not.toContain('MANUAL:')
+    expect(wrapper.text()).not.toContain('已延误')
+    expect(wrapper.text()).toContain('认领跟进')
+    expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
+  })
   it('freezes an uncertain command and retries exactly once with original version and key', async () => {
     vi.mocked(handleImpact).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({ ...detail.impact, version: 2 })
     const wrapper = render(); await flushPromises()
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.vue b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
index 8bf0cdc7..b5c3cc1a 100644
--- a/src/modules/appointment-calendar/AppointmentImpactDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
@@ -5,7 +5,7 @@ import { ElMessage } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { getImpact, handleImpact, impactStatus, type ImpactDetail, type ImpactCommand } from './impactApi'
+import { getImpact, handleImpact, impactStatus, impactReason, type ImpactDetail, type ImpactCommand } from './impactApi'
 const props = defineProps<{ containerId: string; canWrite: boolean }>()
 const emit = defineEmits<{ close: []; saved: [] }>()
 const router = useRouter(), detail = ref<ImpactDetail | null>(null), loading = ref(false), saving = ref(false), historyPage = ref(1)
@@ -35,8 +35,9 @@ onMounted(load)
     <LoadErrorState v-if="error" title="核对未完成" :message="error.message" :show-retry="!pending" @retry="load" />
     <template v-if="detail">
       <p>{{ detail.impact.impactNo }} · {{ impactStatus[detail.impact.status] }} · 负责人：{{ detail.impact.ownerName || '未认领' }}</p>
+      <p>核对原因：{{ detail.impact.reason === 'FORECAST_MISSING' ? '来源预计到港缺失，待核实' : impactReason[detail.impact.reason || ''] || '待核实' }}</p>
       <p>基准 ETA：{{ detail.impact.baseline?.estimatedAt || '待核实' }} → 最新 ETA：{{ detail.impact.latest?.estimatedAt || '待核实' }}</p>
-      <p>来源：{{ detail.impact.latest?.providerCode || '待核实' }} · {{ detail.impact.latest?.sourceReference || '—' }} · 观察时间：{{ detail.impact.latest?.observedAt || '—' }}</p>
+      <p>来源：{{ detail.impact.latest?.providerCode === 'MANUAL' ? '人工维护' : detail.impact.latest?.providerCode || '待核实' }} · 观察时间：{{ detail.impact.latest?.observedAt || '—' }}</p>
       <p>实际到港：{{ detail.impact.latest?.actualAt || '未记录' }}。以上为来源原始时间，时区未核实；不能据此判定跨时区违约。</p>
       <details open><summary>直接关联货物 {{ detail.cargo.length }} 票</summary><div class="impact-list"><p v-for="(row, index) in detail.cargo" :key="index">{{ row.inboundCode || '未关联入仓码' }} · {{ row.customerName || '—' }} · {{ row.destination || '—' }} · {{ row.packages ?? '待核实' }} 箱</p></div></details>
       <details open><summary>需复核的收货预约 {{ detail.appointments.length }} 张（确认时间不自动修改）</summary><div class="impact-list"><p v-for="row in detail.appointments" :key="row.appointmentNo">{{ row.appointmentNo }} · {{ row.destination }} · {{ row.confirmedAt || '尚未确认时段' }} {{ row.timezone || '时区待核实' }}</p></div></details>
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index 84b81833..2734d7e2 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -12,7 +12,7 @@ vi.mock('./planningApi', () => ({ listExternalAppointmentCandidates: vi.fn(), li
 vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
-const cargo: PlanningCargo = { sourceKey: source.sourceKey, customerId: 'A', customerName: '客户甲', orderId: '1', inboundCode: 'IN-A', containerBookingId: '2', containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseCode: 'US', originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', packages: 20, receivedPackages: null, shippedPackages: null, sourcePalletCount: null, volumeCbm: null, estimatedArrivalAt: null, estimatedWarehouseAt: null, orderVersion: 1, standardNode: 'DEPARTED', shippingVersion: null, shippingObservedAt: null, shippingProvider: null, hasInboundPlan: false, hasActiveAppointment: false, detained: false, mixedDestinations: false }
+const cargo: PlanningCargo = { sourceKey: source.sourceKey, customerId: 'A', customerName: '客户甲', orderId: '1', inboundCode: 'IN-A', containerBookingId: '2', containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseCode: 'US', originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', packages: 20, receivedPackages: null, shippedPackages: null, sourcePalletCount: null, volumeCbm: null, estimatedArrivalAt: null, estimatedWarehouseAt: '2026-10-10T13:48:15', orderVersion: 1, standardNode: 'DEPARTED', shippingVersion: null, shippingObservedAt: null, shippingProvider: null, hasInboundPlan: false, hasActiveAppointment: false, detained: false, mixedDestinations: false }
 const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }
 
 describe('appointment tables use actual shared table slots', () => {
@@ -27,7 +27,7 @@ describe('appointment tables use actual shared table slots', () => {
     vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
     const external: PlanningSource = { ...source, sourceKey: 'BOOKING:B-1', customerId: 'B', orderId: null, inboundCode: null, bookingNo: 'B-1', packages: null }
     vi.mocked(listExternalAppointmentCandidates).mockResolvedValue({ records: [{ source: external, customerName: '客户乙', tripNo: 'TR-1', coverage: { status: 'UNSCHEDULED', appointments: [], missingFields: [], changeReviewRequired: false } }], total: 1 })
-    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: null, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 1 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', sources: [source, external], missingFields: [] })
+    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: null, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 1 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', destinationTimezone: 'America/Los_Angeles', sources: [source, external], missingFields: [] })
     const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
     await flushPromises()
     expect(listExternalAppointmentCandidates).not.toHaveBeenCalled()
@@ -44,7 +44,7 @@ describe('appointment tables use actual shared table slots', () => {
   it('combines an original external booking with first-leg cargo and retries the identical save command', async () => {
     const external: PlanningSource={...source,sourceKey:'BOOKING:B-1',customerId:'B',bookingNo:'B-1',orderId:null,inboundCode:null,packages:null}
     vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
-    vi.mocked(previewPlanningBatch).mockResolvedValue({group:{originWarehouseId:'100',destinationKey:'FBA:ONT8',packages:null,sourceCount:2,customerCount:2,readyFrom:null,readyTo:null,readinessIncomplete:true,unknownQuantitySources:1},originWarehouseName:'美国仓',destinationWarehouseCode:'ONT8',sources:[external,source],missingFields:['CARGO_QUANTITY_REVIEW']})
+    vi.mocked(previewPlanningBatch).mockResolvedValue({group:{originWarehouseId:'100',destinationKey:'FBA:ONT8',packages:null,sourceCount:2,customerCount:2,readyFrom:null,readyTo:null,readinessIncomplete:true,unknownQuantitySources:1},originWarehouseName:'美国仓',destinationWarehouseCode:'ONT8',destinationTimezone:null,sources:[external,source],missingFields:['CARGO_QUANTITY_REVIEW']})
     vi.mocked(createSourceAppointment).mockRejectedValueOnce(new Error('network interrupted')).mockResolvedValueOnce({id:'1',version:0,appointmentNo:'AP-MIXED',appointmentStatus:'PENDING',originWarehouseId:'100',fbaWarehouseCode:'ONT8',selectedCount:2,items:[]})
     const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:external},global:{plugins:[ElementPlus],stubs:{AppDialog:{template:'<section><slot /><button data-save @click="$emit(\'confirm\')">Save</button></section>'}}}})
     await flushPromises()
@@ -72,7 +72,7 @@ describe('appointment tables use actual shared table slots', () => {
   })
   it('selects multiple customers and makes one authoritative batch check without per-row resolution', async () => {
     vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo, { ...cargo, sourceKey: 'ORDER:2', orderId: '2', inboundCode: 'IN-B', customerId: 'B', customerName: '客户乙' }], page: 1, size: 20, total: 2, pages: 1 })
-    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: 40, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 0 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', sources: [source], missingFields: ['READY_WINDOW_UNVERIFIED'] })
+    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: 40, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 0 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', destinationTimezone: 'America/Los_Angeles', sources: [source], missingFields: ['READY_WINDOW_UNVERIFIED'] })
     const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
     await flushPromises()
     await wrapper.findAll('button').find(button => button.text() === '选择本页可合批货物')!.trigger('click')
@@ -82,6 +82,10 @@ describe('appointment tables use actual shared table slots', () => {
     expect(resolvePlanningSource).not.toHaveBeenCalled()
     expect(wrapper.text()).toContain('2 票 / 2 个客户 / 预报 40 箱')
     expect(wrapper.text()).toContain('保存前尚未占用货物')
+    expect(wrapper.text()).toContain('America/Los_Angeles')
+    expect(wrapper.text()).not.toContain('目的仓时区待核实')
+    expect(wrapper.text()).toContain('2026-10-10 13:48:15')
+    expect(wrapper.text()).toContain('来源时区未明确')
     wrapper.unmount()
   })
   it('keeps the cargo list usable when impact service is unavailable and never reports a false zero', async () => {
diff --git a/src/modules/appointment-calendar/planningApi.ts b/src/modules/appointment-calendar/planningApi.ts
index 14e0362f..4a38252c 100644
--- a/src/modules/appointment-calendar/planningApi.ts
+++ b/src/modules/appointment-calendar/planningApi.ts
@@ -76,6 +76,7 @@ export interface PlanningBatchPreview {
   group: { originWarehouseId: string; destinationKey: string; packages: number | null; sourceCount: number; customerCount: number; readinessIncomplete: boolean; readyFrom: string | null; readyTo: string | null; unknownQuantitySources: number }
   originWarehouseName: string
   destinationWarehouseCode: string
+  destinationTimezone: string | null
   sources: PlanningSource[]
   missingFields: string[]
 }

From e124fbcf6858417ff27f70832409bf51ff10203d Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 19:04:09 +0800
Subject: [PATCH 37/47] fix(fleet): reflect bound booking in receipt progress

---
 .../TripBookingFulfillmentDialog.test.ts      | 20 +++++++++++++++++--
 .../TripBookingFulfillmentDialog.vue          |  7 ++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
index 141110bc..b61c4399 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
@@ -17,9 +17,9 @@ function mount(mode: 'incoming' | 'receipt' | 'bind' | 'view') {
   const field = { props: ['modelValue'], emits: ['update:modelValue'], template: '<input />' }
   const wrapper = shallowMount(TripBookingFulfillmentDialog, { props: { modelValue: true, trip, booking, mode, arrivalAt: '2026-10-03T08:00:00Z' }, global: { plugins: [createPinia()], directives: { loading: () => undefined }, stubs: {
     AppDialog: { name: 'AppDialog', props: ['modelValue', 'confirmDisabled'], emits: ['confirm'], template: '<div><slot/></div>' },
-    DataTable: { props: ['data'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="spaces" :row="row"/></div></div>' },
+    DataTable: { name: 'DataTable', props: ['data'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="spaces" :row="row"/></div></div>' },
     ElForm: { template: '<div><slot/></div>' }, ElFormItem: { template: '<div><slot/></div>' }, ElInputNumber: { ...field, name: 'ElInputNumber' }, ElDatePicker: field, ElInput: field,
-    LoadErrorState: true, ApiErrorMeta: true,
+    ElButton: { template: '<button><slot/></button>' }, LoadErrorState: true, ApiErrorMeta: true,
   } } }); wrappers.push(wrapper); return wrapper
 }
 beforeEach(() => { vi.clearAllMocks(); vi.mocked(api.getTripIncoming).mockResolvedValue(structuredClone(preview)) })
@@ -56,3 +56,19 @@ it('keeps an uncertain receipt command retryable after closing and reopening wit
   expect(api.acceptTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', original)
   expect(api.getTripIncoming).toHaveBeenCalledOnce()
 })
+
+it.each([
+  { bookingStatus: 'BOUND' as const, incomingStatus: 'READY_FOR_DISPATCH', expected: '已确认实收，已排入本车' },
+  { bookingStatus: 'RECEIVED' as const, incomingStatus: 'READY_FOR_DISPATCH', expected: '已确认实收，可安排排车' },
+  { bookingStatus: 'BOUND' as const, incomingStatus: 'OUTBOUNDED', expected: '已出库' },
+])('shows truthful receipt guidance for $bookingStatus / $incomingStatus', async ({ bookingStatus, incomingStatus, expected }) => {
+  vi.mocked(api.getTripIncoming).mockResolvedValue({ ...preview, incoming: { ...preview.incoming!, status: incomingStatus } })
+  const wrapper = mount('view')
+  await wrapper.setProps({ booking: { ...booking, status: bookingStatus, dispatchNo: bookingStatus === 'BOUND' ? 'DS-1' : null } })
+  await flushPromises()
+  expect(wrapper.text()).toContain(expected)
+  if (bookingStatus === 'BOUND') expect(wrapper.text()).not.toContain('可安排排车')
+  expect(wrapper.findComponent({ name: 'DataTable' }).props('data')).toEqual(preview.incoming!.pallets)
+  expect(api.acceptTripIncoming).not.toHaveBeenCalled()
+  expect(api.bindTripBookingDispatch).not.toHaveBeenCalled()
+})
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
index 047a061b..e02faafd 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
@@ -27,6 +27,11 @@ const ready = computed(() => preview.value?.incoming && ['WAIT_CUSTOMER_CONFIRMA
 const totalSpaces = computed(() => Object.values(spaces).reduce((a,b) => a + (b || 0), 0))
 const amount = computed(() => unitPrice.value == null ? null : Math.round(unitPrice.value * (props.booking?.cargo.priceBasis === 'ORDER' ? 1 : totalSpaces.value) * 100) / 100)
 const statuses: Record<string,string> = { WAIT_PDA_RECEIVING: '等待仓库收货', RECEIVING: '仓库收货中', WAIT_CUSTOMER_CONFIRMATION: '实收完成，待确认', READY_FOR_DISPATCH: '已确认实收，可安排排车', OUTBOUNDED: '已出库' }
+const incomingStatusLabel = computed(() => {
+  const status = preview.value?.incoming?.status
+  if (status === 'READY_FOR_DISPATCH' && props.booking?.status === 'BOUND') return '已确认实收，已排入本车'
+  return statuses[status || ''] || '等待读取'
+})
 const columns = computed<DataTableColumn[]>(() => [{ key: 'palletNo', prop: 'palletNo', label: '实收托盘', minWidth: 180 }, { key: 'packages', prop: 'packages', label: '箱数', width: 95 },
   { key: 'weightKg', prop: 'weightKg', label: '实测重量（kg）', minWidth: 150 }, { key: 'volumeCbm', prop: 'volumeCbm', label: '实测体积（m³）', minWidth: 150 },
   ...(props.mode === 'receipt' ? [{ key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 170 }] : [])])
@@ -94,7 +99,7 @@ onBeforeUnmount(() => { generation++ })
         <template v-if="booking.cargo.destinationKey.startsWith('PRIVATE:')"><el-form-item label="收件地址"><el-input v-model="form.privateAddress" placeholder="填写约定卸货地址" /></el-form-item><el-form-item label="邮编"><el-input v-model="form.postalCode" placeholder="填写收件邮编" /></el-form-item><el-form-item label="收件人"><el-input v-model="form.recipientName" placeholder="填写收件人" /></el-form-item><el-form-item label="收件电话"><el-input v-model="form.recipientPhone" placeholder="填写收件电话" /></el-form-item></template>
       </el-form>
       <template v-if="mode === 'receipt' || mode === 'view'">
-        <el-button :loading="loading" :disabled="busy || !!pending" @click="load">刷新收货进度</el-button><p>来货单：{{ preview?.incoming?.incomingNo || '—' }} · {{ statuses[preview?.incoming?.status || ''] || '等待读取' }}</p>
+        <el-button :loading="loading" :disabled="busy || !!pending" @click="load">刷新收货进度</el-button><p>来货单：{{ preview?.incoming?.incomingNo || '—' }} · {{ incomingStatusLabel }}</p>
         <DataTable :data="preview?.incoming?.pallets || []" :columns="columns" row-key="warehousePalletId" empty-text="仓库尚未完成实际打托"><template #spaces="{ row }"><el-input-number v-model="spaces[row.warehousePalletId]" :min="1" :precision="0" :disabled="busy || !!pending" placeholder="实际占用托位" /></template></DataTable>
         <el-form v-if="mode === 'receipt'" label-position="top" class="density-form incoming-form" :disabled="busy || !!pending"><el-form-item :label="booking.cargo.priceBasis === 'ORDER' ? '确认整单价格' : '确认每托位价格'"><el-input-number v-model="unitPrice" :min="0" :precision="2" placeholder="核对约定价格" /></el-form-item></el-form>
         <p v-if="mode === 'receipt'">原约定 {{ booking.agreedAmount?.toFixed(2) }} {{ booking.cargo.currency }}；本次实收 {{ preview?.incoming?.receivedPackages || 0 }} 箱、{{ totalSpaces }} 托位，确认金额 {{ amount?.toFixed(2) || '—' }} {{ booking.cargo.currency }}。转派送时按本次确认报价登记应收。</p>

From d7f2d09b88d677468233a03638076e3161730dfb Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sat, 10 Oct 2026 19:52:33 +0800
Subject: [PATCH 38/47] fix(procurement): align correction actions with
 shipment state

---
 .../components/ProcurementNodeActions.test.ts | 35 +++++++++++++-
 .../components/ProcurementNodeActions.vue     | 21 +++++++--
 .../components/ProcurementPhysicalFields.vue  |  8 ++--
 .../pages/OverseasBusinessViews.test.ts       | 13 ++++++
 .../pages/PurchaseOrdersView.vue              | 12 ++---
 .../procurementPhysicalForm.test.ts           | 45 +++++++++++++++++-
 .../procurementPhysicalForm.ts                | 46 ++++++++++++++++++-
 7 files changed, 162 insertions(+), 18 deletions(-)

diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
index 0d7b56f8..4f65da7a 100644
--- a/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.test.ts
@@ -41,6 +41,39 @@ beforeEach(() => {
   vi.mocked(uploadProcurementFile).mockReset().mockResolvedValue({ id: '11', fileId: '101', category: 'PURCHASE', fileName: 'purchase.pdf', contentType: 'application/pdf', sizeBytes: 3, createdAt: '' })
 })
 describe('procurement purchase node operations', () => {
+  it('disables terminal physical changes and keeps the management evidence form open', async () => {
+    const value = fixture('MANAGE'); value.customerView.order.status = 'SHIPPED_TO_CUSTOMER'
+    value.purchaseFacts = { overseas_shipped_at: '2020-01-02', customer_shipped_at: '2020-01-03', actual_warehouse_id: '20' }
+    value.physical.receipts = [{ id: '11', receiptNo: 'PR-11', leg: 'DOMESTIC', sourceCartonId: '31', goodQuantity: 2, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-02', active: true }]
+    const wrapper = render(value); const dialog = await open(wrapper)
+    const selector = dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '实物更正操作')!.findComponent({ name: 'ElSelect' })
+    expect(selector.props('modelValue')).toBe('control-notes')
+    const options = selector.findAllComponents({ name: 'ElOption' })
+    expect(options.find(option => option.props('value') === 'receipts/correct')!.props()).toMatchObject({ disabled: true, label: expect.stringContaining('订单已结束') })
+    expect(options.find(option => option.props('value') === 'control-notes')!.props('disabled')).toBe(false)
+    expect(options.find(option => option.props('value') === 'actual-warehouse/correct')!.props('disabled')).toBe(false)
+    selector.vm.$emit('update:modelValue', 'receipts/correct'); await flushPromises()
+    expect(dialog.props('confirmDisabled')).toBe(true)
+    await confirm(wrapper)
+    expect(submitProcurementCommand).not.toHaveBeenCalled()
+    expect(sessionStorage.getItem(storageKey)).toBeNull()
+  })
+  it('disables overseas receipt candidates after international shipment without blocking domestic correction', async () => {
+    const value = fixture('MANAGE'); value.customerView.order.status = 'DOMESTIC_RECEIVING'
+    value.purchaseFacts.overseas_shipped_at = '2020-01-02'
+    const receipt = { id: '11', receiptNo: 'PR-11', leg: 'OVERSEAS' as const, sourceCartonId: null, goodQuantity: 2, damagedQuantity: 0, extraQuantity: 0, receivedAt: '2020-01-01', active: true }
+    value.physical.receipts = [receipt, { ...receipt, id: '12', receiptNo: 'PR-12', leg: 'DOMESTIC', sourceCartonId: '31' }]
+    const wrapper = render(value); const dialog = await open(wrapper)
+    dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '实物更正操作')!.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'receipts/correct')
+    await flushPromises()
+    const selector = dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '待更正实收')!.findComponent({ name: 'ElSelect' })
+    const options = selector.findAllComponents({ name: 'ElOption' })
+    expect(options.find(option => option.props('value') === '11')!.props()).toMatchObject({ disabled: true, label: expect.stringContaining('本段已实际交寄') })
+    expect(options.find(option => option.props('value') === '12')!.props('disabled')).toBe(false)
+    selector.vm.$emit('update:modelValue', '12'); await flushPromises()
+    expect(dialog.props('confirmDisabled')).toBe(false)
+    expect(submitProcurementCommand).not.toHaveBeenCalled()
+  })
   it('saves and restores a separate correction while the immutable original request is pending, scoped to operator/customer/order', async () => {
     const value = fixture('FINANCE_ADJUST', false)
     value.fees = [{ id: '11', feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', confirmationOrigin: 'BUSINESS', feeItemCode: 'SAMPLE_PAYMENT', feeItemName: '样品货款', feeVersion: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeId: null, sourceFeeId: null, voucherFileId: '501', voucherFileName: 'invoice.pdf', walletStatus: 'PENDING', walletLedgerId: null, walletErrorCode: null, walletErrorMessage: null, remark: null }]
@@ -181,7 +214,7 @@ describe('procurement purchase node operations', () => {
     expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
   })
   it('uses exception evidence and source quantities for damaged goods disposition', async () => {
-    const value = fixture('MANAGE'); value.purchaseFacts.purchased_quantity = 2
+    const value = fixture('MANAGE'); value.purchaseFacts.purchased_quantity = 2; value.purchaseFacts.purchased_at = '2020-01-01T10:00:00'
     value.physical.receipts = [{ id: '11', receiptNo: 'PR-11', leg: 'OVERSEAS', sourceCartonId: null, goodQuantity: 1, damagedQuantity: 1, extraQuantity: 0, receivedAt: '2020-01-02T10:00:00', active: true }]
     vi.mocked(uploadProcurementFile).mockResolvedValue({ id: '12', fileId: '102', category: 'EXCEPTION', fileName: 'damage.png', contentType: 'image/png', sizeBytes: 3, createdAt: '' })
     const wrapper = render(value); const dialog = await open(wrapper); await explain(wrapper, '破损样品已经处理，客户已确认')
diff --git a/src/modules/overseas-business/components/ProcurementNodeActions.vue b/src/modules/overseas-business/components/ProcurementNodeActions.vue
index d86ec268..1785e460 100644
--- a/src/modules/overseas-business/components/ProcurementNodeActions.vue
+++ b/src/modules/overseas-business/components/ProcurementNodeActions.vue
@@ -21,7 +21,7 @@ import { financeCommands, financeForm, buildFinance, feeRetryPermission } from '
 import ProcurementTransportFields from './ProcurementTransportFields.vue'
 import { transportCommands, transportForm, buildTransport } from '../procurementTransportForm'
 import ProcurementPhysicalFields from './ProcurementPhysicalFields.vue'
-import { physicalCommands, physicalForm, buildPhysical } from '../procurementPhysicalForm'
+import { physicalCommands, physicalForm, buildPhysical, managementOptions, managementReason, receiptCorrectionReason, dispositionReason } from '../procurementPhysicalForm'
 const props = defineProps<{ detail: PlatformProcurement; customerId: string }>()
 const emit = defineEmits<{ changed: [] }>()
 const auth = useAuthStore(); const access = useAccessPreviewStore()
@@ -49,6 +49,17 @@ const draftKey = computed(() => key.value ? `${key.value}:correction-draft` : ''
 const canDraft = computed(() => !!key.value && access.can('platform:overseas-business:purchase:finance-adjust') && props.detail.fees.some(fee => !['INTERNATIONAL_ESTIMATE', 'ADJUSTMENT', 'REFUND'].includes(fee.purpose)))
 const commandPermissions: Record<ProcurementCommand, string> = { review: 'review', purchase: 'buy', 'purchase/confirm': 'buy', 'budget-authorizations': 'review', 'planned-warehouse': 'review', cancel: 'cancel', 'overseas-receipts': 'receive-overseas', 'domestic-receipts': 'receive-domestic', 'overseas-receipts/complete': 'receive-overseas', 'domestic-receipts/complete': 'receive-domestic', packing: 'pack', 'packing/confirm': 'pack', 'packing/withdraw': 'manage', dispositions: 'manage', 'receipts/correct': 'manage', 'dispositions/revoke': 'manage', labels: 'label', 'international-estimate': 'estimate', 'labels/apply': 'apply-label', 'overseas-shipment': 'ship-overseas', 'customer-shipment': 'ship-customer', 'domestic-repack': 'receive-domestic', 'charges/confirm': 'charge', 'fees/retry': 'charge', 'fees/terminate': 'finance-adjust', 'fees/release-estimate': 'finance-adjust', 'fees/correct-target': 'finance-adjust', 'fees/additional': 'finance-adjust', 'fees/replace-failed': 'finance-adjust', 'fees/refund': 'finance-adjust', 'control-notes': 'manage', 'control-notes/resolve': 'manage', 'actual-warehouse/correct': 'manage', 'exception-close': 'manage' }
 const command = computed(() => editingDraft.value ? 'fees/correct-target' : pending.value?.command ?? (active.value?.key === 'MANAGE' ? manageCommand.value : active.value?.key === 'FINANCE_ADJUST' ? financialCommand.value : active.value ? routes[active.value.key] : undefined))
+const manageOptions = computed(() => managementOptions.map(option => ({ ...option, reason: managementReason(option.value, props.detail) })))
+const managementBlock = computed(() => {
+  if (active.value?.key !== 'MANAGE' || !command.value || pending.value) return null
+  const reason = managementReason(command.value, props.detail)
+  if (reason) return reason
+  if (command.value === 'dispositions') return dispositionReason(props.detail, physical.value.leg)
+  const row = command.value === 'receipts/correct'
+    ? props.detail.physical.receipts.find(item => item.id === physical.value.receiptId)
+    : command.value === 'dispositions/revoke' ? props.detail.physical.dispositions.find(item => item.id === physical.value.dispositionId) : null
+  return row ? receiptCorrectionReason(props.detail, row.leg) : null
+})
 const isControl = computed(() => !!command.value && controlCommands.has(command.value))
 const isFinance = computed(() => !!command.value && financeCommands.has(command.value))
 const isTransport = computed(() => !!command.value && transportCommands.has(command.value))
@@ -77,7 +88,7 @@ async function loadWarehouses() {
 }
 function open(action: ProcurementAction) {
   if (!action.allowed || pending.value || storageError.value || saving.value) return
-  editingDraft.value = false; active.value = action; error.value = null; manageCommand.value = 'dispositions'; physical.value = physicalForm(props.detail)
+  editingDraft.value = false; active.value = action; error.value = null; manageCommand.value = manageOptions.value.find(option => !option.reason)?.value || 'control-notes'; physical.value = physicalForm(props.detail)
   control.value = controlForm(props.detail)
   finance.value = financeForm(props.detail); financialCommand.value = 'fees/correct-target'
   transport.value = transportForm(props.detail, ['SHIP_CUSTOMER', 'REPACK'].includes(action.key) ? 'DOMESTIC' : action.key === 'LABELS' ? undefined : 'OVERSEAS')
@@ -150,6 +161,7 @@ async function submit() {
   if (!pending.value) {
     if (!active.value?.allowed || !access.can(active.value.permission) || !command.value) return
     try {
+      if (managementBlock.value) throw new Error(managementBlock.value)
       const request = { command: command.value, payload: build() }
       const serialized = JSON.stringify(request); readPendingProcurement(serialized)
       sessionStorage.setItem(scope, serialized); pending.value = request
@@ -201,10 +213,11 @@ async function upload(event: Event) {
     <el-alert v-if="draftError" :title="draftError" type="error" :closable="false" /><el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
     <el-alert v-if="pending" title="上次提交结果尚未确认，重试将使用原始内容与原请求编号。" type="warning" :closable="false"><p>原操作：{{ pending.command === 'review' ? (pending.payload.decision === 'APPROVE' ? '审核通过' : '审核拒绝') : actions.find(action => routes[action.key] === pending?.command)?.label || '采购节点操作' }} · {{ pending.payload.remark || pending.payload.reason }}</p><p v-if="pending.payload.amount !== undefined">原提交金额：{{ pending.payload.amount }} {{ pending.payload.currency || (['international-estimate', 'fees/refund'].includes(pending.command) ? 'CNY' : '') }}</p><el-button :loading="saving" @click="retryPending">确认上次提交结果</el-button></el-alert>
     <ApiErrorMeta v-if="error && !opened" :details="error" />
-    <AppDialog class="admin-density-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" :confirm-text="editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交'" @confirm="submit">
+    <AppDialog class="admin-density-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="!!managementBlock || uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" :confirm-text="editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交'" @confirm="submit">
       <template #default><el-alert v-if="editingDraft" title="草稿仅保存在当前浏览器标签页，关闭标签页后可能丢失；不代表已确认费用。原请求未决时只能保存，结果明确后请刷新订单再核对确认。" type="info" :closable="false" /><el-alert v-if="command === 'purchase'" title="记录已实际购买的商品和供应商实付总额。资金未完成时，真实购买事实仍保留。" type="info" :closable="false" />
+        <el-alert v-if="managementBlock" :title="managementBlock" type="warning" :closable="false" />
         <el-form class="density-form" label-position="top" :disabled="saving || uploading || (!!pending && !editingDraft)">
-          <el-form-item v-if="active?.key === 'MANAGE'" label="实物更正操作"><el-select v-model="manageCommand" placeholder="选择处置或更正操作"><el-option value="dispositions" label="记录差异处置" /><el-option value="receipts/correct" label="更正原实收数量" /><el-option value="dispositions/revoke" label="撤销原差异处置" /><el-option value="packing/withdraw" label="撤回未交寄的确认清单" /><el-option value="control-notes" label="追加事实说明或阻断" /><el-option value="control-notes/resolve" label="解除已处理的阻断" /><el-option value="actual-warehouse/correct" label="实际仓受控更正" /></el-select></el-form-item>
+          <el-form-item v-if="active?.key === 'MANAGE'" label="实物更正操作"><el-select v-model="manageCommand" placeholder="选择处置或更正操作"><el-option v-for="option in manageOptions" :key="option.value" :value="option.value" :disabled="!!option.reason" :label="option.reason ? `${option.label}（${option.reason}）` : option.label" /></el-select></el-form-item>
           <el-form-item v-if="active?.key === 'FINANCE_ADJUST'" label="财务处理方式"><el-select v-model="financialCommand" placeholder="选择财务处理方式"><el-option value="fees/additional" label="登记独立新发生费用" /><el-option value="fees/correct-target" label="更正原费用链目标总额" /><el-option value="fees/refund" label="关联原扣款退款" /><el-option value="fees/terminate" label="终止明确失败的费用版本" /><el-option value="fees/replace-failed" label="重新核定已终止的未扣款费用" /><el-option value="fees/release-estimate" label="释放有效预估冻结" /></el-select></el-form-item>
           <ProcurementControlFields v-if="isControl && command" v-model="control" :command="command" :detail="detail" :files="allFiles" />
           <template v-if="editingDraft"><el-form-item label="原费用"><el-select v-model="finance.feeId" placeholder="选择本单原实际费用"><el-option v-for="fee in detail.fees.filter(row => !['INTERNATIONAL_ESTIMATE', 'ADJUSTMENT', 'REFUND'].includes(row.purpose))" :key="fee.id" :value="fee.id" :label="`${fee.feeNo} · ${fee.feeItemName}`" /></el-select></el-form-item><el-form-item label="正确原币总额"><el-input v-model="finance.targetOriginalAmount" placeholder="填写原费用链正确总额，最多两位小数" /></el-form-item></template>
diff --git a/src/modules/overseas-business/components/ProcurementPhysicalFields.vue b/src/modules/overseas-business/components/ProcurementPhysicalFields.vue
index 423817bc..4b8413f0 100644
--- a/src/modules/overseas-business/components/ProcurementPhysicalFields.vue
+++ b/src/modules/overseas-business/components/ProcurementPhysicalFields.vue
@@ -3,7 +3,7 @@ import '@/styles/adminDensity.css'
 import { computed } from 'vue'
 import type { ProcurementCommand } from '../api/procurementCommands'
 import type { PlatformProcurement } from '../procurementTypes'
-import { newCarton, shippedCartons, type PhysicalForm } from '../procurementPhysicalForm'
+import { newCarton, shippedCartons, receiptCorrectionReason, dispositionReason, type PhysicalForm } from '../procurementPhysicalForm'
 const props = defineProps<{ command: ProcurementCommand; detail: PlatformProcurement }>()
 const form = defineModel<PhysicalForm>({ required: true })
 const receipts = computed(() => props.detail.physical.receipts.filter(row => row.active && (props.command === 'receipts/correct' || (row.leg === form.value.leg && row.sourceCartonId === (form.value.leg === 'DOMESTIC' ? form.value.sourceCartonId : null)))))
@@ -22,12 +22,12 @@ const differenceNames = { SHORTAGE: '短少', DAMAGED: '破损', EXTRA: '多货'
     <el-alert v-if="command.endsWith('/complete')" title="仅在全部到齐或差异已有明确处置后确认收货完成；登记实收不会自动完成收货。" type="info" :closable="false" />
     <el-alert v-if="command === 'packing/confirm'" :title="`确认第 ${detail.physical.packingVersion || '—'} 版清单。须完成海外收货、样品货款及费用来源关联。`" type="info" :closable="false" />
     <el-alert v-if="command === 'packing/withdraw'" title="撤回未交寄清单后，需要重新确认装箱并核对后续面单和费用。" type="warning" :closable="false" />
-    <el-form-item v-if="command === 'dispositions'" label="差异发生段" required><el-radio-group v-model="form.leg" @change="form.sourceCartonId = ''; form.receiptId = ''"><el-radio value="OVERSEAS">海外收货</el-radio><el-radio value="DOMESTIC">国内收货</el-radio></el-radio-group></el-form-item>
-    <el-form-item v-if="command === 'receipts/correct'" label="待更正实收" required><el-select v-model="form.receiptId" placeholder="选择有效原实收记录" @change="selectReceipt"><el-option v-for="row in receipts" :key="row.id" :value="row.id" :label="`${row.receiptNo} · ${row.leg === 'OVERSEAS' ? '海外' : '国内'}`" /></el-select><span>保留原记录，更正不能改变运输段或来源箱；已交寄后只能追加更正说明。</span></el-form-item>
+    <el-form-item v-if="command === 'dispositions'" label="差异发生段" required><el-radio-group v-model="form.leg" @change="form.sourceCartonId = ''; form.receiptId = ''"><el-radio value="OVERSEAS" :disabled="!!dispositionReason(detail, 'OVERSEAS')">海外收货<span v-if="dispositionReason(detail, 'OVERSEAS')">（{{ dispositionReason(detail, 'OVERSEAS') }}）</span></el-radio><el-radio value="DOMESTIC" :disabled="!!dispositionReason(detail, 'DOMESTIC')">国内收货<span v-if="dispositionReason(detail, 'DOMESTIC')">（{{ dispositionReason(detail, 'DOMESTIC') }}）</span></el-radio></el-radio-group></el-form-item>
+    <el-form-item v-if="command === 'receipts/correct'" label="待更正实收" required><el-select v-model="form.receiptId" placeholder="选择有效原实收记录" @change="selectReceipt"><el-option v-for="row in receipts" :key="row.id" :value="row.id" :disabled="!!receiptCorrectionReason(detail, row.leg)" :label="`${row.receiptNo} · ${row.leg === 'OVERSEAS' ? '海外' : '国内'}${receiptCorrectionReason(detail, row.leg) ? ' · ' + receiptCorrectionReason(detail, row.leg) : ''}`" /></el-select><span>保留原记录，更正不能改变运输段或来源箱；已交寄后只能追加更正说明。</span></el-form-item>
     <el-form-item v-if="(showReceipt || command === 'dispositions') && form.leg === 'DOMESTIC'" label="国际交寄原箱" required><el-select v-model="form.sourceCartonId" :disabled="command === 'receipts/correct'" placeholder="选择本单已国际交寄的箱" @change="form.receiptId = ''"><el-option v-for="box in domesticBoxes" :key="box.id" :value="box.id" :label="`${box.cartonNo} · ${box.quantity} 件`" /></el-select></el-form-item>
     <template v-if="showReceipt"><div class="physical-grid"><el-form-item label="合格件数" required><el-input-number v-model="form.goodQuantity" :min="0" :precision="0" controls-position="right" placeholder="本次合格件数" /></el-form-item><el-form-item label="破损件数" required><el-input-number v-model="form.damagedQuantity" :min="0" :precision="0" controls-position="right" placeholder="本次破损件数" /></el-form-item><el-form-item label="多货件数" required><el-input-number v-model="form.extraQuantity" :min="0" :precision="0" controls-position="right" placeholder="本次多到件数" /></el-form-item></div><el-form-item label="实际收货时间" required><el-date-picker v-model="form.receivedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item></template>
     <template v-if="command === 'dispositions'"><el-form-item label="差异及处置" required><el-select v-model="form.kind" placeholder="选择差异处理方式" @change="form.receiptId = ''; form.quantity = undefined"><el-option value="SHORTAGE" label="短少 · 客户接受短少" /><el-option value="DAMAGED" label="破损 · 处理破损货物" /><el-option value="EXTRA" label="多货 · 退回多到货物" /></el-select></el-form-item><el-form-item v-if="form.kind !== 'SHORTAGE'" label="对应实收" required><el-select v-model="form.receiptId" placeholder="选择差异来源实收"><el-option v-for="row in receipts" :key="row.id" :value="row.id" :label="`${row.receiptNo} · 破损 ${row.damagedQuantity} / 多货 ${row.extraQuantity}`" /></el-select></el-form-item><el-form-item label="本次处置件数" required><el-input-number v-model="form.quantity" :min="1" :precision="0" controls-position="right" placeholder="填写已完成处置的件数" /></el-form-item></template>
-    <el-form-item v-if="command === 'dispositions/revoke'" label="撤销差异处置" required><el-select v-model="form.dispositionId" placeholder="选择有效处置记录"><el-option v-for="row in detail.physical.dispositions.filter(item => item.active)" :key="row.id" :value="row.id" :label="`${row.leg === 'OVERSEAS' ? '海外' : '国内'} · ${differenceNames[row.kind]} ${row.quantity} 件 · ${row.reason}`" /></el-select></el-form-item>
+    <el-form-item v-if="command === 'dispositions/revoke'" label="撤销差异处置" required><el-select v-model="form.dispositionId" placeholder="选择有效处置记录"><el-option v-for="row in detail.physical.dispositions.filter(item => item.active)" :key="row.id" :value="row.id" :disabled="!!receiptCorrectionReason(detail, row.leg)" :label="`${row.leg === 'OVERSEAS' ? '海外' : '国内'} · ${differenceNames[row.kind]} ${row.quantity} 件 · ${row.reason}${receiptCorrectionReason(detail, row.leg) ? ' · ' + receiptCorrectionReason(detail, row.leg) : ''}`" /></el-select></el-form-item>
     <template v-if="command === 'packing'">
       <el-alert title="每箱填写箱规、毛重及来源实收件数。草稿允许暂未分配完，确认时必须覆盖全部合格实收。" type="info" :closable="false" />
       <section v-for="(box, index) in form.cartons" :key="index" class="packing-box">
diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index e54023ae..b33309b6 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -206,6 +206,19 @@ describe('overseas business mounted pages', () => {
   })
 
   it('mounts procurement list with customer candidates and real data', async () => { const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchaseCustomerOptions).toHaveBeenCalled(); expect(listOverseasPurchases).toHaveBeenCalledWith({ page: 1, size: 20, customerId: '', orderNo: '', purchaseCategory: '', productName: '', status: '' }); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).toContain('待装箱'); expect(wrapper.text()).toContain('2026-08-01 10:00') })
+  it('keeps long procurement identifiers and descriptive fields out of single-line truncation', async () => {
+    const record = { ...purchase, orderNo: 'QLYSXDKH202610100002', customerName: '全量验收下单客户-20261010-长客户名称', productName: 'PROC-PURCHASE-20261010-长商品名称', productSpecification: '多规格描述-完整展示', purchaseCategory: 'OFFICE_SUPPLIES', purchaseWarehouseName: '洛杉矶海外采购收货仓库' }
+    vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [record], page: 1, size: 20, total: 1, pages: 1 })
+    const wrapper = mountPage(PurchaseOrdersView)
+    await flushPromises()
+    const cells = wrapper.findAll('.el-table__body-wrapper tbody .el-table__row')[0]!.findAll('td')
+    expect(cells[0]!.classes()).toContain('el-table-fixed-column--left')
+    for (const [index, value] of [record.orderNo, record.customerName, record.purchaseWarehouseName, record.purchaseCategory, record.productName, record.productSpecification].entries()) {
+      expect(cells[index + 1]!.text()).toBe(value)
+      expect(cells[index + 1]!.classes()).not.toContain('data-table__single-line-cell')
+      expect(cells[index + 1]!.find('.cell').classes()).not.toContain('el-tooltip')
+    }
+  })
   it('refreshes the cached procurement list after returning from detail or edit', () => { expect(purchaseListSource).toContain('onActivated'); expect(purchaseListSource).toMatch(/onActivated\(\(\) => \{ if \(activatedOnce\) void load\(\)/) })
   it('refreshes the cached procurement detail after an edit completes', () => { expect(purchaseDetailSource).toContain('onActivated'); expect(purchaseDetailSource).toMatch(/onActivated\(\(\) => \{ if \(activatedOnce\) void load\(\)/) })
   it('paginates procurement results', async () => { vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 40, pages: 2 }); const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); await wrapper.find('button[aria-label="第 2 页"]').trigger('click'); await flushPromises(); expect(listOverseasPurchases).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2 })) })
diff --git a/src/modules/overseas-business/pages/PurchaseOrdersView.vue b/src/modules/overseas-business/pages/PurchaseOrdersView.vue
index 2f664b51..2937cec4 100644
--- a/src/modules/overseas-business/pages/PurchaseOrdersView.vue
+++ b/src/modules/overseas-business/pages/PurchaseOrdersView.vue
@@ -30,12 +30,12 @@ const fields = computed<QueryField[]>(() => [
 ])
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 176, fixed: 'left', slotName: 'actions' },
-  { key: 'orderNo', prop: 'orderNo', label: '订单编号', minWidth: 170 },
-  { key: 'customerName', prop: 'customerName', label: '客户名称', minWidth: 180, formatter: (row: OverseasPurchaseSummary) => row.customerName || '—' },
-  { key: 'purchaseWarehouseName', prop: 'purchaseWarehouseName', label: '采购仓库', minWidth: 160, formatter: (row: OverseasPurchaseSummary) => row.purchaseWarehouseName || '—' },
-  { key: 'purchaseCategory', prop: 'purchaseCategory', label: '采购品类', minWidth: 130 },
-  { key: 'productName', prop: 'productName', label: '商品名称', minWidth: 160 },
-  { key: 'productSpecification', prop: 'productSpecification', label: '商品规格', minWidth: 180, formatter: (row: OverseasPurchaseSummary) => row.productSpecification || '—' },
+  { key: 'orderNo', prop: 'orderNo', label: '订单编号', minWidth: 220, singleLine: false },
+  { key: 'customerName', prop: 'customerName', label: '客户名称', minWidth: 220, singleLine: false, formatter: (row: OverseasPurchaseSummary) => row.customerName || '—' },
+  { key: 'purchaseWarehouseName', prop: 'purchaseWarehouseName', label: '采购仓库', minWidth: 160, singleLine: false, formatter: (row: OverseasPurchaseSummary) => row.purchaseWarehouseName || '—' },
+  { key: 'purchaseCategory', prop: 'purchaseCategory', label: '采购品类', minWidth: 130, singleLine: false },
+  { key: 'productName', prop: 'productName', label: '商品名称', minWidth: 220, singleLine: false },
+  { key: 'productSpecification', prop: 'productSpecification', label: '商品规格', minWidth: 180, singleLine: false, formatter: (row: OverseasPurchaseSummary) => row.productSpecification || '—' },
   { key: 'budgetUnitPrice', label: '预算单价', width: 120, align: 'right', formatter: (row: OverseasPurchaseSummary) => money(row.budgetUnitPrice, row.currency) },
   { key: 'purchaseQuantity', prop: 'purchaseQuantity', label: '采购数量', width: 100, align: 'right' },
   { key: 'status', label: '状态', minWidth: 145, formatter: (row: OverseasPurchaseSummary) => statusLabel(row.status) },
diff --git a/src/modules/overseas-business/procurementPhysicalForm.test.ts b/src/modules/overseas-business/procurementPhysicalForm.test.ts
index 8c516040..494b94ec 100644
--- a/src/modules/overseas-business/procurementPhysicalForm.test.ts
+++ b/src/modules/overseas-business/procurementPhysicalForm.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { buildPacking, buildPhysical, physicalForm, shippedCartons } from './procurementPhysicalForm'
+import { buildPacking, buildPhysical, physicalForm, shippedCartons, managementReason, receiptCorrectionReason } from './procurementPhysicalForm'
 import { readPendingProcurement } from './procurementPending'
 import type { PlatformProcurement } from './procurementTypes'
 const base = { version: 7, idempotencyKey: 'physical-one', reason: '现场核对' }
@@ -65,11 +65,52 @@ describe('procurement physical request validation', () => {
     expect(payload).toMatchObject({ kind: 'SHORTAGE', decision: 'ACCEPT_SHORTAGE', quantity: 3 }); expect(payload).not.toHaveProperty('receiptId')
   })
   it('corrects an original receipt without counting it twice or moving its origin', () => {
-    const value = detail(); const form = physicalForm(); form.receiptId = '11'; form.leg = 'DOMESTIC'; form.sourceCartonId = '31'; form.goodQuantity = 5; form.damagedQuantity = 1; form.receivedAt = '2020-01-02T10:00:00'
+    const value = detail(); value.purchaseFacts.overseas_shipped_at = null; const form = physicalForm(); form.receiptId = '11'; form.leg = 'DOMESTIC'; form.sourceCartonId = '31'; form.goodQuantity = 5; form.damagedQuantity = 1; form.receivedAt = '2020-01-02T10:00:00'
     const payload = buildPhysical('receipts/correct', form, value, base, '20', '901')
     expect(payload).toMatchObject({ receiptId: '11', leg: 'OVERSEAS', goodQuantity: 5 }); expect(payload).not.toHaveProperty('sourceCartonId')
     expect(readPendingProcurement(JSON.stringify({ command: 'receipts/correct', payload }))).not.toBeNull()
   })
+  it('blocks shipped receipt corrections while preserving domestic corrections before customer shipment', () => {
+    const value = detail()
+    expect(receiptCorrectionReason(value, 'OVERSEAS')).toContain('本段已实际交寄')
+    expect(receiptCorrectionReason(value, 'DOMESTIC')).toBeNull()
+    value.purchaseFacts.customer_shipped_at = '2020-01-05T10:00:00'
+    expect(receiptCorrectionReason(value, 'DOMESTIC')).toContain('本段已实际交寄')
+    value.purchaseFacts.overseas_shipped_at = null
+    value.physical.packingStatus = 'CONFIRMED'
+    expect(receiptCorrectionReason(value, 'OVERSEAS')).toContain('先撤回')
+    value.physical.packingStatus = 'DRAFT'
+    expect(receiptCorrectionReason(value, 'OVERSEAS')).toBeNull()
+  })
+  it.each(['REJECTED', 'CANCELLED', 'EXCEPTION_CLOSED', 'SHIPPED_TO_CUSTOMER'])('blocks physical changes for %s but leaves evidence and warehouse correction available', status => {
+    const value = detail(); value.customerView.order.status = status
+    expect(managementReason('receipts/correct', value)).toContain('订单已结束')
+    expect(managementReason('dispositions', value)).toContain('订单已结束')
+    expect(managementReason('packing/withdraw', value)).toContain('订单已结束')
+    expect(managementReason('control-notes', value)).toBeNull()
+    expect(managementReason('actual-warehouse/correct', value)).toBeNull()
+    const form = physicalForm(); form.receiptId = '11'
+    expect(() => buildPhysical('receipts/correct', form, value, base, '20', '901')).toThrow('订单已结束')
+  })
+  it('requires the correct physical source and unfinished receipt before recording differences', () => {
+    const value = detail(); value.purchaseFacts = {}
+    expect(managementReason('dispositions', value)).toContain('交寄来源')
+    value.purchaseFacts.purchased_at = '2020-01-01'
+    expect(managementReason('dispositions', value)).toBeNull()
+    value.purchaseFacts.overseas_received_at = '2020-01-02'
+    expect(managementReason('dispositions', value)).not.toBeNull()
+    value.purchaseFacts.overseas_shipped_at = '2020-01-03'
+    expect(managementReason('dispositions', value)).toBeNull()
+    value.purchaseFacts.domestic_received_at = '2020-01-04'
+    expect(managementReason('dispositions', value)).toContain('本段收货已完成')
+  })
+  it('rejects a shipped receipt even when another leg still offers a correctable receipt', () => {
+    const value = detail()
+    value.physical.receipts.push({ ...value.physical.receipts[0]!, id: '13', leg: 'DOMESTIC', sourceCartonId: '31' })
+    expect(managementReason('receipts/correct', value)).toBeNull()
+    const form = physicalForm(); form.receiptId = '11'
+    expect(() => buildPhysical('receipts/correct', form, value, base, '20', '901')).toThrow('本段已实际交寄')
+  })
   it('confirms the exact draft version and rejects malformed persisted packing before replay', () => {
     const value = detail(); const form = physicalForm(value)
     expect(buildPhysical('packing/confirm', form, value, base, '', '')).toEqual({ ...base, packingVersion: 2 })
diff --git a/src/modules/overseas-business/procurementPhysicalForm.ts b/src/modules/overseas-business/procurementPhysicalForm.ts
index 422b492c..690526f2 100644
--- a/src/modules/overseas-business/procurementPhysicalForm.ts
+++ b/src/modules/overseas-business/procurementPhysicalForm.ts
@@ -1,6 +1,43 @@
 import type { PlatformProcurement } from './procurementTypes'
 import type { ProcurementCommand, ProcurementCommandBody, ProcurementPackingCarton } from './api/procurementCommands'
 export type Leg = 'OVERSEAS' | 'DOMESTIC'
+const closedStatuses = new Set(['REJECTED', 'CANCELLED', 'EXCEPTION_CLOSED', 'SHIPPED_TO_CUSTOMER'])
+export function receiptCorrectionReason(detail: PlatformProcurement, leg: Leg): string | null {
+  if (closedStatuses.has(detail.customerView.order.status)) return '订单已结束，只能追加事实说明，不能更正实收数量'
+  if (detail.purchaseFacts[leg === 'OVERSEAS' ? 'overseas_shipped_at' : 'customer_shipped_at']) return '本段已实际交寄，只能追加更正说明，不能改写数量'
+  if (leg === 'OVERSEAS' && detail.physical.packingStatus === 'CONFIRMED') return '须先撤回尚未交寄的确认清单，再更正海外实收'
+  return null
+}
+export function dispositionReason(detail: PlatformProcurement, leg: Leg): string | null {
+  if (closedStatuses.has(detail.customerView.order.status)) return '订单已结束，不能修改差异处置'
+  if (detail.purchaseFacts[leg === 'OVERSEAS' ? 'overseas_received_at' : 'domestic_received_at']) return '本段收货已完成，须先受控更正，不能直接改差异结果'
+  if (leg === 'OVERSEAS' && !detail.purchaseFacts.purchased_at) return '尚无本单真实购买来源'
+  if (leg === 'DOMESTIC' && !detail.purchaseFacts.overseas_shipped_at) return '尚无本单国际交寄来源'
+  return null
+}
+export const managementOptions: { value: ProcurementCommand; label: string }[] = [
+  { value: 'dispositions', label: '记录差异处置' }, { value: 'receipts/correct', label: '更正原实收数量' },
+  { value: 'dispositions/revoke', label: '撤销原差异处置' }, { value: 'packing/withdraw', label: '撤回未交寄的确认清单' },
+  { value: 'control-notes', label: '追加事实说明或阻断' }, { value: 'control-notes/resolve', label: '解除已处理的阻断' },
+  { value: 'actual-warehouse/correct', label: '实际仓受控更正' },
+]
+export function managementReason(command: ProcurementCommand, detail: PlatformProcurement): string | null {
+  if (command === 'receipts/correct' || command === 'dispositions/revoke') {
+    const records = command === 'receipts/correct' ? detail.physical.receipts : detail.physical.dispositions
+    const active = records.filter(row => row.active)
+    if (!active.length) return command === 'receipts/correct' ? '暂无有效实收记录' : '暂无有效差异处置'
+    return active.some(row => !receiptCorrectionReason(detail, row.leg)) ? null : receiptCorrectionReason(detail, active[0]!.leg)
+  }
+  if (command === 'dispositions') return dispositionReason(detail, 'OVERSEAS') && dispositionReason(detail, 'DOMESTIC')
+  if (command === 'packing/withdraw') {
+    if (closedStatuses.has(detail.customerView.order.status)) return '订单已结束，不能撤回装箱事实'
+    if (detail.purchaseFacts.overseas_shipped_at) return '国际段已交寄，不能撤回装箱事实'
+    if (detail.physical.packingStatus !== 'CONFIRMED') return '暂无已确认清单可撤回'
+  }
+  if (command === 'control-notes/resolve' && !detail.controls.notes.some(row => row.blocking && !row.resolved_at)) return '暂无待处理阻断'
+  if (command === 'actual-warehouse/correct' && !detail.purchaseFacts.actual_warehouse_id) return '尚无实际收货仓，请修改计划仓'
+  return null
+}
 export const physicalCommands = new Set<ProcurementCommand>(['overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'packing', 'packing/confirm', 'packing/withdraw', 'dispositions', 'receipts/correct', 'dispositions/revoke'])
 export interface PackingDraft { cartonNo: string; lengthCm: string; widthCm: string; heightCm: string; grossWeightKg: string; sources: { receiptId: string; quantity: number | undefined }[] }
 export interface PhysicalForm { leg: Leg; sourceCartonId: string; receiptId: string; dispositionId: string; goodQuantity: number | undefined; damagedQuantity: number | undefined; extraQuantity: number | undefined; receivedAt: string; kind: 'SHORTAGE' | 'DAMAGED' | 'EXTRA'; quantity: number | undefined; cartons: PackingDraft[] }
@@ -28,6 +65,8 @@ export function buildPacking(cartons: PackingDraft[], detail: PlatformProcuremen
   })
 }
 export function buildPhysical(command: ProcurementCommand, form: PhysicalForm, detail: PlatformProcurement, base: ProcurementCommandBody, warehouseId: string, voucherFileId: string): ProcurementCommandBody {
+  const blocked = managementReason(command, detail)
+  if (blocked) throw new Error(blocked)
   const closed = ['REJECTED', 'CANCELLED', 'EXCEPTION_CLOSED', 'SHIPPED_TO_CUSTOMER'].includes(detail.customerView.order.status)
   if (closed) throw new Error('订单已结束，不能改写实物记录')
   if (command === 'packing') return { ...base, cartons: buildPacking(form.cartons, detail) }
@@ -40,7 +79,10 @@ export function buildPhysical(command: ProcurementCommand, form: PhysicalForm, d
     return base
   }
   if (command === 'dispositions/revoke') {
-    if (!detail.physical.dispositions.some(row => row.id === form.dispositionId && row.active)) throw new Error('请选择有效差异处置')
+    const row = detail.physical.dispositions.find(row => row.id === form.dispositionId && row.active)
+    if (!row) throw new Error('请选择有效差异处置')
+    const reason = receiptCorrectionReason(detail, row.leg)
+    if (reason) throw new Error(reason)
     return { ...base, dispositionId: form.dispositionId, voucherFileId }
   }
   if (command.endsWith('/complete')) return { ...base, leg: command.startsWith('overseas') ? 'OVERSEAS' : 'DOMESTIC' }
@@ -48,6 +90,8 @@ export function buildPhysical(command: ProcurementCommand, form: PhysicalForm, d
   const old = correction ? detail.physical.receipts.find(row => row.id === form.receiptId && row.active) : undefined
   if (correction && !old) throw new Error('请选择有效原实收记录')
   const leg: Leg = old?.leg ?? (command === 'overseas-receipts' ? 'OVERSEAS' : command === 'domestic-receipts' ? 'DOMESTIC' : form.leg)
+  const reason = correction ? receiptCorrectionReason(detail, leg) : command === 'dispositions' ? dispositionReason(detail, leg) : null
+  if (reason) throw new Error(reason)
   const sourceCartonId = old?.sourceCartonId || form.sourceCartonId
   if (leg === 'DOMESTIC' && !shippedCartons(detail).some(row => row.id === sourceCartonId)) throw new Error('请选择本单已国际交寄的原箱')
   if (command === 'dispositions') {

From baa69e66a17488f913b61de475d3636b8aad248e Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 11:17:08 +0800
Subject: [PATCH 39/47] fix(fleet): keep capacity fields readable in publish
 dialog

---
 .../CapacityOfferSettingsDialog.test.ts       |  8 ++++++--
 .../components/TripLoadingPanel.vue           | 20 ++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts
index a9518832..6f175466 100644
--- a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts
+++ b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts
@@ -19,7 +19,7 @@ function mount(realPlanner = false) {
  const wrapper = shallowMount(Dialog, { props: { modelValue: true, trip }, global: { plugins: [createPinia()], stubs: {
   AppDialog: { name: 'AppDialog', props: ['confirmText'], emits: ['confirm'], template: '<div><slot/><button @click="$emit(\'confirm\')">{{confirmText}}</button></div>' },
   TripLoadingPanel: realPlanner ? false : defineComponent({ name: 'TripLoadingPanel', setup(_, { expose }) { expose({ save: state.plan }); return {} }, template: '<div/>' }),
-  DataTable: { name: 'DataTable', props: ['data'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="weight" :row="row"/><slot name="volume" :row="row"/></div></div>' },
+  DataTable: { name: 'DataTable', props: ['data', 'columns'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="palletNo" :row="row"/><slot name="weight" :row="row"/><slot name="volume" :row="row"/></div></div>' },
   ElInputNumber: { name: 'ElInputNumber', props: ['modelValue'], emits: ['update:modelValue'], template: '<input/>' },
   ElForm: { template: '<div><slot/></div>' }, ElFormItem: { template: '<div><slot/></div>' },
   ElButton: { template: '<button><slot/></button>' }, ElDatePicker: true, ElInput: true, LoadErrorState: true, ApiErrorMeta: true,
@@ -61,10 +61,14 @@ it('retries only the uncertain publish command with the original key', async ()
 })
 
 it('submits measurements from the embedded panel before saving and publishing', async () => {
- const basis = { tripNo: 'TR-1', recordVersion: 5, cargo: [{ dispatchNo: 'DP-1', customerId: '1', dispatchItemId: '2', warehousePalletId: '3', palletNo: 'PLT-1', packages: 1, destinationKey: 'FBA:ACY2', destinationLabel: 'ACY2' }], manifestHash: 'hash', capacityPlan: null, planValid: false, blockReason: null, availableSegments: [] }
+ const basis = { tripNo: 'TR-1', recordVersion: 5, cargo: [{ dispatchNo: 'DP-1', customerId: '1', dispatchItemId: '2', warehousePalletId: '3', palletNo: 'PLT-USLAX01-261010-G0RD3LYHGD8H', packages: 1, destinationKey: 'FBA:ACY2', destinationLabel: 'ACY2' }], manifestHash: 'hash', capacityPlan: null, planValid: false, blockReason: null, availableSegments: [] }
  vi.mocked(trips.getTripCapacityPlan).mockResolvedValue(basis)
  vi.mocked(trips.confirmTripCapacityPlan).mockResolvedValue({ ...basis, recordVersion: 6, planValid: true })
  const wrapper = mount(true); await flushPromises()
+ expect(wrapper.text()).toContain('PLT-USLAX01-261010-G0RD3LYHGD8H')
+ const columns = wrapper.findComponent({ name: 'DataTable' }).props('columns') as { key: string; singleLine?: boolean; width?: number; minWidth?: number }[]
+ expect(columns.filter(column => ['palletNo', 'spaces', 'weight', 'volume', 'stop'].includes(column.key)).every(column => column.singleLine === false)).toBe(true)
+ expect(columns.reduce((sum, column) => sum + (column.width || column.minWidth || 0), 0)).toBeLessThanOrEqual(1048)
  const fields = wrapper.findAllComponents({ name: 'ElInputNumber' })
  fields[0]!.vm.$emit('update:modelValue', 100); fields[1]!.vm.$emit('update:modelValue', 2); await flushPromises()
  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
diff --git a/src/modules/overseas-master-data/components/TripLoadingPanel.vue b/src/modules/overseas-master-data/components/TripLoadingPanel.vue
index 6b59ffa6..441a6a3c 100644
--- a/src/modules/overseas-master-data/components/TripLoadingPanel.vue
+++ b/src/modules/overseas-master-data/components/TripLoadingPanel.vue
@@ -15,10 +15,14 @@ const info = ref<TripLoading | TripCapacityPlanning | null>(null), rows = ref<Pa
 let sequence = 0
 const baseline = ref('')
 watch(rows, value => emit('changed', JSON.stringify(value)), { deep: true })
-const columns = computed<DataTableColumn[]>(() => [{ key: 'palletNo', prop: 'palletNo', label: '实物托盘', minWidth: 150 },
-  { key: 'destinations', prop: 'destinations', label: '货物目的地', minWidth: 160 }, { key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 175 },
-  { key: 'weight', label: props.planning ? '预计重量（kg）' : '实测重量（kg）', slotName: 'weight', width: 190 }, { key: 'volume', label: props.planning ? '预计体积（m³）' : '实测体积（m³）', slotName: 'volume', width: 190 },
-  { key: 'stop', label: '卸货站', slotName: 'stop', minWidth: 200 }])
+const columns = computed<DataTableColumn[]>(() => [
+  { key: 'palletNo', label: '实物托盘', slotName: 'palletNo', minWidth: 210, singleLine: false },
+  { key: 'destinations', prop: 'destinations', label: '货物目的地', minWidth: 140, singleLine: false },
+  { key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 160, singleLine: false },
+  { key: 'weight', label: props.planning ? '预计重量（kg）' : '实测重量（kg）', slotName: 'weight', width: 180, singleLine: false },
+  { key: 'volume', label: props.planning ? '预计体积（m³）' : '实测体积（m³）', slotName: 'volume', width: 180, singleLine: false },
+  { key: 'stop', label: '卸货站', slotName: 'stop', minWidth: 160, singleLine: false },
+])
 const savedLoad = computed(() => info.value && ('capacityPlan' in info.value ? info.value.capacityPlan : info.value.confirmedLoad))
 const segments = computed(() => info.value && 'availableSegments' in info.value ? info.value.availableSegments : savedLoad.value?.segments || [])
 const stalePlan = computed(() => info.value && 'planValid' in info.value && !!info.value.capacityPlan && !info.value.planValid)
@@ -91,7 +95,8 @@ onBeforeUnmount(() => { sequence++ })
     <p v-if="info?.blockReason" role="status">{{ info.blockReason }}</p>
     <p v-else-if="!planning && savedLoad">已确认实际装载；车辆、司机或计划调整后需要重新确认。</p>
     <p v-else-if="!planning">按实物托盘核对，同一托盘中的多客户货物只计一次。发车仍由海外 PDA 完成。</p>
-    <DataTable :data="rows" :columns="columns" row-key="warehousePalletId" empty-text="关联排车单后显示实物托盘">
+    <DataTable class="trip-loading-table" :data="rows" :columns="columns" row-key="warehousePalletId" empty-text="关联排车单后显示实物托盘">
+      <template #palletNo="{ row }"><span class="trip-pallet-code">{{ row.palletNo }}</span></template>
       <template #spaces="{ row }"><el-input-number v-model="row.palletSpaces" :min="1" :precision="0" :disabled="!editable || busy" placeholder="占用托位" /></template>
       <template #weight="{ row }"><el-input-number v-model="row.weightKg" :min="0.001" :precision="3" :disabled="!editable || busy" :placeholder="planning ? '预计重量' : '实际重量'" /></template>
       <template #volume="{ row }"><el-input-number v-model="row.volumeCbm" :min="0.001" :precision="3" :disabled="!editable || busy" :placeholder="planning ? '预计体积' : '实际体积'" /></template>
@@ -101,3 +106,8 @@ onBeforeUnmount(() => { sequence++ })
     <table v-if="savedLoad && !stalePlan" class="density-table"><thead><tr><th>行驶区间</th><th>占用托位</th><th>重量（kg）</th><th>体积（m³）</th><th v-if="planning">剩余托位 / kg / m³</th></tr></thead><tbody><tr v-for="segment in segments" :key="segment.fromIndex"><td>{{ trip.stops[segment.fromIndex]?.name }} → {{ trip.stops[segment.toIndex]?.name }}</td><td>{{ segment.occupied.palletSpaces }} / {{ trip.maxPalletSpaces }}</td><td>{{ segment.occupied.weightKg }} / {{ trip.maxLoadKg }}</td><td>{{ segment.occupied.volumeCbm }} / {{ trip.maxVolumeCbm }}</td><td v-if="planning">{{ segment.remaining.palletSpaces }} / {{ segment.remaining.weightKg }} / {{ segment.remaining.volumeCbm }}</td></tr></tbody></table>
   </div>
 </template>
+
+<style scoped>
+.trip-pallet-code{white-space:normal;overflow-wrap:anywhere}
+.trip-loading-table :deep(.el-input-number),.trip-loading-table :deep(.el-select){width:100%;min-width:0;max-width:100%}
+</style>

From 1edb65df773da8e6246217fda0ba330860b05465 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 12:33:02 +0800
Subject: [PATCH 40/47] fix(fleet): fit receipt pallet space controls within
 dialog

---
 .../components/TripBookingFulfillmentDialog.test.ts        | 7 ++++---
 .../components/TripBookingFulfillmentDialog.vue            | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
index b61c4399..86693fd9 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
@@ -17,7 +17,7 @@ function mount(mode: 'incoming' | 'receipt' | 'bind' | 'view') {
   const field = { props: ['modelValue'], emits: ['update:modelValue'], template: '<input />' }
   const wrapper = shallowMount(TripBookingFulfillmentDialog, { props: { modelValue: true, trip, booking, mode, arrivalAt: '2026-10-03T08:00:00Z' }, global: { plugins: [createPinia()], directives: { loading: () => undefined }, stubs: {
     AppDialog: { name: 'AppDialog', props: ['modelValue', 'confirmDisabled'], emits: ['confirm'], template: '<div><slot/></div>' },
-    DataTable: { name: 'DataTable', props: ['data'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="spaces" :row="row"/></div></div>' },
+    DataTable: { name: 'DataTable', props: ['data', 'columns'], template: '<div><div v-for="row in data" :key="row.warehousePalletId"><slot name="spaces" :row="row"/></div></div>' },
     ElForm: { template: '<div><slot/></div>' }, ElFormItem: { template: '<div><slot/></div>' }, ElInputNumber: { ...field, name: 'ElInputNumber' }, ElDatePicker: field, ElInput: field,
     ElButton: { template: '<button><slot/></button>' }, LoadErrorState: true, ApiErrorMeta: true,
   } } }); wrappers.push(wrapper); return wrapper
@@ -27,9 +27,10 @@ afterEach(() => wrappers.splice(0).forEach(wrapper => wrapper.unmount()))
 it('uses server actual pallets and preview versions while requiring explicit price confirmation', async () => {
   vi.mocked(api.acceptTripIncoming).mockResolvedValue({ tripRecordVersion: 6, booking: { ...booking, status: 'RECEIVED' }, replayed: false })
   const wrapper = mount('receipt'); await flushPromises()
-  const inputs = wrapper.findAllComponents({ name: 'ElInputNumber' }); inputs[1]!.vm.$emit('update:modelValue', 55); await flushPromises()
+  expect(wrapper.findComponent({ name: 'DataTable' }).props('columns')).toContainEqual(expect.objectContaining({ key: 'spaces', singleLine: false }))
+  const inputs = wrapper.findAllComponents({ name: 'ElInputNumber' }); inputs[0]!.vm.$emit('update:modelValue', 2); inputs[1]!.vm.$emit('update:modelValue', 55); await flushPromises()
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
-  expect(api.acceptTripIncoming).toHaveBeenCalledWith('TR-1', 'FB-1', expect.objectContaining({ tripRecordVersion: 5, recordVersion: 2, receiptHash: 'receipt-hash', unitPrice: 55, pallets: [{ warehousePalletId: '902', palletSpaces: 1 }] }))
+  expect(api.acceptTripIncoming).toHaveBeenCalledWith('TR-1', 'FB-1', expect.objectContaining({ tripRecordVersion: 5, recordVersion: 2, receiptHash: 'receipt-hash', unitPrice: 55, pallets: [{ warehousePalletId: '902', palletSpaces: 2 }] }))
   expect(api.startTripIncoming).not.toHaveBeenCalled(); expect(api.bindTripBookingDispatch).not.toHaveBeenCalled()
 })
 it('does not accept a receipt while the warehouse is still waiting for actual goods', async () => {
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
index e02faafd..036e9220 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
@@ -34,7 +34,7 @@ const incomingStatusLabel = computed(() => {
 })
 const columns = computed<DataTableColumn[]>(() => [{ key: 'palletNo', prop: 'palletNo', label: '实收托盘', minWidth: 180 }, { key: 'packages', prop: 'packages', label: '箱数', width: 95 },
   { key: 'weightKg', prop: 'weightKg', label: '实测重量（kg）', minWidth: 150 }, { key: 'volumeCbm', prop: 'volumeCbm', label: '实测体积（m³）', minWidth: 150 },
-  ...(props.mode === 'receipt' ? [{ key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 170 }] : [])])
+  ...(props.mode === 'receipt' ? [{ key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 170, singleLine: false }] : [])])
 async function load() {
   if (!props.booking) return
   const current = generation; loading.value = true; error.value = null
@@ -100,7 +100,7 @@ onBeforeUnmount(() => { generation++ })
       </el-form>
       <template v-if="mode === 'receipt' || mode === 'view'">
         <el-button :loading="loading" :disabled="busy || !!pending" @click="load">刷新收货进度</el-button><p>来货单：{{ preview?.incoming?.incomingNo || '—' }} · {{ incomingStatusLabel }}</p>
-        <DataTable :data="preview?.incoming?.pallets || []" :columns="columns" row-key="warehousePalletId" empty-text="仓库尚未完成实际打托"><template #spaces="{ row }"><el-input-number v-model="spaces[row.warehousePalletId]" :min="1" :precision="0" :disabled="busy || !!pending" placeholder="实际占用托位" /></template></DataTable>
+        <DataTable class="receipt-pallet-table" :data="preview?.incoming?.pallets || []" :columns="columns" row-key="warehousePalletId" empty-text="仓库尚未完成实际打托"><template #spaces="{ row }"><el-input-number v-model="spaces[row.warehousePalletId]" :min="1" :precision="0" :disabled="busy || !!pending" placeholder="实际占用托位" /></template></DataTable>
         <el-form v-if="mode === 'receipt'" label-position="top" class="density-form incoming-form" :disabled="busy || !!pending"><el-form-item :label="booking.cargo.priceBasis === 'ORDER' ? '确认整单价格' : '确认每托位价格'"><el-input-number v-model="unitPrice" :min="0" :precision="2" placeholder="核对约定价格" /></el-form-item></el-form>
         <p v-if="mode === 'receipt'">原约定 {{ booking.agreedAmount?.toFixed(2) }} {{ booking.cargo.currency }}；本次实收 {{ preview?.incoming?.receivedPackages || 0 }} 箱、{{ totalSpaces }} 托位，确认金额 {{ amount?.toFixed(2) || '—' }} {{ booking.cargo.currency }}。转派送时按本次确认报价登记应收。</p>
       </template>
@@ -108,4 +108,4 @@ onBeforeUnmount(() => { generation++ })
     </div>
   </AppDialog>
 </template>
-<style scoped>.incoming-form{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.incoming-form :deep(.el-date-editor),.incoming-form :deep(.el-input-number){width:100%}</style>
+<style scoped>.incoming-form{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.incoming-form :deep(.el-date-editor),.incoming-form :deep(.el-input-number){width:100%}.receipt-pallet-table :deep(.el-input-number){width:100%;min-width:0;max-width:100%}</style>

From d77abbef7c2790724faf141640c71e20990ec55e Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 13:07:52 +0800
Subject: [PATCH 41/47] fix: align fleet controls and protect appointment
 retries

---
 .../AppointmentCalendarView.test.ts           | 63 ++++++++++++++++---
 .../AppointmentCalendarView.vue               | 34 +++++++---
 .../AppointmentCargoPanel.test.ts             |  2 +-
 .../AppointmentCargoPanel.vue                 | 19 ++++--
 .../AppointmentFollowupDialog.test.ts         | 19 +++++-
 .../AppointmentFollowupDialog.vue             | 22 +++++--
 .../AppointmentTableRendering.test.ts         | 16 ++++-
 .../components/CapacityInquiryDialog.vue      |  7 +++
 .../components/CapacityInquiryTable.vue       |  7 ++-
 .../TripBookingFulfillmentDialog.test.ts      | 42 ++++++++++++-
 .../TripBookingFulfillmentDialog.vue          | 29 ++++++++-
 .../components/TripBookingPanel.test.ts       |  3 +-
 .../pages/CapacityOffersBehavior.test.ts      | 35 +++++++++++
 13 files changed, 262 insertions(+), 36 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 8c85a47c..b03f0205 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -1,21 +1,23 @@
+import { inject, onBeforeUnmount } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentCalendarView from './AppointmentCalendarView.vue'
-import { createFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
+import { createFbaAppointment, getFbaAppointment, updateFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
 import { listArrivalCalendar, listPickupCalendar } from './api'
 import { listTripCalendar } from './tripCalendar'
 vi.mock('./tripCalendar', async (original) => ({...(await original<typeof import('./tripCalendar')>()),listTripCalendar:vi.fn()}))
 import { resolvePlanningSource, saveFollowup, listUnscheduledAppointments } from './planningApi'
-const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true, canPickup: true, canTrips: true }))
+const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true, canPickup: true, canTrips: true, canWrite: true, containerPending: false }))
 vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listUnscheduledAppointments: vi.fn() }))
 import { listPlatformWarehouses } from '@/modules/warehouses'
 vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
 
-vi.mock('vue-router', () => ({ useRoute: () => routing, useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRoute: () => routing, useRouter: () => ({ push: vi.fn() }) }))
 
 vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), listPickupCalendar: vi.fn(), deleteAppointment: vi.fn() }))
 
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => (permission !== 'source-read' || routing.canSourceRead) && (permission !== 'platform:firstleg:terminal-drayage:list' || routing.canPickup) && (permission !== 'platform:fleet:trip:list' || routing.canTrips) }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => (permission !== 'write' || routing.canWrite) && (permission !== 'source-read' || routing.canSourceRead) && (permission !== 'platform:firstleg:terminal-drayage:list' || routing.canPickup) && (permission !== 'platform:fleet:trip:list' || routing.canTrips) }) }))
 vi.mock('@/modules/overseas-warehouse', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/modules/overseas-warehouse')>()),
   createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(), listFbaAppointmentCalendar: vi.fn(),
   listInboundOrders: vi.fn(), updateFbaAppointment: vi.fn(),
@@ -30,9 +32,13 @@ const candidates = [
 function render(openCalendar = true) {
   const wrapper = mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
     AdminPage: { template: '<main><slot /></main>' },
-    AppointmentContainerPanel: true,
+    AppointmentContainerPanel: { name: 'AppointmentContainerPanel', setup() {
+      const register = inject<(guard: () => boolean) => () => void>('appointment-register-leave-guard')!
+      const unregister = register(() => !routing.containerPending)
+      onBeforeUnmount(unregister)
+    }, template: '<div>整柜跟进工作区</div>' },
     AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', mounted() { this.$emit('layers', { arrivals: true, trips: true }) }, props: ['events', 'incomplete', 'notices'], template: '<div><button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button><slot name="notice-actions" /></div>' },
-    AppDialog: { props: ['modelValue'], template: '<div v-if="modelValue"><slot /><button data-save @click="$emit(\'confirm\')">保存</button></div>' },
+    AppDialog: { name: 'AppDialog', props: ['modelValue', 'showConfirm', 'beforeClose'], template: '<div v-if="modelValue"><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button v-if="showConfirm !== false" data-save @click="$emit(\'confirm\')">保存</button></div>' },
     ElForm: { template: '<form><slot /></form>' },
     ElFormItem: { template: '<label><slot /></label>' },
     ElInput: { props: ['modelValue', 'placeholder'], template: '<input :placeholder="placeholder" :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
@@ -40,7 +46,7 @@ function render(openCalendar = true) {
     ElButton: { template: '<button><slot /></button>' },
     ElSelect: { name: 'ElSelect', emits: ['update:modelValue', 'change'], props: ['modelValue', 'remoteMethod'], template: '<select :value="modelValue" @change="$emit(\'update:modelValue\', $event.target.value); $emit(\'change\', $event.target.value)"><option value="">请选择</option><slot /></select>' },
     ElOption: { props: ['value', 'label'], template: '<option :value="value">{{ label }}</option>' },
-    DataTable: { name: 'DataTable', props: ['data'], template: '<div><slot name="toolbar-actions" /><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
+    DataTable: { name: 'DataTable', props: ['data'], template: '<div><slot name="toolbar-actions" /><slot v-for="row in data" name="actions" :row="row"/><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
     LoadErrorState: true, ApiErrorMeta: true, AppointmentFollowupDialog: true, AppointmentCargoPanel: { name: 'AppointmentCargoPanel', props: ['externalSource'], template: '<div>合批工作区</div>' },
   } } })
   if (openCalendar) void wrapper.findAll('button').find(button => button.text() === '预约日历')!.trigger('click')
@@ -50,7 +56,7 @@ function render(openCalendar = true) {
 describe('appointment calendar data integration', () => {
   beforeEach(() => {
     vi.resetAllMocks()
-    routing.query = {}; routing.canSourceRead = true; routing.canPickup = true; routing.canTrips = true
+    routing.query = {}; routing.canSourceRead = true; routing.canPickup = true; routing.canTrips = true; routing.canWrite = true; routing.containerPending = false
     vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: ['ONT8', 'LAX9'].map(code => ({ id: code, tenantId: 0, warehouseCode: code, warehouseName: code, warehouseType: 'FBA' as const, status: 'ACTIVE' as const, internalCode: null, countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, remark: null })), page: 1, size: 50, pages: 1, total: 2 })
     vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([])
     vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [], total: 0})
@@ -61,6 +67,36 @@ describe('appointment calendar data integration', () => {
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
+  it('keeps the container view mounted while a child has an unresolved command', async () => {
+    const wrapper = render(); await flushPromises()
+    const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
+    await tabs[1]!.trigger('click'); await flushPromises()
+    routing.containerPending = true
+    await tabs[0]!.trigger('click')
+    expect(tabs[1]!.attributes('aria-pressed')).toBe('true')
+    expect(wrapper.findComponent({ name: 'AppointmentContainerPanel' }).exists()).toBe(true)
+    routing.containerPending = false
+    await tabs[0]!.trigger('click')
+    expect(tabs[0]!.attributes('aria-pressed')).toBe('true')
+    expect(wrapper.findComponent({ name: 'AppointmentContainerPanel' }).exists()).toBe(false)
+    wrapper.unmount()
+  })
+
+  it('opens an unscheduled appointment read-only without allowing a save', async () => {
+    routing.canWrite = false
+    const record = { version: 0, id: '1', appointmentNo: 'AP-READ', originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 1, fbaWarehouseCode: 'ONT8', items: [] }
+    vi.mocked(listUnscheduledAppointments).mockResolvedValue({ records: [record], total: 1 })
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button').find(b => b.text() === '查看 / 继续')!.trigger('click'); await flushPromises()
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    const dialog = wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!
+    dialog.vm.$emit('confirm'); await flushPromises()
+    expect(updateFbaAppointment).not.toHaveBeenCalled()
+    expect(wrapper.findComponent({ name: 'FbaAppointmentFields' }).props('disabled')).toBe(true)
+    wrapper.unmount()
+  })
+
   it('puts calendar first and opens it by default without reloading when switching back', async () => {
     const wrapper = render(false); await flushPromises()
     const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
@@ -163,6 +199,17 @@ describe('appointment calendar data integration', () => {
     await wrapper.get('[data-select]').trigger('click')
     await wrapper.get('[data-save]').trigger('click'); await flushPromises()
     const first = vi.mocked(createFbaAppointment).mock.calls[0]![0]
+    await wrapper.get('[data-close]').trigger('click')
+    expect(wrapper.find('[data-save]').exists()).toBe(true)
+    await wrapper.get('[data-create]').trigger('click')
+    expect((wrapper.get('select[aria-label="预约仓库"]').element as HTMLSelectElement).value).toBe('ONT8')
+    const done = vi.fn()
+    wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!.props('beforeClose')(done)
+    expect(done).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave, onBeforeRouteUpdate]) {
+      const guard = vi.mocked(hook).mock.calls.at(-1)![0] as () => boolean
+      expect(guard()).toBe(false)
+    }
     await wrapper.get('[data-save]').trigger('click'); await flushPromises()
     expect(vi.mocked(createFbaAppointment).mock.calls[1]![0]).toEqual(first)
     expect(first.details.appointmentAt).toBeNull()
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 22d25403..fbfeb373 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { computed, provide, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
 import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource, type PlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -35,6 +35,14 @@ const selectedSource = ref<PlanningSource | null>(null)
 const linkError = ref<ApiErrorDetails | null>(null)
 const linkLoading = ref(false)
 let linkRequest = 0
+const childLeaveGuards = new Set<() => boolean>()
+provide('appointment-register-leave-guard', (guard: () => boolean) => {
+  childLeaveGuards.add(guard)
+  return () => { childLeaveGuards.delete(guard) }
+})
+function switchWorkView(next: 'calendar' | 'cargo' | 'containers') {
+  if (canLeave()) workView.value = next
+}
 const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
 const calendarVisited = ref(true)
 const showTripLayer = ref(false)
@@ -203,7 +211,16 @@ function openSource(event: CalendarEvent) {
   if (event.sourcePath) void router.push(event.sourcePath)
 }
 
+function canLeave() {
+  if (saving.value || pendingSave.value) { ElMessage.warning('请先核实本次保存结果，再关闭或切换'); return false }
+  return [...childLeaveGuards].every(guard => guard())
+}
+function beforeCloseAppointment(done: () => void) { if (canLeave()) done() }
+function closeAppointment() { if (canLeave()) dialogOpen.value = false }
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
 function openCreate(date: string) {
+  if (!access.can(permission.inboundOrderAppointment) || !canLeave()) return
   ++candidateRequest
   ++detailRequest
   detailLoading.value = false
@@ -225,6 +242,7 @@ function openCreate(date: string) {
 }
 
 async function openEdit(event: Pick<CalendarEvent, 'key'>) {
+  if (!canLeave()) return
   const request = ++detailRequest
   dialogError.value = null
   editing.value = [...appointments.value, ...unscheduled.value].find(item => item.appointmentNo === event.key) || null
@@ -294,7 +312,7 @@ async function loadCandidates() {
 }
 
 async function save() {
-  if (saving.value || detailLoading.value || !detailReady.value) return
+  if (!access.can(permission.inboundOrderAppointment) || saving.value || detailLoading.value || !detailReady.value) return
   const validation = appointmentFormError(form)
   if (!pendingSave.value && validation) { ElMessage.warning(validation); return }
   if (!editing.value) {
@@ -382,9 +400,9 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(permission.inboundOrderAppointment)" @arrange="arrangeLinkedSource" @close="linkedSource = null" />
     <div class="appointment-heading">
     <div class="density-status-tabs" role="group" aria-label="预约工作视图">
-      <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="workView = 'calendar'">预约日历</button>
-      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="workView = 'containers'">提柜与到仓</button>
-      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="workView = 'cargo'">送仓与排车</button>
+      <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="switchWorkView('calendar')">预约日历</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="switchWorkView('containers')">提柜与到仓</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="switchWorkView('cargo')">送仓与排车</button>
     </div>
     </div>
     <div v-if="cargoVisited" v-show="workView === 'cargo'"><AppointmentCargoPanel :external-source="selectedSource" @source-accepted="selectedSource = null" @created="load(); loadUnscheduled()" /></div>
@@ -405,7 +423,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         <template #issues="{ row }">{{ tripIssues(row as TripCalendarEntry) }}</template>
       </DataTable>
     </AppDialog>
-    <AppDialog v-model="dialogOpen" class="admin-density-dialog" :title="editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
+    <AppDialog :model-value="dialogOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :show-confirm="access.can(permission.inboundOrderAppointment)" class="admin-density-dialog" :title="editing ? (access.can(permission.inboundOrderAppointment) ? '编辑预约' : '查看预约') : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
       <div v-loading="detailLoading">
         <el-form label-position="top" class="calendar-form density-form">
@@ -418,7 +436,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         </el-form>
         <LoadErrorState v-if="!editing && warehouseError" title="仓库加载失败" :message="warehouseError.message" @retry="searchWarehouses(warehouseKeyword)" />
         <p v-if="!editing && warehouseTotal > warehouseOptions.length && !warehouseError" class="appointment-hint">输入更完整的仓库编码或名称，缩小搜索范围。</p>
-        <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="saving || !!pendingSave" />
+        <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="!access.can(permission.inboundOrderAppointment) || saving || !!pendingSave" />
         <template v-if="!editing && warehouse">
           <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
             <template #customer="{ row }">{{ row.customerName?.trim() || '客户名称缺失' }}</template>
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts b/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts
index 6becc51e..f4be5639 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.test.ts
@@ -4,7 +4,7 @@ import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import { listPlanningCargo } from './planningApi'
 
 vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn() }))
-vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const empty = { records: [], page: 1, size: 20, total: 0, pages: 0 }
 function render() {
diff --git a/src/modules/appointment-calendar/AppointmentCargoPanel.vue b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
index e3f38e1d..42484968 100644
--- a/src/modules/appointment-calendar/AppointmentCargoPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCargoPanel.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, ref, reactive } from 'vue'
+import { inject, computed, onBeforeUnmount, onMounted, ref, reactive } from 'vue'
 import { ElMessage } from 'element-plus'
 import { FbaAppointmentFields, createAppointmentForm, appointmentPayload, appointmentFormError, overseasWarehousePermissions } from '@/modules/overseas-warehouse'
 import AppDialog from '@/shared/components/AppDialog.vue'
-import { useRouter } from 'vue-router'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRouter } from 'vue-router'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import QueryToolbar, { type QueryModel, type QueryField } from '@/shared/components/QueryToolbar.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -61,7 +61,7 @@ function toggle(row: PlanningCargo, checked: unknown) {
 }
 function selectPage() { for (const row of rows.value) if (selectable(row) && selectedRows.value.length < 100) selected.value[row.sourceKey] = row }
 async function previewBatch() {
-  if (!selectedRows.value.length || batchLoading.value) return
+  if (!selectedRows.value.length || batchLoading.value || creating.value || pendingCreate.value) return
   const current = ++batchRequest
   batchLoading.value = true; batchError.value = null
   try {
@@ -133,6 +133,17 @@ async function openFollowup(row: Pick<PlanningCargo, 'sourceKey' | 'customerId'
     if (request === followupRequest) following.value = result
   } catch (cause) { if (request === followupRequest) followupError.value = getApiErrorDetails(cause, '来源核对失败') }
 }
+function canLeave() {
+  if (creating.value || pendingCreate.value) { ElMessage.warning('请先核实本次保存结果，再关闭或切换'); return false }
+  return true
+}
+function closeBatch() { if (canLeave()) batchPreview.value = null }
+function beforeClose(done: () => void) { if (canLeave()) done() }
+const registerLeaveGuard = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregisterLeaveGuard = registerLeaveGuard?.(canLeave)
+onBeforeUnmount(() => unregisterLeaveGuard?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
 onMounted(() => load())
 onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller?.abort() })
 </script>
@@ -188,7 +199,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
     </template>
   </DataTable>
   <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(overseasWarehousePermissions.inboundOrderAppointment)" @arrange="arrangeFollowing" @close="following = null" />
-  <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="pendingCreate ? '重试本次保存' : '保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="batchPreview = null">
+  <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="pendingCreate ? '重试本次保存' : '保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="closeBatch" :before-close="beforeClose">
     <p>{{ batchPreview.originWarehouseName }} → {{ batchPreview.destinationWarehouseCode }}</p>
     <p>{{ batchPreview.group.sourceCount }} 票 / {{ batchPreview.group.customerCount }} 个客户 / 预报 {{ batchPreview.group.packages ?? '待核实' }} 箱</p>
     <p v-if="batchPreview.group.readinessIncomplete">货物备妥窗口待核实；预计到港或预计到仓不能替代备妥时间。</p>
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts b/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
index d2016ce1..05fec2f9 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts
@@ -1,15 +1,17 @@
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { getFollowups, saveFollowup, getContainerFollowups, saveContainerFollowup, type PlanningSource, type ContainerFollowupContext } from './planningApi'
 
 vi.mock('./planningApi', () => ({ getFollowups: vi.fn(), saveFollowup: vi.fn(), getContainerFollowups: vi.fn(), saveContainerFollowup: vi.fn() }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
 vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() } }))
 const history = { history: { records: [], page: 1, size: 10, total: 0, pages: 0 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 } }
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', canFollowup: true, blockReasons: [], orderId: '1', inboundCode: 'IN-1', bookingNo: null, containerNo: null, originWarehouseId: 'US-1', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: null, sourceVersion: null }
 function render(canWrite = true, container?: ContainerFollowupContext) {
   return mount(AppointmentFollowupDialog, { props: container ? { container, canWrite } : { source, coverage: { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }, canWrite }, global: { stubs: {
-    AppDialog: { props: ['confirmDisabled'], template: '<div><slot/><button data-save :disabled="confirmDisabled" @click="$emit(\'confirm\')">保存</button></div>' },
+    AppDialog: { name: 'AppDialog', props: ['confirmDisabled', 'beforeClose'], template: '<div><slot/><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save :disabled="confirmDisabled" @click="$emit(\'confirm\')">保存</button></div>' },
     ElForm: { template: '<form><slot/></form>' }, ElFormItem: { template: '<label><slot/></label>' },
     ElInput: { props: ['modelValue', 'placeholder'], template: '<input :value="modelValue" :placeholder="placeholder" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
     ElSelect: true, ElOption: true, ElDatePicker: true,
@@ -33,6 +35,12 @@ describe('appointment followup recovery', () => {
     expect(saveFollowup).not.toHaveBeenCalled()
     wrapper.unmount()
   })
+  it('describes FBA followup independently of batch action visibility', async () => {
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.text()).toContain('FBA收货跟进')
+    expect(wrapper.text()).not.toContain('同柜多客户共用提柜')
+    wrapper.unmount()
+  })
   it('saves contact facts without requiring appointment, inbound plan or driver fields', async () => {
     const wrapper = render(); await flushPromises()
     await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('已联系，等待回复')
@@ -48,6 +56,15 @@ describe('appointment followup recovery', () => {
     await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('等待码头开放')
     await wrapper.get('[data-save]').trigger('click'); await flushPromises()
     const first = vi.mocked(saveFollowup).mock.calls[0]![2]
+    await wrapper.get('[data-close]').trigger('click')
+    expect(wrapper.emitted('close')).toBeUndefined()
+    const done = vi.fn()
+    wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!.props('beforeClose')(done)
+    expect(done).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave, onBeforeRouteUpdate]) {
+      const guard = vi.mocked(hook).mock.calls.at(-1)![0] as () => boolean
+      expect(guard()).toBe(false)
+    }
     await wrapper.get('[data-save]').trigger('click'); await flushPromises()
     expect(vi.mocked(saveFollowup).mock.calls[1]![2]).toEqual(first)
     expect(first.idempotencyKey).toBeTruthy()
diff --git a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
index 5e764230..0219510a 100644
--- a/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentFollowupDialog.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { inject, computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -73,15 +74,28 @@ async function save() {
     if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(saveError.value.code || '')) { pending.value = null; await load() }
   } finally { saving.value = false }
 }
+function canLeave() {
+  if (saving.value || pending.value) { ElMessage.warning('请先核实本次保存结果，再关闭或切换'); return false }
+  return true
+}
+function close() { if (canLeave()) emit('close') }
+function arrange() { if (canLeave()) emit('arrange') }
+function beforeClose(done: () => void) { if (canLeave()) done() }
+const registerLeaveGuard = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregisterLeaveGuard = registerLeaveGuard?.(canLeave)
+onBeforeUnmount(() => unregisterLeaveGuard?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
 onMounted(load)
 onBeforeUnmount(() => { ++generation })
 </script>
 
 <template>
-  <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${title}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !canFollowup || !ready || loading" @confirm="save" @update:model-value="emit('close')">
+  <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${title}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !canFollowup || !ready || loading" @confirm="save" @update:model-value="close" :before-close="beforeClose">
     <p v-if="source">{{ source.containerNo || '—' }} · {{ source.originWarehouseName }} → {{ source.destinationWarehouseCode }}</p>
-    <el-button v-if="source && canArrange && source.canFollowup && !coverage?.appointments.length" :disabled="saving" @click="emit('arrange')">加入预约合批</el-button>
-    <p v-else>同柜多客户共用{{ container?.warehouseId ? '此接仓点' : '提柜' }}跟进记录；保存联系不自动确认预约或推进收货。</p>
+    <el-button v-if="source && canArrange && source.canFollowup && !coverage?.appointments.length" :disabled="saving || !!pending" @click="arrange">加入预约合批</el-button>
+    <p v-if="container">同柜多客户共用{{ container?.warehouseId ? '此接仓点' : '提柜' }}跟进记录；保存联系不自动确认预约或推进收货。</p>
+    <p v-else>本条记录用于此货源的FBA收货跟进；保存联系不自动确认预约或推进收货。</p>
     <LoadErrorState v-if="error" title="跟进记录加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="saveError" title="跟进保存未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
     <p v-for="reason in blockReasons" :key="reason">{{ reason }}</p>
diff --git a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
index 2734d7e2..516c7c4c 100644
--- a/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
+++ b/src/modules/appointment-calendar/AppointmentTableRendering.test.ts
@@ -1,3 +1,4 @@
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import ElementPlus from 'element-plus'
 import { listImpacts } from './impactApi'
 vi.mock('./impactApi', async original => ({ ...await original<typeof import('./impactApi')>(), listImpacts: vi.fn(), refreshImpacts: vi.fn() }))
@@ -9,7 +10,7 @@ import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
 import { listExternalAppointmentCandidates, getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningContainer, type PlanningSource } from './planningApi'
 
 vi.mock('./planningApi', () => ({ listExternalAppointmentCandidates: vi.fn(), listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn(), createSourceAppointment: vi.fn() }))
-vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRouter: () => ({ push: vi.fn() }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
 const cargo: PlanningCargo = { sourceKey: source.sourceKey, customerId: 'A', customerName: '客户甲', orderId: '1', inboundCode: 'IN-A', containerBookingId: '2', containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseCode: 'US', originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', packages: 20, receivedPackages: null, shippedPackages: null, sourcePalletCount: null, volumeCbm: null, estimatedArrivalAt: null, estimatedWarehouseAt: '2026-10-10T13:48:15', orderVersion: 1, standardNode: 'DEPARTED', shippingVersion: null, shippingObservedAt: null, shippingProvider: null, hasInboundPlan: false, hasActiveAppointment: false, detained: false, mixedDestinations: false }
@@ -46,7 +47,7 @@ describe('appointment tables use actual shared table slots', () => {
     vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
     vi.mocked(previewPlanningBatch).mockResolvedValue({group:{originWarehouseId:'100',destinationKey:'FBA:ONT8',packages:null,sourceCount:2,customerCount:2,readyFrom:null,readyTo:null,readinessIncomplete:true,unknownQuantitySources:1},originWarehouseName:'美国仓',destinationWarehouseCode:'ONT8',destinationTimezone:null,sources:[external,source],missingFields:['CARGO_QUANTITY_REVIEW']})
     vi.mocked(createSourceAppointment).mockRejectedValueOnce(new Error('network interrupted')).mockResolvedValueOnce({id:'1',version:0,appointmentNo:'AP-MIXED',appointmentStatus:'PENDING',originWarehouseId:'100',fbaWarehouseCode:'ONT8',selectedCount:2,items:[]})
-    const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:external},global:{plugins:[ElementPlus],stubs:{AppDialog:{template:'<section><slot /><button data-save @click="$emit(\'confirm\')">Save</button></section>'}}}})
+    const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:external},global:{plugins:[ElementPlus],stubs:{AppDialog:{name:'AppDialog',props:['beforeClose'],template:'<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save @click="$emit(\'confirm\')">Save</button></section>'}}}})
     await flushPromises()
     await wrapper.findAll('button').find(b=>b.text()==='加入本次选择')!.trigger('click')
     await wrapper.findAll('button').find(b=>b.text()==='选择本页可合批货物')!.trigger('click')
@@ -54,6 +55,15 @@ describe('appointment tables use actual shared table slots', () => {
     expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{sourceKey:'BOOKING:B-1',customerId:'B',destinationKey:'FBA:ONT8'},{sourceKey:'ORDER:1',customerId:'A',destinationKey:'FBA:ONT8'}])
     await wrapper.get('[data-save]').trigger('click');await flushPromises()
     const first=vi.mocked(createSourceAppointment).mock.calls[0]![0]
+    await wrapper.get('[data-close]').trigger('click')
+    expect(wrapper.find('[data-save]').exists()).toBe(true)
+    const done = vi.fn()
+    wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!.props('beforeClose')(done)
+    expect(done).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave, onBeforeRouteUpdate]) {
+      const guard = vi.mocked(hook).mock.calls.at(-1)![0] as () => boolean
+      expect(guard()).toBe(false)
+    }
     expect(first).toMatchObject({originWarehouseId:'100',fbaWarehouseCode:'ONT8',details:{appointmentStatus:'PENDING',confirmationNo:null,appointmentAt:null}})
     expect(first.sources[0]!.sourceKey).toBe('BOOKING:B-1')
     await wrapper.get('[data-save]').trigger('click');await flushPromises()
@@ -140,7 +150,7 @@ describe('appointment tables use actual shared table slots', () => {
   })
   it('keeps arrangement permission independent from contact-record writes and avoids duplicate active appointments', async () => {
     vi.mocked(getFollowups).mockResolvedValue({history:{records:[],total:0,page:1,size:10,pages:0},versions:{DRAYAGE_CONTACT:0,TERMINAL_APPOINTMENT:0,WAREHOUSE_RECEIVING:0,FBA_RECEIVING:0}})
-    const wrapper=mount(AppointmentFollowupDialog,{props:{source,coverage,canWrite:false,canArrange:true},global:{plugins:[ElementPlus],stubs:{AppDialog:{template:'<section><slot /></section>'}}}})
+    const wrapper=mount(AppointmentFollowupDialog,{props:{source,coverage,canWrite:false,canArrange:true},global:{plugins:[ElementPlus],stubs:{AppDialog:{name:'AppDialog',props:['beforeClose'],template:'<section><slot /></section>'}}}})
     await flushPromises();await wrapper.findAll('button').find(b=>b.text()==='加入预约合批')!.trigger('click')
     expect(wrapper.emitted('arrange')).toHaveLength(1)
     await wrapper.setProps({canArrange:false});expect(wrapper.findAll('button').some(b=>b.text()==='加入预约合批')).toBe(false)
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index 75ea25ea..539aa5db 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -47,6 +47,7 @@ const target = computed(() => props.inquiry?.bookingNo || props.offer?.offerNo |
 const writable = computed(() => !props.readonly && (access.can('platform:fleet:capacity-offer:manage') || access.can('platform:fleet:capacity-offer:list') && access.can(`platform:fleet:capacity-offer:inquiry-${props.inquiry ? 'edit' : 'create'}`)) && (props.inquiry ? props.inquiry.actions.canEdit : props.offer?.canCreateInquiry))
 const canQuote = computed(() => access.can('platform:fleet:quote:list'))
 const lock = computed(() => !writable.value || busy.value || !!pending.value)
+const selectedCapacity = computed(() => props.offer?.capacityKnown ? props.offer.destinations.find(stop => stop.destinationKey === form.cargo.destinationKey)?.remaining : null)
 const quoteReady = computed(() => !!form.customerId && form.cargo.destinationKey.startsWith('FBA:') && ['CNY', 'USD'].includes(form.cargo.currency || ''))
 const guard = useFleetDraftGuard('capacity-inquiry-editor', open, form, busy, computed(() => !!pending.value))
 let generation = 0, customerSequence = 0, quoteSequence = 0
@@ -104,6 +105,12 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
   <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog" destroy-on-close :title="readonly ? '客户货物跟进' : inquiry ? '补充客户货物资料' : '登记客户货物'" width="1080px" :show-confirm="writable" :confirm-text="pending ? '重试原请求' : confirmMode ? '确认承运并保位' : '保存登记'" :confirm-loading="busy" @confirm="save">
     <LoadErrorState v-if="error" title="意向未能保存" :message="error.message" @retry="pending ? save() : emit('refresh')"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <p v-if="confirmMode">核对本票货量、价格与交货资料后确认承运。成功将保留货位并创建关联本土订单，不自动安排仓库收货。</p>
+    <section v-if="confirmMode" aria-label="本目的站可接余位">
+      <strong>本目的站可接余位</strong>
+      <p v-if="selectedCapacity">{{ selectedCapacity.palletSpaces }} 托位 · {{ selectedCapacity.weightKg }} kg · {{ selectedCapacity.volumeCbm }} m³</p>
+      <p v-else>待调度核对，当前没有可靠的可接余位。</p>
+      <p>托位、重量、体积须同时满足；确认时由系统重新核验，不代表已经保位。</p>
+    </section>
     <p v-if="pending" role="status">上次提交结果尚未确定，请保留原内容重试或核对。</p>
     <p v-if="offer">{{ offer.offerNo }} · {{ offer.warehouseName }} · {{ offer.blockReason || '询价不占位，调度确认承运后占位。' }}</p>
     <section v-if="inquiry" aria-label="本票处理进度"><strong>{{ inquiry.progress.label }} · {{ inquiry.progress.reservation }}</strong><p>下一步负责人：{{ inquiry.progress.owner }} · {{ inquiry.progress.message }}</p></section>
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
index 81ea3625..a63676f9 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
@@ -10,7 +10,7 @@ const access = useAccessPreviewStore()
 function actions(row: CapacityInquiry, busy: boolean): RowActionItem[] {
   const manage = access.can('platform:fleet:capacity-offer:manage')
   const write = (kind: string) => manage || access.can('platform:fleet:capacity-offer:list') && access.can(`platform:fleet:capacity-offer:inquiry-${kind}`)
-  return [{ key: 'view', label: '查看进度', priority: 10 },
+  const items: RowActionItem[] = [{ key: 'view', label: '查看进度', priority: 10 },
     { key: 'incoming', label: '安排来货', visible: manage && row.progress.primaryAction === 'INCOMING' && access.can('platform:fleet:trip:booking-edit'), disabled: busy },
     { key: 'receipt', label: '查看收货并核量', visible: manage && row.progress.primaryAction === 'RECEIPT' && access.can('platform:fleet:trip:booking-confirm'), disabled: busy },
     { key: 'bind', label: '确认排入本车', visible: manage && row.progress.primaryAction === 'BIND' && access.can('platform:fleet:trip:booking-edit') && access.can('platform:fleet:trip:edit') && access.can('platform:overseas-warehouse:inbound-order:smart-dispatch'), disabled: busy },
@@ -18,6 +18,9 @@ function actions(row: CapacityInquiry, busy: boolean): RowActionItem[] {
     { key: 'edit', label: '补充资料', visible: row.actions.canEdit && write('edit'), disabled: busy },
     { key: 'confirm', label: '核对并确认', visible: (row.actions.canConfirm || row.actions.canEdit) && manage, disabled: busy },
     { key: 'cancel', label: '取消意向', visible: row.actions.canCancel && write('cancel'), disabled: busy, tone: 'danger' }]
+  const primary = items.find(action => action.visible !== false && action.key.toUpperCase() === row.progress.primaryAction)
+  if (primary) { primary.priority = 20; primary.tone = 'primary' }
+  return items
 }
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 320, fixed: 'left', slotName: 'actions' },
@@ -32,7 +35,7 @@ const columns: DataTableColumn[] = [
   <template v-if="$slots['toolbar-start']" #toolbar-start><slot name="toolbar-start" /></template>
   <template v-if="$slots.filters" #filters><slot name="filters" /></template>
   <template v-if="$slots.notices" #notices><slot name="notices" /></template>
-  <template #actions="{ row }"><RowActions :actions="actions(row as CapacityInquiry, busy)" text-actions @action="emit('action', $event, row as CapacityInquiry)" /></template>
+  <template #actions="{ row }"><RowActions :max-visible="1" :actions="actions(row as CapacityInquiry, busy)" text-actions @action="emit('action', $event, row as CapacityInquiry)" /></template>
   <template #status="{ row }"><strong>{{ row.progress.label }} · {{ row.progress.reservation }}</strong><div>下一步：{{ row.progress.owner }}</div><small class="inquiry-reason">{{ row.progress.message }}</small></template>
   <template #cargo="{ row }">{{ row.cargo.packageCount ?? '—' }} 箱 · {{ row.expectedPalletCount ?? '—' }} 实托 · {{ row.cargo.palletSpaces ?? '—' }} 托位 · {{ row.cargo.weightKg ?? '—' }} kg · {{ row.cargo.volumeCbm ?? '—' }} m³</template>
   <template #amount="{ row }">{{ row.agreedAmount == null ? '待报价' : `${Number(row.agreedAmount).toFixed(2)} ${row.cargo.currency || ''}` }}</template>
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
index 86693fd9..ce36d55e 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
@@ -1,6 +1,9 @@
+import { ElTable, ElTableColumn } from 'element-plus/es/components/table/index'
+import { ElInputNumber } from 'element-plus/es/components/input-number/index'
+import { ElInput } from 'element-plus/es/components/input/index'
 import { createPinia } from 'pinia'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
+import { mount as mountFull, shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
 import TripBookingFulfillmentDialog from './TripBookingFulfillmentDialog.vue'
 import * as api from '../api/tripBookings'
 import type { FleetTrip } from '../tripTypes'
@@ -73,3 +76,40 @@ it.each([
   expect(api.acceptTripIncoming).not.toHaveBeenCalled()
   expect(api.bindTripBookingDispatch).not.toHaveBeenCalled()
 })
+
+it('anchors receipt control sizing inside the real DataTable slot and disables cell ellipsis', async () => {
+  const wrapper = mountFull(TripBookingFulfillmentDialog, {
+    props: { modelValue: true, trip, booking, mode: 'receipt' },
+    global: { plugins: [createPinia()], components: { ElTable, ElTableColumn, ElInputNumber, ElInput }, directives: { loading: () => undefined }, stubs: {
+      ElForm: { template: '<div><slot/></div>' }, ElFormItem: { template: '<div><slot/></div>' }, ElButton: { template: '<button><slot/></button>' },
+      AppDialog: { template: '<div><slot/></div>' }, LoadErrorState: true, ApiErrorMeta: true,
+    } },
+  })
+  wrappers.push(wrapper); await flushPromises()
+  const control = wrapper.get('.el-table__body .receipt-spaces-control')
+  const scope = control.element.getAttributeNames().find(name => name.startsWith('data-v-'))
+  expect(scope).toBeDefined()
+  expect(control.find('.el-input-number').exists()).toBe(true)
+  expect(control.element.closest('td')?.classList.contains('data-table__single-line-cell')).toBe(false)
+  expect(control.element.closest('.cell')?.classList.contains('el-tooltip')).toBe(false)
+  // DataTable forwards classes to its inner table, which does not carry this SFC's scope.
+  expect(wrapper.find(`.receipt-pallet-table[${scope}]`).exists()).toBe(false)
+  const input = control.get('input')
+  await input.setValue('2'); await input.trigger('change'); await flushPromises()
+  expect(wrapper.text()).toContain('2 托位')
+})
+
+it('compares real receipt with the forecast, preserves unknown values, and does not invent historical forecasts', async () => {
+  const wrapper = mount('receipt'); await flushPromises()
+  const rows = () => wrapper.get('[aria-label="预报与实收对照"]').findAll('tbody tr').map(row => row.findAll('td').map(cell => cell.text()))
+  expect(rows()).toEqual([
+    ['箱数', '20', '22', '+2'], ['实托数', '—', '1', '—'], ['标准托位（待核对）', '2', '1', '-1'],
+    ['重量（kg）', '100', '150', '+50'], ['体积（m³）', '1', '1.5', '+0.5'],
+  ])
+  await wrapper.setProps({ booking: { ...booking, status: 'RECEIVED' } })
+  expect(rows().every(row => row[1] === '—' && row[3] === '—')).toBe(true)
+  expect(wrapper.text()).toContain('无法还原原始预报')
+  await wrapper.setProps({ mode: 'view' }); await flushPromises()
+  expect(wrapper.find('[aria-label="预报与实收对照"]').exists()).toBe(false)
+  expect(api.acceptTripIncoming).not.toHaveBeenCalled()
+})
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
index 036e9220..4565dd3d 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
@@ -27,6 +27,22 @@ const ready = computed(() => preview.value?.incoming && ['WAIT_CUSTOMER_CONFIRMA
 const totalSpaces = computed(() => Object.values(spaces).reduce((a,b) => a + (b || 0), 0))
 const amount = computed(() => unitPrice.value == null ? null : Math.round(unitPrice.value * (props.booking?.cargo.priceBasis === 'ORDER' ? 1 : totalSpaces.value) * 100) / 100)
 const statuses: Record<string,string> = { WAIT_PDA_RECEIVING: '等待仓库收货', RECEIVING: '仓库收货中', WAIT_CUSTOMER_CONFIRMATION: '实收完成，待确认', READY_FOR_DISPATCH: '已确认实收，可安排排车', OUTBOUNDED: '已出库' }
+const receiptComparison = computed(() => {
+  const incoming = preview.value?.incoming
+  const pallets = incoming?.pallets || []
+  const forecast = props.booking?.status === 'CONFIRMED' ? props.booking.cargo : null
+  const sum = (key: 'weightKg' | 'volumeCbm') => pallets.length && pallets.every(row => row[key] != null && Number.isFinite(row[key]))
+    ? pallets.reduce((total, row) => total + row[key]!, 0) : null
+  const values = [
+    { label: '箱数', expected: forecast?.packageCount, actual: incoming?.receivedPackages },
+    { label: '实托数', expected: forecast ? props.booking?.expectedPalletCount : null, actual: pallets.length ? pallets.length : null },
+    { label: '标准托位（待核对）', expected: forecast?.palletSpaces, actual: pallets.length ? totalSpaces.value : null },
+    { label: '重量（kg）', expected: forecast?.weightKg, actual: sum('weightKg') },
+    { label: '体积（m³）', expected: forecast?.volumeCbm, actual: sum('volumeCbm') },
+  ]
+  return values.map(row => ({ ...row, difference: row.expected == null || row.actual == null ? null : Number((row.actual - row.expected).toFixed(3)) }))
+})
+const quantityText = (value: number | null | undefined) => value == null ? '—' : String(Number(value.toFixed(3)))
 const incomingStatusLabel = computed(() => {
   const status = preview.value?.incoming?.status
   if (status === 'READY_FOR_DISPATCH' && props.booking?.status === 'BOUND') return '已确认实收，已排入本车'
@@ -34,7 +50,7 @@ const incomingStatusLabel = computed(() => {
 })
 const columns = computed<DataTableColumn[]>(() => [{ key: 'palletNo', prop: 'palletNo', label: '实收托盘', minWidth: 180 }, { key: 'packages', prop: 'packages', label: '箱数', width: 95 },
   { key: 'weightKg', prop: 'weightKg', label: '实测重量（kg）', minWidth: 150 }, { key: 'volumeCbm', prop: 'volumeCbm', label: '实测体积（m³）', minWidth: 150 },
-  ...(props.mode === 'receipt' ? [{ key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 170, singleLine: false }] : [])])
+  ...(props.mode === 'receipt' ? [{ key: 'spaces', label: '占用标准托位', slotName: 'spaces', width: 180, singleLine: false, showOverflowTooltip: false }] : [])])
 async function load() {
   if (!props.booking) return
   const current = generation; loading.value = true; error.value = null
@@ -100,7 +116,14 @@ onBeforeUnmount(() => { generation++ })
       </el-form>
       <template v-if="mode === 'receipt' || mode === 'view'">
         <el-button :loading="loading" :disabled="busy || !!pending" @click="load">刷新收货进度</el-button><p>来货单：{{ preview?.incoming?.incomingNo || '—' }} · {{ incomingStatusLabel }}</p>
-        <DataTable class="receipt-pallet-table" :data="preview?.incoming?.pallets || []" :columns="columns" row-key="warehousePalletId" empty-text="仓库尚未完成实际打托"><template #spaces="{ row }"><el-input-number v-model="spaces[row.warehousePalletId]" :min="1" :precision="0" :disabled="busy || !!pending" placeholder="实际占用托位" /></template></DataTable>
+        <DataTable class="receipt-pallet-table" :data="preview?.incoming?.pallets || []" :columns="columns" row-key="warehousePalletId" empty-text="仓库尚未完成实际打托"><template #spaces="{ row }"><div class="receipt-spaces-control"><el-input-number v-model="spaces[row.warehousePalletId]" :min="1" :precision="0" :disabled="busy || !!pending" placeholder="实际占用托位" /></div></template></DataTable>
+        <section v-if="mode === 'receipt'" aria-label="预报与实收对照">
+          <p>预报与实收对照；差异仅供核对，容量与费用仍需确认。</p>
+          <p v-if="booking.status !== 'CONFIRMED'">本票已核量，当前记录无法还原原始预报，预报及差异显示“—”。</p>
+          <table class="density-table"><thead><tr><th>项目</th><th>承运预报</th><th>当前实收 / 核对值</th><th>差异（实收减预报）</th></tr></thead>
+            <tbody><tr v-for="item in receiptComparison" :key="item.label"><td>{{ item.label }}</td><td>{{ quantityText(item.expected) }}</td><td>{{ quantityText(item.actual) }}</td><td>{{ item.difference == null ? '—' : item.difference > 0 ? `+${quantityText(item.difference)}` : quantityText(item.difference) }}</td></tr></tbody>
+          </table>
+        </section>
         <el-form v-if="mode === 'receipt'" label-position="top" class="density-form incoming-form" :disabled="busy || !!pending"><el-form-item :label="booking.cargo.priceBasis === 'ORDER' ? '确认整单价格' : '确认每托位价格'"><el-input-number v-model="unitPrice" :min="0" :precision="2" placeholder="核对约定价格" /></el-form-item></el-form>
         <p v-if="mode === 'receipt'">原约定 {{ booking.agreedAmount?.toFixed(2) }} {{ booking.cargo.currency }}；本次实收 {{ preview?.incoming?.receivedPackages || 0 }} 箱、{{ totalSpaces }} 托位，确认金额 {{ amount?.toFixed(2) || '—' }} {{ booking.cargo.currency }}。转派送时按本次确认报价登记应收。</p>
       </template>
@@ -108,4 +131,4 @@ onBeforeUnmount(() => { generation++ })
     </div>
   </AppDialog>
 </template>
-<style scoped>.incoming-form{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.incoming-form :deep(.el-date-editor),.incoming-form :deep(.el-input-number){width:100%}.receipt-pallet-table :deep(.el-input-number){width:100%;min-width:0;max-width:100%}</style>
+<style scoped>.incoming-form{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.incoming-form :deep(.el-date-editor),.incoming-form :deep(.el-input-number){width:100%}.receipt-spaces-control{display:flex;width:100%;min-width:0}.receipt-spaces-control :deep(.el-input-number){width:100%;min-width:0;max-width:100%}</style>
diff --git a/src/modules/overseas-master-data/components/TripBookingPanel.test.ts b/src/modules/overseas-master-data/components/TripBookingPanel.test.ts
index 14df5257..41737b27 100644
--- a/src/modules/overseas-master-data/components/TripBookingPanel.test.ts
+++ b/src/modules/overseas-master-data/components/TripBookingPanel.test.ts
@@ -1,3 +1,5 @@
+import { ElInputNumber } from 'element-plus/es/components/input-number/index'
+import { ElInput } from 'element-plus/es/components/input/index'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
 import TripBookingPanel from './TripBookingPanel.vue'
@@ -45,7 +47,6 @@ it('confirms using both current versions and updates the parent version without
   expect(wrapper.findAll('button').some(node => node.text() === '确认承运')).toBe(false)
 })
 it('reopens saved negotiated price in a fresh numeric control while retaining its separate quote source', async () => {
-  const { ElInputNumber, ElInput } = await vi.importActual<typeof import('element-plus')>('element-plus')
   const initial = { ...row, cargo: { ...row.cargo, unitPrice: 16 }, quoteSource: { ...source, quotedUnitPrice: 16 } }
   const saved = { ...initial, cargo: { ...initial.cargo, unitPrice: 9 }, agreedAmount: 18, recordVersion: 1 }
   vi.mocked(api.listTripBookings).mockResolvedValue({ tripRecordVersion: 4, records: [initial] })
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index 6cbbb897..efbc586b 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -1,3 +1,4 @@
+import CapacityInquiryTable from '../components/CapacityInquiryTable.vue'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
 import { createPinia } from 'pinia'
@@ -223,3 +224,37 @@ it('highlights only the allowed current step and keeps other actions secondary',
   await wrapper.setProps({ inquiry: { ...inquiry, progress: { ...inquiry.progress, primaryAction: 'INCOMING' } } })
   expect(section.findAll('button').filter(item => !item.element.closest('details')).map(item => item.text())).toEqual(['安排来货'])
 })
+
+it('shows the selected destination capacity when confirming and never treats unknown capacity as zero', async () => {
+  state.manage = true
+  const knownOffer = { ...offer, capacityKnown: true, destinations: [
+    { ...offer.destinations[0]!, remaining: { palletSpaces: 0, weightKg: 12, volumeCbm: 3 } },
+    { destinationKey: 'FBA:ACY2', name: 'ACY2', deliveryIndex: 2, remaining: { palletSpaces: 7, weightKg: 800, volumeCbm: 20 } },
+  ] }
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer: knownOffer, inquiry, readonly: false, confirmMode: true })
+  await flushPromises()
+  expect(wrapper.get('[aria-label="本目的站可接余位"]').text()).toContain('0 托位 · 12 kg · 3 m³')
+  wrapper.findAllComponents({ name: 'ElSelect' })[1]!.vm.$emit('update:modelValue', 'FBA:ACY2'); await flushPromises()
+  expect(wrapper.get('[aria-label="本目的站可接余位"]').text()).toContain('7 托位 · 800 kg · 20 m³')
+  await wrapper.setProps({ offer: { ...knownOffer, capacityKnown: false } })
+  expect(wrapper.get('[aria-label="本目的站可接余位"]').text()).toContain('待调度核对')
+  expect(wrapper.get('[aria-label="本目的站可接余位"]').text()).not.toContain('800')
+  expect(api.saveAndConfirmInquiry).not.toHaveBeenCalled()
+})
+it('prioritizes the allowed current list action and keeps other actions in the overflow menu', async () => {
+  state.manage = true
+  const wrapper = shallowMount(CapacityInquiryTable, { props: { rows: [inquiry], total: 1, loading: false }, global: { directives: { loading: () => undefined }, stubs: {
+    DataTable: { props: ['data'], template: '<div><slot name="actions" :row="data[0]"/></div>' },
+    RowActions: { name: 'RowActions', props: ['actions', 'maxVisible'], template: '<div/>' },
+  } } })
+  wrappers.push(wrapper)
+  const actions = () => wrapper.findComponent({ name: 'RowActions' }).props('actions') as { key: string; visible?: boolean; priority?: number }[]
+  const primary = () => actions().filter(item => item.visible !== false).sort((a,b) => (b.priority || 0) - (a.priority || 0))[0]?.key
+  expect(wrapper.findComponent({ name: 'RowActions' }).props('maxVisible')).toBe(1)
+  expect(primary()).toBe('edit')
+  await wrapper.setProps({ rows: [{ ...inquiry, progress: { ...inquiry.progress, primaryAction: 'INCOMING' }, actions: { ...inquiry.actions, canEdit: false, canConfirm: false } }] })
+  expect(primary()).toBe('view')
+  state.links.add('platform:fleet:trip:booking-edit')
+  await wrapper.setProps({ rows: [{ ...inquiry, progress: { ...inquiry.progress, primaryAction: 'INCOMING' } }] })
+  expect(primary()).toBe('incoming')
+})

From 240aa5d6d06a24aeb6701af595c7402d8692b75b Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 13:27:39 +0800
Subject: [PATCH 42/47] fix: require appointment cancellation reason and expose
 history

---
 .../AppointmentCalendarView.test.ts           | 37 ++++++++++++-
 .../AppointmentCalendarView.vue               | 49 +++++++++--------
 .../AppointmentCancellation.test.ts           | 53 +++++++++++++++++++
 .../AppointmentCancellationApi.test.ts        | 17 ++++++
 .../AppointmentCancellationDialog.vue         | 49 +++++++++++++++++
 .../AppointmentCancellationHistory.vue        | 32 +++++++++++
 .../AppointmentCancellationRecords.vue        | 35 ++++++++++++
 src/modules/appointment-calendar/api.ts       | 26 ++++++++-
 8 files changed, 272 insertions(+), 26 deletions(-)
 create mode 100644 src/modules/appointment-calendar/AppointmentCancellation.test.ts
 create mode 100644 src/modules/appointment-calendar/AppointmentCancellationApi.test.ts
 create mode 100644 src/modules/appointment-calendar/AppointmentCancellationDialog.vue
 create mode 100644 src/modules/appointment-calendar/AppointmentCancellationHistory.vue
 create mode 100644 src/modules/appointment-calendar/AppointmentCancellationRecords.vue

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index b03f0205..5740c46c 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -31,6 +31,9 @@ const candidates = [
 ]
 function render(openCalendar = true) {
   const wrapper = mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
+    AppointmentCancellationDialog: {name:'AppointmentCancellationDialog',template:'<div>取消弹窗</div>'},
+    AppointmentCancellationHistory: {name:'AppointmentCancellationHistory',template:'<div>取消历史详情</div>'},
+    AppointmentCancellationRecords: {name:'AppointmentCancellationRecords',template:'<button data-history-view @click="$emit(\'view\',\'AP-CANCEL\')">查看取消记录</button>'},
     AdminPage: { template: '<main><slot /></main>' },
     AppointmentContainerPanel: { name: 'AppointmentContainerPanel', setup() {
       const register = inject<(guard: () => boolean) => () => void>('appointment-register-leave-guard')!
@@ -67,6 +70,38 @@ describe('appointment calendar data integration', () => {
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
+  it('loads cancellation records only after expansion and opens cancelled appointments read-only', async () => {
+    const record = { version: 1, id: '1', appointmentNo: 'AP-CANCEL', originWarehouseId: '100', appointmentStatus: 'CANCELLED', selectedCount: 1, fbaWarehouseCode: 'ABE3', items: [] }
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper=render();await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentCancellationRecords'}).exists()).toBe(false)
+    const records=wrapper.findAll('details').find(d=>d.find('summary').text()==='取消记录')!
+    ;(records.element as HTMLDetailsElement).open=true;await records.trigger('toggle')
+    await wrapper.get('[data-history-view]').trigger('click');await flushPromises()
+    expect(getFbaAppointment).toHaveBeenCalledWith('AP-CANCEL')
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    expect(wrapper.findComponent({name:'FbaAppointmentFields'}).props('disabled')).toBe(true)
+    expect(wrapper.findComponent({name:'AppointmentCancellationHistory'}).exists()).toBe(false)
+    const history=wrapper.findAll('details').find(d=>d.find('summary').text()==='取消历史')!
+    ;(history.element as HTMLDetailsElement).open=true;await history.trigger('toggle')
+    expect(wrapper.findComponent({name:'AppointmentCancellationHistory'}).exists()).toBe(true)
+    wrapper.findAllComponents({name:'AppDialog'}).at(-1)!.vm.$emit('confirm');await flushPromises()
+    expect(updateFbaAppointment).not.toHaveBeenCalled();wrapper.unmount()
+  })
+
+  it('refreshes an expanded cancellation list after a successful cancellation', async () => {
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([{version:0,id:'1',appointmentNo:'AP-CANCEL',originWarehouseId:'100',appointmentStatus:'PENDING',selectedCount:1,fbaWarehouseCode:'ABE3',items:[],plannedDate:'2026-10-15'}])
+    const wrapper=render();await flushPromises()
+    const records=wrapper.findAll('details').find(d=>d.find('summary').text()==='取消记录')!
+    ;(records.element as HTMLDetailsElement).open=true;await records.trigger('toggle')
+    const previous=wrapper.getComponent({name:'AppointmentCancellationRecords'}).vm
+    wrapper.getComponent({name:'AppointmentCalendarPanel'}).vm.$emit('delete',{key:'AP-CANCEL'});await flushPromises()
+    wrapper.getComponent({name:'AppointmentCancellationDialog'}).vm.$emit('cancelled');await flushPromises()
+    expect(wrapper.getComponent({name:'AppointmentCancellationRecords'}).vm).not.toBe(previous)
+    expect(wrapper.findComponent({name:'AppointmentCancellationDialog'}).exists()).toBe(false)
+    wrapper.unmount()
+  })
+
   it('keeps the container view mounted while a child has an unresolved command', async () => {
     const wrapper = render(); await flushPromises()
     const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
@@ -150,7 +185,7 @@ describe('appointment calendar data integration', () => {
     vi.mocked(listTripCalendar).mockResolvedValueOnce({records:[],unresolvedRecords:[{sourceType:'TRIP_PLAN',tripNo:'TR-UNKNOWN',status:'PLANNED',originWarehouseId:null,originWarehouseCode:null,originWarehouseName:null,originCountryCode:null,originTimezone:null,originWarehouseStatus:null,plannedDepartureAt:'2026-10-10T12:00:00Z',expectedDriverEndAt:null,departedAt:null,completedAt:null,stops:[],incompleteReasons:['ORIGIN_WAREHOUSE_UNKNOWN']}]})
     const wrapper=render();await flushPromises()
     expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('events')).toEqual([])
-    expect(wrapper.find('.appointment-extra').exists()).toBe(false)
+    expect(wrapper.findAll('.appointment-extra summary').map(node => node.text())).not.toContain('待核实地点的车次（1）')
     expect(wrapper.text()).not.toContain('原计划时间保留 UTC')
     await wrapper.findAll('button').find(button => button.text() === '查看待核实车次（1）')!.trigger('click')
     expect(wrapper.text()).toContain('原计划时间保留 UTC')
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index fbfeb373..b1015197 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -4,7 +4,7 @@ import { computed, provide, onBeforeUnmount, onMounted, reactive, ref, watch } f
 import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
 import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource, type PlanningSource } from './planningApi'
 import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
@@ -21,12 +21,18 @@ import {
 import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
 import AppointmentCalendarPanel, { type CalendarEvent } from './AppointmentCalendarPanel.vue'
 import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
+import AppointmentCancellationDialog from './AppointmentCancellationDialog.vue'
+import AppointmentCancellationHistory from './AppointmentCancellationHistory.vue'
+import AppointmentCancellationRecords from './AppointmentCancellationRecords.vue'
 import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
 import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
 import { calendarRange, dateKey } from './calendar'
-import { deleteAppointment, listArrivalCalendar, listPickupCalendar, type ArrivalCalendarEntry, type PickupCalendarEntry } from './api'
+import { listArrivalCalendar, listPickupCalendar, type ArrivalCalendarEntry, type PickupCalendarEntry } from './api'
 import { listTripCalendar, projectTripCalendar, tripIssues, type TripCalendarEntry } from './tripCalendar'
 
+const cancellationTarget = ref<FbaAppointmentDto | null>(null)
+const cancellationsOpen = ref(false), cancellationsRevision = ref(0), cancellationHistoryOpen = ref(false), forceReadOnly = ref(false)
+const appointmentReadOnly = computed(() => forceReadOnly.value || editing.value?.appointmentStatus === 'CANCELLED' || !access.can(permission.inboundOrderAppointment))
 const access = useAccessPreviewStore()
 const route = useRoute()
 const router = useRouter()
@@ -221,6 +227,7 @@ onBeforeRouteLeave(canLeave)
 onBeforeRouteUpdate(canLeave)
 function openCreate(date: string) {
   if (!access.can(permission.inboundOrderAppointment) || !canLeave()) return
+  forceReadOnly.value = false; cancellationHistoryOpen.value = false
   ++candidateRequest
   ++detailRequest
   detailLoading.value = false
@@ -241,13 +248,13 @@ function openCreate(date: string) {
   void searchWarehouses('')
 }
 
-async function openEdit(event: Pick<CalendarEvent, 'key'>) {
+async function openEdit(event: Pick<CalendarEvent, 'key'>, readOnly = false) {
   if (!canLeave()) return
+  forceReadOnly.value = readOnly; cancellationHistoryOpen.value = false
   const request = ++detailRequest
   dialogError.value = null
   editing.value = [...appointments.value, ...unscheduled.value].find(item => item.appointmentNo === event.key) || null
   pendingSave.value = null
-  if (!editing.value) return
   dialogOpen.value = true
   detailLoading.value = true
   detailReady.value = false
@@ -312,7 +319,7 @@ async function loadCandidates() {
 }
 
 async function save() {
-  if (!access.can(permission.inboundOrderAppointment) || saving.value || detailLoading.value || !detailReady.value) return
+  if (appointmentReadOnly.value || saving.value || detailLoading.value || !detailReady.value) return
   const validation = appointmentFormError(form)
   if (!pendingSave.value && validation) { ElMessage.warning(validation); return }
   if (!editing.value) {
@@ -343,23 +350,16 @@ function selectCandidates(rows: object[]) {
   selected.value = rows as InboundOrderSummaryDto[]
 }
 
-async function remove(event: CalendarEvent) {
-  const appointment = appointments.value.find(item => item.appointmentNo === event.key)
-  if (!appointment || loading.value) return
-  try {
-    await ElMessageBox.confirm(`确认取消预约 ${appointment.appointmentNo}？将释放全部 ${appointment.selectedCount} 票货物的占用，历史仍保留。`, '取消预约',
-      { type: 'warning', confirmButtonText: '确认取消预约', cancelButtonText: '返回', customClass: 'admin-density-confirm' })
-  } catch { return }
-  loading.value = true
-  try {
-    await deleteAppointment(appointment.appointmentNo, appointment.version)
-    ElMessage.success('预约已取消，历史仍保留')
-    await load()
-  } catch (error) {
-    errorTitle.value = '预约取消失败'
-    loadError.value = getApiErrorDetails(error, '预约取消失败')
-  } finally { loading.value = false }
+function remove(event: CalendarEvent) {
+  if (!access.can('platform:appointment:delete') || loading.value || !canLeave()) return
+  cancellationTarget.value = appointments.value.find(item => item.appointmentNo === event.key) || null
 }
+async function cancelled() {
+  cancellationTarget.value = null; ++cancellationsRevision.value
+  ElMessage.success('预约已取消，可在取消记录中查看原因与原记录')
+  await Promise.all([load(),loadUnscheduled()])
+}
+
 
 watch(dialogOpen, open => {
   if (!open) { ++candidateRequest; ++detailRequest; ++warehouseRequest; candidateLoading.value = false; warehouseLoading.value = false; detailLoading.value = false; detailReady.value = false }
@@ -412,6 +412,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
+    <details class="appointment-extra" @toggle="cancellationsOpen = ($event.target as HTMLDetailsElement).open"><summary>取消记录</summary><AppointmentCancellationRecords v-if="cancellationsOpen" :key="cancellationsRevision" @view="openEdit({key: $event}, true)" /></details>
     <AppointmentCalendarPanel :notices="[pickupNotice, showTripLayer ? tripNotice : ''].filter(Boolean)" :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource">
       <template #notice-actions><el-button v-if="showTripLayer && unresolvedTrips.length" link type="primary" @click="unresolvedDialogOpen = true">查看待核实车次（{{ unresolvedTrips.length }}）</el-button></template>
     </AppointmentCalendarPanel>
@@ -423,7 +424,8 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         <template #issues="{ row }">{{ tripIssues(row as TripCalendarEntry) }}</template>
       </DataTable>
     </AppDialog>
-    <AppDialog :model-value="dialogOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :show-confirm="access.can(permission.inboundOrderAppointment)" class="admin-density-dialog" :title="editing ? (access.can(permission.inboundOrderAppointment) ? '编辑预约' : '查看预约') : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
+    <AppointmentCancellationDialog v-if="cancellationTarget" :appointment-no="cancellationTarget.appointmentNo" :version="cancellationTarget.version" :selected-count="cancellationTarget.selectedCount" @close="cancellationTarget = null" @cancelled="cancelled" />
+    <AppDialog :model-value="dialogOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :show-confirm="!appointmentReadOnly" class="admin-density-dialog" :title="appointmentReadOnly ? '查看预约' : editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
       <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
       <div v-loading="detailLoading">
         <el-form label-position="top" class="calendar-form density-form">
@@ -436,7 +438,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         </el-form>
         <LoadErrorState v-if="!editing && warehouseError" title="仓库加载失败" :message="warehouseError.message" @retry="searchWarehouses(warehouseKeyword)" />
         <p v-if="!editing && warehouseTotal > warehouseOptions.length && !warehouseError" class="appointment-hint">输入更完整的仓库编码或名称，缩小搜索范围。</p>
-        <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="!access.can(permission.inboundOrderAppointment) || saving || !!pendingSave" />
+        <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="appointmentReadOnly || saving || !!pendingSave" />
         <template v-if="!editing && warehouse">
           <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
             <template #customer="{ row }">{{ row.customerName?.trim() || '客户名称缺失' }}</template>
@@ -448,6 +450,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         <div v-else class="appointment-cargo">
           <span>{{ editing.selectedCount }} 票货物</span>
           <AppointmentInboundCodes :key="editing.appointmentNo" :codes="editing.items.map(item => item.inboundCode)" />
+          <details :key="`cancellations-${editing.appointmentNo}`" @toggle="cancellationHistoryOpen = ($event.target as HTMLDetailsElement).open"><summary>取消历史</summary><AppointmentCancellationHistory v-if="cancellationHistoryOpen" :key="editing.appointmentNo" :appointment-no="editing.appointmentNo" /></details>
         </div>
       </div>
     </AppDialog>
diff --git a/src/modules/appointment-calendar/AppointmentCancellation.test.ts b/src/modules/appointment-calendar/AppointmentCancellation.test.ts
new file mode 100644
index 00000000..d5f6f892
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCancellation.test.ts
@@ -0,0 +1,53 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import ElementPlus from 'element-plus'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCancellationDialog from './AppointmentCancellationDialog.vue'
+import AppointmentCancellationHistory from './AppointmentCancellationHistory.vue'
+import AppointmentCancellationRecords from './AppointmentCancellationRecords.vue'
+import { deleteAppointment, listAppointmentCancellations, listAppointmentCancellationRecords } from './api'
+const access = vi.hoisted(() => ({ canCancel: true }))
+vi.mock('@/core/access/accessPreview', () => ({useAccessPreviewStore: () => ({can: () => access.canCancel})}))
+vi.mock('vue-router', () => ({onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn()}))
+vi.mock('./api', () => ({deleteAppointment: vi.fn(),listAppointmentCancellations: vi.fn(),listAppointmentCancellationRecords: vi.fn()}))
+const record = {appointmentNo:'AP-CANCEL',version:1,cancelReason:null,cancelledAt:'2026-10-11T01:00:00',snapshot:{fbaWarehouseCode:'ABE3',appointmentStatus:'CANCELLED',appointmentRemark:'原备注保留',plannedDate:null,plannedAt:null,plannedEndAt:null,confirmationNo:'EXT-1',appointmentAt:'2026-10-15T09:00:00',appointmentEndAt:null,timezone:'America/New_York',selectedCount:1}}
+function dialog() {
+  return mount(AppointmentCancellationDialog,{props:{appointmentNo:'AP-CANCEL',version:0,selectedCount:1},global:{plugins:[ElementPlus],stubs:{AppDialog:{name:'AppDialog',props:['beforeClose','showConfirm'],template:'<section><slot/><button v-if="showConfirm" data-save @click="$emit(\'confirm\')">取消</button></section>'}}}})
+}
+describe('appointment cancellation',()=>{
+  beforeEach(()=>{vi.resetAllMocks();access.canCancel=true})
+  it('requires a reason and retries the same reason and version after an unknown result',async()=>{
+    vi.mocked(deleteAppointment).mockRejectedValueOnce(new Error('lost')).mockResolvedValueOnce(undefined)
+    const wrapper=dialog();await flushPromises()
+    await wrapper.get('[data-save]').trigger('click');expect(deleteAppointment).not.toHaveBeenCalled()
+    await wrapper.get('textarea').setValue('  仓库取消时段  ')
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    expect(deleteAppointment).toHaveBeenCalledWith('AP-CANCEL',0,'仓库取消时段')
+    const done=vi.fn();wrapper.getComponent({name:'AppDialog'}).props('beforeClose')(done);expect(done).not.toHaveBeenCalled()
+    expect(wrapper.get('textarea').attributes('disabled')).toBeDefined()
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    expect(deleteAppointment).toHaveBeenNthCalledWith(2,'AP-CANCEL',0,'仓库取消时段')
+    expect(wrapper.emitted('cancelled')).toHaveLength(1);wrapper.unmount()
+  })
+  it('does not expose or invoke cancellation without its independent permission',async()=>{
+    access.canCancel=false;const wrapper=dialog();await flushPromises()
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    wrapper.getComponent({name:'AppDialog'}).vm.$emit('confirm');await flushPromises()
+    expect(deleteAppointment).not.toHaveBeenCalled();wrapper.unmount()
+  })
+  it('reads history once per page and keeps missing historical reason explicit',async()=>{
+    vi.mocked(listAppointmentCancellations).mockResolvedValue({records:[record],total:11})
+    const wrapper=mount(AppointmentCancellationHistory,{props:{appointmentNo:'AP-CANCEL'},global:{plugins:[ElementPlus]}});await flushPromises()
+    expect(listAppointmentCancellations).toHaveBeenCalledExactlyOnceWith('AP-CANCEL',1,10)
+    expect(wrapper.text()).toContain('历史原因未记录');expect(wrapper.text()).toContain('原备注保留')
+    wrapper.getComponent({name:'DataTable'}).vm.$emit('update:page',2);await flushPromises()
+    expect(listAppointmentCancellations).toHaveBeenLastCalledWith('AP-CANCEL',2,10);wrapper.unmount()
+  })
+  it('discovers persisted cancellations with one server page and opens by business number',async()=>{
+    vi.mocked(listAppointmentCancellationRecords).mockResolvedValue({records:[{appointmentNo:'AP-CANCEL',version:1,cancelReason:'实际原因',cancelledAt:record.cancelledAt,fbaWarehouseCode:'ABE3',selectedCount:1}],total:1})
+    const wrapper=mount(AppointmentCancellationRecords,{global:{plugins:[ElementPlus]}});await flushPromises()
+    expect(listAppointmentCancellationRecords).toHaveBeenCalledExactlyOnceWith(1,10)
+    expect(listAppointmentCancellations).not.toHaveBeenCalled()
+    await wrapper.get('.el-table__body-wrapper .el-table__row').findAll('button').find(b=>b.text()==='查看')!.trigger('click')
+    expect(wrapper.emitted('view')).toEqual([['AP-CANCEL']]);wrapper.unmount()
+  })
+})
diff --git a/src/modules/appointment-calendar/AppointmentCancellationApi.test.ts b/src/modules/appointment-calendar/AppointmentCancellationApi.test.ts
new file mode 100644
index 00000000..61266631
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCancellationApi.test.ts
@@ -0,0 +1,17 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import { http } from '@/shared/api/http'
+import { deleteAppointment, listAppointmentCancellations, listAppointmentCancellationRecords } from './api'
+vi.mock('@/shared/api/http',()=>({http:{get:vi.fn(),delete:vi.fn()},unwrapApiResponse:(result:{data:unknown})=>result.data}))
+beforeEach(()=>vi.resetAllMocks())
+it('sends the required cancellation body without the old reasonless query shape',async()=>{
+  vi.mocked(http.delete).mockResolvedValue({data:undefined})
+  await deleteAppointment('AP-TEST',3,'仓库取消时段')
+  expect(http.delete).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/inbound-plans/fba-appointments/AP-TEST',{data:{version:3,cancelReason:'仓库取消时段'}})
+})
+it('uses paged cancellation reads and the original business number for detail history',async()=>{
+  vi.mocked(http.get).mockResolvedValue({data:{records:[],total:'12'}})
+  expect((await listAppointmentCancellationRecords(2,10)).total).toBe(12)
+  expect(http.get).toHaveBeenLastCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/cancellations',{params:{page:2,size:10}})
+  await listAppointmentCancellations('AP/TEST',1,10)
+  expect(http.get).toHaveBeenLastCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/AP%2FTEST/cancellations',{params:{page:1,size:10}})
+})
diff --git a/src/modules/appointment-calendar/AppointmentCancellationDialog.vue b/src/modules/appointment-calendar/AppointmentCancellationDialog.vue
new file mode 100644
index 00000000..06a6153a
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCancellationDialog.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import { inject, onBeforeUnmount, ref } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { deleteAppointment } from './api'
+const props = defineProps<{ appointmentNo: string; version: number; selectedCount: number }>()
+const emit = defineEmits<{ close: []; cancelled: [] }>()
+const access = useAccessPreviewStore()
+const reason = ref(''), saving = ref(false), error = ref<ApiErrorDetails | null>(null)
+const pending = ref<{number: string; version: number; reason: string} | null>(null)
+function canLeave() {
+  if (saving.value || pending.value) { ElMessage.warning('请先核实本次取消结果，再关闭或切换'); return false }
+  return true
+}
+function beforeClose(done: () => void) { if (canLeave()) done() }
+function close() { if (canLeave()) emit('close') }
+const register = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregister = register?.(canLeave)
+onBeforeUnmount(() => unregister?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
+async function save() {
+  if (!access.can('platform:appointment:delete') || saving.value) return
+  if (!pending.value && !reason.value.trim()) { ElMessage.warning('请填写实际取消原因'); return }
+  pending.value ||= {number: props.appointmentNo, version: props.version, reason: reason.value.trim()}
+  saving.value = true; error.value = null
+  try {
+    await deleteAppointment(pending.value.number, pending.value.version, pending.value.reason)
+    pending.value = null; emit('cancelled')
+  } catch (cause) {
+    error.value = getApiErrorDetails(cause, '取消结果待核实，请重试本次取消')
+    if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null
+  } finally { saving.value = false }
+}
+</script>
+<template>
+  <AppDialog :model-value="true" title="取消预约" width="min(600px, calc(100vw - 48px))" class="admin-density-dialog" confirm-type="danger" :confirm-text="pending ? '重试本次取消' : '确认取消预约'" :show-confirm="access.can('platform:appointment:delete')" :confirm-loading="saving" :before-close="beforeClose" @update:model-value="close" @confirm="save">
+    <p>{{ appointmentNo }} · {{ selectedCount }} 票货物</p>
+    <p>取消后释放货物占用，保留原备注、时间及取消历史；不会回退库存或取消车次。</p>
+    <LoadErrorState v-if="error" title="取消未完成" :message="error.message" :show-retry="false" />
+    <el-form label-position="top" :disabled="saving || !!pending">
+      <el-form-item label="取消原因" required><el-input v-model="reason" type="textarea" maxlength="1000" show-word-limit placeholder="请填写实际取消原因" /></el-form-item>
+    </el-form>
+  </AppDialog>
+</template>
diff --git a/src/modules/appointment-calendar/AppointmentCancellationHistory.vue b/src/modules/appointment-calendar/AppointmentCancellationHistory.vue
new file mode 100644
index 00000000..cc5c599d
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCancellationHistory.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import { onMounted, ref, onBeforeUnmount } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listAppointmentCancellations, type AppointmentCancellation } from './api'
+const props = defineProps<{ appointmentNo: string }>()
+const page = ref(1), size = ref(10), total = ref(0), rows = ref<AppointmentCancellation[]>([])
+const loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+let request = 0
+const columns: DataTableColumn[] = [
+  {prop:'cancelledAt',label:'取消时间（UTC）',slotName:'time',minWidth:170,singleLine:false},
+  {prop:'cancelReason',label:'取消原因',slotName:'reason',minWidth:220,singleLine:false},
+  {key:'snapshot',label:'取消时记录',slotName:'snapshot',minWidth:260,singleLine:false},
+]
+async function load() {
+  const current = ++request; loading.value = true; error.value = null
+  try { const result = await listAppointmentCancellations(props.appointmentNo,page.value,size.value); if(current===request) {rows.value=result.records;total.value=result.total} }
+  catch(cause) { if(current===request) error.value=getApiErrorDetails(cause,'取消历史加载失败') }
+  finally { if(current===request) loading.value=false }
+}
+onMounted(load)
+onBeforeUnmount(()=>++request)
+</script>
+<template>
+  <LoadErrorState v-if="error" title="取消历史加载失败" :message="error.message" @retry="load" />
+  <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" row-key="version" @update:page="load" @update:page-size="page=1;load()">
+    <template #time="{row}">{{ row.cancelledAt?.replace('T',' ') || '—' }}</template>
+    <template #reason="{row}">{{ row.cancelReason || '历史原因未记录' }}</template>
+    <template #snapshot="{row}"><details><summary>{{ row.snapshot.fbaWarehouseCode }} · {{ row.snapshot.selectedCount }} 票 · 查看取消时记录</summary><p>原业务备注：{{ row.snapshot.appointmentRemark || '—' }}</p><p>原计划：{{ row.snapshot.plannedAt || row.snapshot.plannedDate || '待定' }}<span v-if="row.snapshot.plannedEndAt"> — {{ row.snapshot.plannedEndAt }}</span></p><p>原确认：{{ row.snapshot.appointmentAt || '未确认' }}<span v-if="row.snapshot.appointmentEndAt"> — {{ row.snapshot.appointmentEndAt }}</span> · {{ row.snapshot.timezone || '时区待核实' }}</p><p>外部确认号：{{ row.snapshot.confirmationNo || '—' }}</p></details></template>
+  </DataTable>
+</template>
diff --git a/src/modules/appointment-calendar/AppointmentCancellationRecords.vue b/src/modules/appointment-calendar/AppointmentCancellationRecords.vue
new file mode 100644
index 00000000..385ce66a
--- /dev/null
+++ b/src/modules/appointment-calendar/AppointmentCancellationRecords.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import { onMounted, ref, onBeforeUnmount } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listAppointmentCancellationRecords, type AppointmentCancellationSummary } from './api'
+const emit = defineEmits<{ view: [appointmentNo: string] }>()
+const page=ref(1),size=ref(10),total=ref(0),rows=ref<AppointmentCancellationSummary[]>([])
+const loading=ref(false),error=ref<ApiErrorDetails|null>(null)
+let request=0
+const columns: DataTableColumn[]=[
+  {key:'actions',label:'操作',slotName:'actions',width:90,fixed:'left'},
+  {prop:'appointmentNo',label:'预约单号',minWidth:220,singleLine:false},
+  {prop:'fbaWarehouseCode',label:'目的仓',width:100},
+  {prop:'selectedCount',label:'票数',width:80},
+  {prop:'cancelledAt',label:'取消时间（UTC）',slotName:'time',minWidth:180,singleLine:false},
+  {prop:'cancelReason',label:'取消原因',slotName:'reason',minWidth:240,singleLine:false},
+]
+async function load() {
+  const current=++request;loading.value=true;error.value=null
+  try {const result=await listAppointmentCancellationRecords(page.value,size.value);if(current===request){rows.value=result.records;total.value=result.total}}
+  catch(cause){if(current===request)error.value=getApiErrorDetails(cause,'取消记录加载失败')}
+  finally{if(current===request)loading.value=false}
+}
+onMounted(load)
+onBeforeUnmount(()=>++request)
+</script>
+<template>
+  <LoadErrorState v-if="error" title="取消记录加载失败" :message="error.message" @retry="load" />
+  <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" :row-key="(row: object) => `${(row as AppointmentCancellationSummary).appointmentNo}:${(row as AppointmentCancellationSummary).version}`" @update:page="load" @update:page-size="page=1;load()">
+    <template #actions="{row}"><el-button @click="emit('view',row.appointmentNo)">查看</el-button></template>
+    <template #time="{row}">{{ row.cancelledAt?.replace('T',' ') || '—' }}</template>
+    <template #reason="{row}">{{ row.cancelReason || '历史原因未记录' }}</template>
+  </DataTable>
+</template>
diff --git a/src/modules/appointment-calendar/api.ts b/src/modules/appointment-calendar/api.ts
index fd70b7d9..d8aa7fdb 100644
--- a/src/modules/appointment-calendar/api.ts
+++ b/src/modules/appointment-calendar/api.ts
@@ -42,10 +42,32 @@ export async function listArrivalCalendar(query: { from: string; to: string }, s
   return unwrapApiResponse(response)
 }
 
-export async function deleteAppointment(appointmentNo: string, version: number) {
+export async function deleteAppointment(appointmentNo: string, version: number, cancelReason: string) {
   const response = await http.delete<ApiEnvelope<void>, ApiEnvelope<void>>(
     `/platform/v1/last-leg/inbound-plans/fba-appointments/${encodeURIComponent(appointmentNo)}`,
-    { params: { version } },
+    { data: { version, cancelReason } },
   )
   return unwrapApiResponse(response)
 }
+
+export interface AppointmentCancellation {
+  appointmentNo: string; version: number; cancelReason: string | null; cancelledAt: string
+  snapshot: { fbaWarehouseCode: string; appointmentStatus: string; appointmentRemark: string | null;
+    plannedDate: string | null; plannedAt: string | null; plannedEndAt: string | null;
+    confirmationNo: string | null; appointmentAt: string | null; appointmentEndAt: string | null;
+    timezone: string | null; selectedCount: number }
+}
+export async function listAppointmentCancellations(appointmentNo: string, page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{records: AppointmentCancellation[]; total: number}>, ApiEnvelope<{records: AppointmentCancellation[]; total: number}>>(
+    `/platform/v1/last-leg/inbound-plans/fba-appointments/${encodeURIComponent(appointmentNo)}/cancellations`, {params: {page, size}},
+  ))
+  return {...result, total: Number(result.total)}
+}
+
+export type AppointmentCancellationSummary = Omit<AppointmentCancellation, 'snapshot'> & {fbaWarehouseCode: string; selectedCount: number}
+export async function listAppointmentCancellationRecords(page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{records: AppointmentCancellationSummary[]; total: number}>, ApiEnvelope<{records: AppointmentCancellationSummary[]; total: number}>>(
+    '/platform/v1/last-leg/inbound-plans/fba-appointments/cancellations', {params: {page, size}},
+  ))
+  return {...result, total: Number(result.total)}
+}

From ee174f8265d2c2586d6769c135125ecec36a5f66 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 14:14:49 +0800
Subject: [PATCH 43/47] fix: close appointment cancellation bypass and clarify
 verified cargo

---
 .../AppointmentCalendarView.test.ts           | 12 ++++++
 .../AppointmentCalendarView.vue               |  6 +++
 .../AppointmentImpactDialog.test.ts           | 17 +++++++--
 .../AppointmentImpactDialog.vue               | 18 ++++++---
 .../capacityOfferTypes.ts                     |  1 +
 .../components/CapacityInquiryDialog.vue      | 13 ++++---
 .../components/CapacityInquiryTable.vue       |  6 +--
 .../pages/CapacityOffersBehavior.test.ts      | 21 +++++++++++
 .../overseas-warehouse/appointmentForm.ts     |  3 +-
 .../components/FbaAppointmentFields.vue       |  4 +-
 .../InboundOrdersView.appointment.test.ts     | 37 +++++++++++++++++++
 .../pages/InboundOrdersView.vue               | 15 +++++++-
 .../pages/realApiMount.test.ts                |  2 +-
 13 files changed, 131 insertions(+), 24 deletions(-)
 create mode 100644 src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts

diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 5740c46c..365c3e15 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -70,6 +70,18 @@ describe('appointment calendar data integration', () => {
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
+  it('uses the dedicated cancellation dialog for an undated appointment instead of editing its status', async () => {
+    const record = { version: 3, id: '1', appointmentNo: 'AP-UNDATED', originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 1, fbaWarehouseCode: 'ABE3', items: [] }
+    vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [record], total: 1})
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper=render(); await flushPromises()
+    await wrapper.findAll('button').find(button=>button.text()==='查看 / 继续')!.trigger('click'); await flushPromises()
+    expect(wrapper.find('option[value="CANCELLED"]').exists()).toBe(false)
+    await wrapper.get('[data-cancel-editing]').trigger('click'); await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentCancellationDialog'}).attributes('appointment-no')).toBe('AP-UNDATED')
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    expect(updateFbaAppointment).not.toHaveBeenCalled(); wrapper.unmount()
+  })
   it('loads cancellation records only after expansion and opens cancelled appointments read-only', async () => {
     const record = { version: 1, id: '1', appointmentNo: 'AP-CANCEL', originWarehouseId: '100', appointmentStatus: 'CANCELLED', selectedCount: 1, fbaWarehouseCode: 'ABE3', items: [] }
     vi.mocked(getFbaAppointment).mockResolvedValue(record)
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index b1015197..8dffe02a 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -354,6 +354,11 @@ function remove(event: CalendarEvent) {
   if (!access.can('platform:appointment:delete') || loading.value || !canLeave()) return
   cancellationTarget.value = appointments.value.find(item => item.appointmentNo === event.key) || null
 }
+function cancelEditing() {
+  if (!editing.value || editing.value.appointmentStatus === 'CANCELLED' || !access.can('platform:appointment:delete') || !canLeave()) return
+  cancellationTarget.value = editing.value
+  dialogOpen.value = false
+}
 async function cancelled() {
   cancellationTarget.value = null; ++cancellationsRevision.value
   ElMessage.success('预约已取消，可在取消记录中查看原因与原记录')
@@ -439,6 +444,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
         <LoadErrorState v-if="!editing && warehouseError" title="仓库加载失败" :message="warehouseError.message" @retry="searchWarehouses(warehouseKeyword)" />
         <p v-if="!editing && warehouseTotal > warehouseOptions.length && !warehouseError" class="appointment-hint">输入更完整的仓库编码或名称，缩小搜索范围。</p>
         <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="appointmentReadOnly || saving || !!pendingSave" />
+        <el-button v-if="editing && editing.appointmentStatus !== 'CANCELLED' && access.can('platform:appointment:delete')" data-cancel-editing type="danger" plain :disabled="saving || !!pendingSave || !detailReady" @click="cancelEditing">取消预约</el-button>
         <template v-if="!editing && warehouse">
           <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
             <template #customer="{ row }">{{ row.customerName?.trim() || '客户名称缺失' }}</template>
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
index b6bfef33..a408f60b 100644
--- a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
@@ -2,13 +2,15 @@ import { flushPromises, mount } from '@vue/test-utils'
 import ElementPlus from 'element-plus'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AppointmentImpactDialog from './AppointmentImpactDialog.vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import { getImpact, handleImpact, type ImpactDetail } from './impactApi'
 vi.mock('./impactApi', async importOriginal => ({ ...await importOriginal<typeof import('./impactApi')>(), getImpact: vi.fn(), handleImpact: vi.fn() }))
-vi.mock('vue-router', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+const guards = vi.hoisted(() => ({ register: vi.fn(), unregister: vi.fn(), push: vi.fn() }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRouter: () => ({ push: guards.push }) }))
 const detail: ImpactDetail = { impact: { containerBookingId: '1', impactNo: 'AI-TEST', version: 1, status: 'OPEN', reason: 'FORECAST_CHANGED', ownerId: null, ownerName: null, baseline: { estimatedAt: '2026-10-15T09:00:00', actualAt: null, observedAt: null, providerCode: 'carrier', sourceReference: 'ref' }, latest: { estimatedAt: '2026-10-17T09:00:00', actualAt: null, observedAt: null, providerCode: 'carrier', sourceReference: 'ref' }, forecastToken: 'current', updatedAt: '2026-10-10T12:00:00' }, cargo: [{ inboundCode: 'IN-A', customerName: '客户甲', packages: 10, destination: 'ONT8' }], appointments: [{ appointmentNo: 'AP-1', status: 'SUCCESS', destination: 'ONT8', confirmedAt: '2026-10-16T09:00:00', timezone: 'America/Los_Angeles' }], transport: null, history: { records: [], total: 0 } }
-const render = (canWrite = true) => mount(AppointmentImpactDialog, { props: { containerId: '1', canWrite }, global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button></section>' } } } })
+const render = (canWrite = true) => mount(AppointmentImpactDialog, { props: { containerId: '1', canWrite }, global: { provide: { 'appointment-register-leave-guard': guards.register }, plugins: [ElementPlus], stubs: { AppDialog: { name: 'AppDialog', props: ['beforeClose'], template: '<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button></section>' } } } })
 describe('appointment impact handling', () => {
-  beforeEach(() => { vi.resetAllMocks(); vi.mocked(getImpact).mockResolvedValue(detail) })
+  beforeEach(() => { vi.resetAllMocks(); guards.register.mockReturnValue(guards.unregister); vi.mocked(getImpact).mockResolvedValue(detail) })
   it('shows separate forecasts, unchanged confirmed appointment and omitted transport permission', async () => {
     const wrapper = render(false); await flushPromises()
     expect(wrapper.text()).toContain('2026-10-15T09:00:00')
@@ -33,15 +35,22 @@ describe('appointment impact handling', () => {
   })
   it('freezes an uncertain command and retries exactly once with original version and key', async () => {
     vi.mocked(handleImpact).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({ ...detail.impact, version: 2 })
+    vi.mocked(getImpact).mockResolvedValueOnce({...detail,transport:{trips:[{tripNo:'TRIP-1',status:'PLANNED',plannedDepartureAt:null}],sameTripBookings:[]}})
     const wrapper = render(); await flushPromises()
     await wrapper.findAll('button').find(b => b.text() === '认领跟进')!.trigger('click'); await flushPromises()
     const original = vi.mocked(handleImpact).mock.calls[0]![1]
     expect(original).toMatchObject({ action: 'CLAIM', expectedVersion: 1, forecastToken: 'current' })
     await wrapper.get('[data-close]').trigger('click'); expect(wrapper.emitted('close')).toBeUndefined()
+    const done=vi.fn(); wrapper.findComponent({name:'AppDialog'}).props('beforeClose')(done); expect(done).not.toHaveBeenCalled()
+    expect(guards.register.mock.calls[0]![0]()).toBe(false)
+    await wrapper.findAll('button').find(b=>b.text()==='TRIP-1')!.trigger('click');expect(guards.push).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave,onBeforeRouteUpdate]) expect((vi.mocked(hook).mock.calls[0]![0] as () => boolean)()).toBe(false)
     await wrapper.findAll('button').find(b => b.text() === '重试本次处理')!.trigger('click'); await flushPromises()
     expect(handleImpact).toHaveBeenNthCalledWith(2, '1', original)
     expect(wrapper.emitted('saved')).toHaveLength(1)
-    expect(getImpact).toHaveBeenCalledTimes(2); wrapper.unmount()
+    expect(getImpact).toHaveBeenCalledTimes(2)
+    expect(guards.register.mock.calls[0]![0]()).toBe(true)
+    wrapper.unmount(); expect(guards.unregister).toHaveBeenCalledOnce()
   })
   it('does not resolve without an actual handling result', async () => {
     const wrapper = render(); await flushPromises()
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.vue b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
index b5c3cc1a..fcc57bdc 100644
--- a/src/modules/appointment-calendar/AppointmentImpactDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { inject, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -27,11 +27,19 @@ async function save(action: ImpactCommand['action']) {
   catch (cause) { error.value = getApiErrorDetails(cause, '处理结果待核实，请重试原请求'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null }
   finally { saving.value = false }
 }
-function close() { if (saving.value || pending.value) { ElMessage.warning('请先核实本次处理结果，再关闭'); return } emit('close') }
+function canLeave() { if (saving.value || pending.value) { ElMessage.warning('请先核实本次处理结果，再关闭或切换'); return false } return true }
+function close() { if (canLeave()) emit('close') }
+function beforeClose(done: () => void) { if (canLeave()) done() }
+function openTrip(tripNo: string) { if (canLeave()) void router.push(`/overseas-master-data/trips/${encodeURIComponent(tripNo)}`) }
+const register = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregister = register?.(canLeave)
+onBeforeUnmount(() => unregister?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
 onMounted(load)
 </script>
 <template>
-  <AppDialog :model-value="true" title="船期变化影响核对" width="min(1200px, calc(100vw - 48px))" :show-confirm="false" class="admin-density-dialog" @update:model-value="close">
+  <AppDialog :model-value="true" title="船期变化影响核对" width="min(1200px, calc(100vw - 48px))" :show-confirm="false" class="admin-density-dialog" @update:model-value="close" :before-close="beforeClose">
     <LoadErrorState v-if="error" title="核对未完成" :message="error.message" :show-retry="!pending" @retry="load" />
     <template v-if="detail">
       <p>{{ detail.impact.impactNo }} · {{ impactStatus[detail.impact.status] }} · 负责人：{{ detail.impact.ownerName || '未认领' }}</p>
@@ -43,7 +51,7 @@ onMounted(load)
       <details open><summary>需复核的收货预约 {{ detail.appointments.length }} 张（确认时间不自动修改）</summary><div class="impact-list"><p v-for="row in detail.appointments" :key="row.appointmentNo">{{ row.appointmentNo }} · {{ row.destination }} · {{ row.confirmedAt || '尚未确认时段' }} {{ row.timezone || '时区待核实' }}</p></div></details>
       <p v-if="!detail.transport">无车次查看权限，运输影响未加载。</p>
       <template v-else>
-        <details open><summary>关联车次 {{ detail.transport.trips.length }} 辆</summary><div class="impact-list"><p v-for="row in detail.transport.trips" :key="row.tripNo"><el-button link type="primary" @click="router.push(`/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`)">{{ row.tripNo }}</el-button> · 计划出发（UTC）：{{ row.plannedDepartureAt || '待定' }}</p></div></details>
+        <details open><summary>关联车次 {{ detail.transport.trips.length }} 辆</summary><div class="impact-list"><p v-for="row in detail.transport.trips" :key="row.tripNo"><el-button link type="primary" @click="openTrip(row.tripNo)">{{ row.tripNo }}</el-button> · 计划出发（UTC）：{{ row.plannedDepartureAt || '待定' }}</p></div></details>
         <details><summary>同车外接承诺 {{ detail.transport.sameTripBookings.length }} 票，仅提示运输安排复核</summary><div class="impact-list"><p v-for="row in detail.transport.sameTripBookings" :key="row.bookingNo">{{ row.bookingNo }} · {{ row.customerName || '—' }} · {{ row.tripNo }} · {{ row.destinationLabel || '—' }}</p></div></details>
       </template>
       <el-form v-if="canWrite && detail.impact.status === 'OPEN'" label-position="top" :disabled="saving || !!pending">
diff --git a/src/modules/overseas-master-data/capacityOfferTypes.ts b/src/modules/overseas-master-data/capacityOfferTypes.ts
index 69765dbf..ec2b7d0f 100644
--- a/src/modules/overseas-master-data/capacityOfferTypes.ts
+++ b/src/modules/overseas-master-data/capacityOfferTypes.ts
@@ -41,6 +41,7 @@ export interface InquiryResult extends OfferResult { inquiry: CapacityInquiry }
 export interface OfferCustomerOption { id: string; code: string; name: string }
 export const offerStatusLabels = { DRAFT: '发布草稿', OPEN: '接单中', PAUSED: '已暂停', CLOSED: '已关闭' }
 export const inquiryStatusLabels = { DRAFT: '已登记', CONFIRMED: '已确认承运', RECEIVED: '已确认实收', BOUND: '已排入本车', CANCELLED: '已取消' }
+export const inquiryCargoLabel = (status?: CapacityInquiry['status']) => status === 'RECEIVED' || status === 'BOUND' ? '已核实' : status === 'CANCELLED' ? '记录' : '预报'
 export const offerTime = (value: string | null) => value ? new Date(value).toLocaleString('zh-CN', { hour12: false }) : '—'
 export const loadText = (value: CapacityLoad | null) => value ? `${value.palletSpaces} 托位 / ${value.weightKg} kg / ${value.volumeCbm} m³` : '待调度核对'
 
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index 539aa5db..f6e63a1e 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -8,7 +8,7 @@ import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/sh
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listOfferCustomers, listOfferQuotes, saveCapacityInquiry, saveAndConfirmInquiry } from '../api/capacityOffers'
 import { fleetQuoteReference, type FleetQuoteReference, type FleetQuoteSourceSnapshot } from '../api/fleetQuoteCandidates'
-import { offerTime, appointmentCoverageLabels, appointmentMissingLabels } from '../capacityOfferTypes'
+import { offerTime, appointmentCoverageLabels, appointmentMissingLabels, inquiryCargoLabel } from '../capacityOfferTypes'
 import type { CapacityOffer, CapacityInquiry, InquiryResult, InquiryWrite, OfferCustomerOption } from '../capacityOfferTypes'
 import type { TripBookingCargo } from '../bookingTypes'
 import { useFleetDraftGuard } from '../useFleetDraftGuard'
@@ -47,6 +47,7 @@ const target = computed(() => props.inquiry?.bookingNo || props.offer?.offerNo |
 const writable = computed(() => !props.readonly && (access.can('platform:fleet:capacity-offer:manage') || access.can('platform:fleet:capacity-offer:list') && access.can(`platform:fleet:capacity-offer:inquiry-${props.inquiry ? 'edit' : 'create'}`)) && (props.inquiry ? props.inquiry.actions.canEdit : props.offer?.canCreateInquiry))
 const canQuote = computed(() => access.can('platform:fleet:quote:list'))
 const lock = computed(() => !writable.value || busy.value || !!pending.value)
+const cargoLabel = computed(() => inquiryCargoLabel(props.inquiry?.status))
 const selectedCapacity = computed(() => props.offer?.capacityKnown ? props.offer.destinations.find(stop => stop.destinationKey === form.cargo.destinationKey)?.remaining : null)
 const quoteReady = computed(() => !!form.customerId && form.cargo.destinationKey.startsWith('FBA:') && ['CNY', 'USD'].includes(form.cargo.currency || ''))
 const guard = useFleetDraftGuard('capacity-inquiry-editor', open, form, busy, computed(() => !!pending.value))
@@ -127,12 +128,12 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
     <el-form label-position="top" class="density-form capacity-inquiry-form" :disabled="lock">
       <el-form-item label="委托客户" required><el-select v-model="form.customerId" filterable remote :remote-method="searchCustomers" :loading="customerLoading" :disabled="!!inquiry" placeholder="按客户编号或名称搜索" @focus="searchCustomers()"><el-option v-if="inquiry" :value="inquiry.customerId" :label="`${inquiry.customerCode} · ${inquiry.customerName}`" /><el-option v-for="customer in customers" :key="customer.id" :value="customer.id" :label="`${customer.code} · ${customer.name}`" /></el-select><span v-if="customerSearched && !customers.length">暂无可选客户</span></el-form-item>
       <el-form-item label="本车卸货站" required><el-select v-model="form.cargo.destinationKey" :disabled="lock || offer?.destinations.length === 1" placeholder="选择本车既有卸货站"><el-option v-for="stop in offer?.destinations || []" :key="stop.destinationKey" :value="stop.destinationKey" :label="stop.name" /><el-option v-if="!offer && inquiry" :value="inquiry.cargo.destinationKey" :label="inquiry.destinationLabel" /></el-select></el-form-item>
-      <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>已知货量（可先填写，未知可留空）</summary><div class="capacity-inquiry-form">
-      <el-form-item label="预计箱数"><el-input-number v-model="form.cargo.packageCount" :min="1" :precision="0" placeholder="未知可留空" /></el-form-item>
+      <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>{{ cargoLabel === '已核实' ? '已核实货量与预计实托数' : readonly ? `${cargoLabel}货量` : '已知货量（可先填写，未知可留空）' }}</summary><div class="capacity-inquiry-form">
+      <el-form-item :label="`${cargoLabel}箱数`"><el-input-number v-model="form.cargo.packageCount" :min="1" :precision="0" placeholder="未知可留空" /></el-form-item>
       <el-form-item label="预计实托数"><el-input-number v-model="form.expectedPalletCount" :min="1" :precision="0" placeholder="卡车确认承运前必填" /></el-form-item>
-      <el-form-item label="预计标准托位"><el-input-number v-model="form.cargo.palletSpaces" :min="1" :precision="0" placeholder="确认承运前填写" /></el-form-item>
-      <el-form-item label="预计重量（kg）"><el-input-number v-model="form.cargo.weightKg" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
-      <el-form-item label="预计体积（m³）"><el-input-number v-model="form.cargo.volumeCbm" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
+      <el-form-item :label="`${cargoLabel}标准托位`"><el-input-number v-model="form.cargo.palletSpaces" :min="1" :precision="0" placeholder="确认承运前填写" /></el-form-item>
+      <el-form-item :label="`${cargoLabel}重量（kg）`"><el-input-number v-model="form.cargo.weightKg" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
+      <el-form-item :label="`${cargoLabel}体积（m³）`"><el-input-number v-model="form.cargo.volumeCbm" :min="0.001" :precision="3" placeholder="确认承运前填写" /></el-form-item>
       </div></details>
       <details class="capacity-inquiry-wide" :open="readonly || confirmMode"><summary>确认承运前待补资料{{ inquiry?.progress.missingFields.length ? `（还需：${inquiry.progress.missingFields.join('、')}）` : '（货名、价格、到仓及联系信息）' }}</summary><div class="capacity-inquiry-form">
       <el-form-item label="本土业务类型"><el-select v-model="form.businessType"><el-option value="LOCAL_LOOSEBOARD" label="本土散板" /><el-option value="US_TRUCK" label="本土卡车" /></el-select></el-form-item>
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
index a63676f9..16c4632e 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryTable.vue
@@ -2,7 +2,7 @@
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
-import { inquiryStatusLabels, offerTime, type CapacityInquiry } from '../capacityOfferTypes'
+import { inquiryCargoLabel, offerTime, type CapacityInquiry } from '../capacityOfferTypes'
 withDefaults(defineProps<{ rows: CapacityInquiry[]; total: number; loading: boolean; busy?: boolean; integrated?: boolean; failed?: boolean }>(), { busy: false, integrated: false, failed: false })
 const page = defineModel<number>('page', { default: 1 }), size = defineModel<number>('size', { default: 20 })
 const emit = defineEmits<{ action: [key: string, row: CapacityInquiry] }>()
@@ -26,7 +26,7 @@ const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 320, fixed: 'left', slotName: 'actions' },
   { key: 'bookingNo', label: '意向 / 预订号', minWidth: 210, singleLine: false }, { key: 'customerName', label: '客户', minWidth: 210, singleLine: false },
   { key: 'tripNo', label: '车次号', minWidth: 210 }, { key: 'destinationLabel', label: '卸货站', minWidth: 130 },
-  { key: 'status', label: '当前进度 / 下一步', minWidth: 270, slotName: 'status', singleLine: false }, { key: 'cargo', label: '预计货量', minWidth: 270, slotName: 'cargo' },
+  { key: 'status', label: '当前进度 / 下一步', minWidth: 270, slotName: 'status', singleLine: false }, { key: 'cargo', label: '货量', minWidth: 270, slotName: 'cargo', singleLine: false },
   { key: 'agreedAmount', label: '约定运费（非实收）', minWidth: 165, slotName: 'amount' }, { key: 'businessOrderNo', label: '本土订单号', minWidth: 210 },
   { key: 'updatedAt', label: '更新时间', minWidth: 180, slotName: 'time' },
 ]
@@ -37,7 +37,7 @@ const columns: DataTableColumn[] = [
   <template v-if="$slots.notices" #notices><slot name="notices" /></template>
   <template #actions="{ row }"><RowActions :max-visible="1" :actions="actions(row as CapacityInquiry, busy)" text-actions @action="emit('action', $event, row as CapacityInquiry)" /></template>
   <template #status="{ row }"><strong>{{ row.progress.label }} · {{ row.progress.reservation }}</strong><div>下一步：{{ row.progress.owner }}</div><small class="inquiry-reason">{{ row.progress.message }}</small></template>
-  <template #cargo="{ row }">{{ row.cargo.packageCount ?? '—' }} 箱 · {{ row.expectedPalletCount ?? '—' }} 实托 · {{ row.cargo.palletSpaces ?? '—' }} 托位 · {{ row.cargo.weightKg ?? '—' }} kg · {{ row.cargo.volumeCbm ?? '—' }} m³</template>
+  <template #cargo="{ row }"><div>{{ inquiryCargoLabel(row.status) }}：{{ row.cargo.packageCount ?? '—' }} 箱 · {{ row.cargo.palletSpaces ?? '—' }} 托位 · {{ row.cargo.weightKg ?? '—' }} kg · {{ row.cargo.volumeCbm ?? '—' }} m³</div><div>预计实托数：{{ row.expectedPalletCount ?? '—' }}</div></template>
   <template #amount="{ row }">{{ row.agreedAmount == null ? '待报价' : `${Number(row.agreedAmount).toFixed(2)} ${row.cargo.currency || ''}` }}</template>
   <template #time="{ row }">{{ offerTime(row.updatedAt) }}</template>
 </DataTable></template>
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index efbc586b..ecb84e8f 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -38,6 +38,27 @@ function mount(component: object, props: Record<string, unknown> = {}): { wrappe
 const button = (w: VueWrapper, label: string) => w.findAll('button').find(b => b.text() === label)!
 beforeEach(() => { vi.clearAllMocks(); state.manage = false; state.write = true; state.quote = false; state.links.clear(); vi.mocked(ElMessageBox.confirm).mockImplementation(vi.fn().mockResolvedValue(undefined)); vi.mocked(api.listCapacityOffers).mockResolvedValue(pageOf([structuredClone(offer)], 41)); vi.mocked(api.listCapacityInquiries).mockResolvedValue(pageOf([structuredClone(inquiry)])); vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer: structuredClone(offer), inquiries: pageOf([structuredClone(inquiry)]) }) })
 afterEach(() => { wrappers.splice(0).forEach(w => w.unmount()); vi.useRealTimers() })
+it.each(['DRAFT', 'CONFIRMED', 'RECEIVED', 'BOUND', 'CANCELLED'] as const)('labels %s cargo consistently in the list and detail without treating estimated pallets as actual', async status => {
+  const row: CapacityInquiry = { ...inquiry, status, expectedPalletCount: 7, cargo: { ...inquiry.cargo, packageCount: 12, palletSpaces: 3, weightKg: 80, volumeCbm: 2 } }
+  const label = status === 'RECEIVED' || status === 'BOUND' ? '已核实' : status === 'CANCELLED' ? '记录' : '预报'
+  const list = shallowMount(CapacityInquiryTable, { props: { rows: [row], total: 1, loading: false }, global: { stubs: {
+    DataTable: { props: ['data', 'columns'], template: '<div><slot name="cargo" :row="data[0]"/></div>' },
+  } } })
+  wrappers.push(list)
+  expect(list.text()).toContain(`${label}：12 箱 · 3 托位 · 80 kg · 2 m³`)
+  expect(list.text()).toContain('预计实托数：7')
+  expect(list.text()).not.toContain('7 实托')
+  await list.setProps({ rows: [{ ...row, expectedPalletCount: null, cargo: { ...row.cargo, packageCount: null } }] })
+  expect(list.text()).toContain(`${label}：— 箱`)
+  expect(list.text()).toContain('预计实托数：—')
+  const { wrapper: detail } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: row, readonly: true })
+  await flushPromises()
+  for (const suffix of ['箱数', '标准托位', '重量（kg）', '体积（m³）']) expect(detail.find(`[label="${label}${suffix}"]`).exists()).toBe(true)
+  expect(detail.findAll('summary').map(item => item.text())).toContain(label === '已核实' ? '已核实货量与预计实托数' : `${label}货量`)
+  expect(detail.find('[label="预计实托数"]').exists()).toBe(true)
+  expect(detail.find('[label="已核实实托数"]').exists()).toBe(false)
+  expect(api.saveCapacityInquiry).not.toHaveBeenCalled()
+})
 it('loads only the active tab and sends exactly one query after resetting from a later page', async () => {
   const { wrapper } = mount(CapacityOffersView); await flushPromises()
   expect(api.listCapacityOffers).toHaveBeenCalledOnce(); expect(api.listCapacityInquiries).not.toHaveBeenCalled()
diff --git a/src/modules/overseas-warehouse/appointmentForm.ts b/src/modules/overseas-warehouse/appointmentForm.ts
index 10044564..1acabb20 100644
--- a/src/modules/overseas-warehouse/appointmentForm.ts
+++ b/src/modules/overseas-warehouse/appointmentForm.ts
@@ -22,7 +22,8 @@ export function appointmentPayload(form: AppointmentForm): FbaAppointmentDetails
     startOffset: form.startOffset.trim() || null, endOffset: form.endOffset.trim() || null }
 }
 export function appointmentFormError(form: AppointmentForm): string | null {
+  if (form.appointmentStatus === 'CANCELLED') return '请在预约列表使用取消预约操作，并填写实际取消原因'
   if (form.appointmentStatus === 'SUCCESS' && (!form.confirmationNo.trim() || !form.appointmentAt)) return '登记对方确认时，请填写外部约号与确认时间'
-  if (['FAILED', 'CANCELLED'].includes(form.appointmentStatus) && !form.appointmentRemark.trim()) return '请填写取消或未约成的原因'
+  if (form.appointmentStatus === 'FAILED' && !form.appointmentRemark.trim()) return '请填写未约成的原因'
   return null
 }
diff --git a/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue b/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue
index cbaf3306..40e49dc9 100644
--- a/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue
+++ b/src/modules/overseas-warehouse/components/FbaAppointmentFields.vue
@@ -6,13 +6,13 @@ defineProps<{ model: AppointmentForm; appointmentNo?: string; timezone?: string
   <p>{{ appointmentNo ? `系统单号：${appointmentNo}` : '系统单号将在保存后生成' }} · {{ timezone || '目的仓时区待核实' }}</p>
   <el-form label-position="top" class="appointment-fields density-form" :disabled="disabled">
     <el-form-item label="计划送仓日期"><el-date-picker v-model="model.plannedDate" type="date" value-format="YYYY-MM-DD" placeholder="日期未定可留空" /></el-form-item>
-    <el-form-item label="本次登记"><el-select v-model="model.appointmentStatus"><el-option label="先保存安排，等待对方确认" value="PENDING" /><el-option label="已取得对方正式确认" value="SUCCESS" /><el-option v-if="appointmentNo" label="未约成" value="FAILED" /><el-option v-if="appointmentNo" label="取消安排" value="CANCELLED" /></el-select></el-form-item>
+    <el-form-item label="本次登记"><el-select v-model="model.appointmentStatus"><el-option label="先保存安排，等待对方确认" value="PENDING" /><el-option label="已取得对方正式确认" value="SUCCESS" /><el-option v-if="appointmentNo" label="未约成" value="FAILED" /><el-option v-if="disabled && model.appointmentStatus === 'CANCELLED'" label="已取消" value="CANCELLED" disabled /></el-select></el-form-item>
     <template v-if="model.appointmentStatus === 'SUCCESS'">
       <el-form-item label="外部约号" required><el-input v-model="model.confirmationNo" maxlength="128" placeholder="填写收货方提供的确认号" /></el-form-item>
       <el-form-item label="对方确认开始时间" required><el-date-picker v-model="model.appointmentAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="目的仓当地时间" @change="model.startOffset = ''" /></el-form-item>
       <el-form-item label="对方确认结束时间"><el-date-picker v-model="model.appointmentEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="未明确可留空" @change="model.endOffset = ''" /></el-form-item>
     </template>
-    <el-form-item :label="['FAILED','CANCELLED'].includes(model.appointmentStatus) ? '原因' : '备注'" :required="['FAILED','CANCELLED'].includes(model.appointmentStatus)"><el-input v-model="model.appointmentRemark" maxlength="1000" placeholder="有需交接的事项时填写" /></el-form-item>
+    <el-form-item :label="model.appointmentStatus === 'FAILED' ? '原因' : '备注'" :required="model.appointmentStatus === 'FAILED'"><el-input v-model="model.appointmentRemark" maxlength="1000" placeholder="有需交接的事项时填写" /></el-form-item>
     <details class="appointment-fields__extra"><summary>补充计划时段与夏令时信息</summary>
       <el-form-item label="计划开始时段"><el-date-picker v-model="model.plannedAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="只知道日期时不必填写" /></el-form-item>
       <el-form-item label="计划结束时段"><el-date-picker v-model="model.plannedEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item>
diff --git a/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts b/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts
new file mode 100644
index 00000000..11ca46e8
--- /dev/null
+++ b/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts
@@ -0,0 +1,37 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { expect, it, vi } from 'vitest'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import InboundOrdersView from './InboundOrdersView.vue'
+import { getFbaAppointment, updateFbaAppointment } from '../api/inboundOrders'
+vi.mock('vue-router', () => ({ useRouter: () => ({push: vi.fn()}), onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({can: () => true}) }))
+vi.mock('../api/inboundOrders', () => ({
+  listInboundOrders: vi.fn().mockResolvedValue({records:[{lineId:'1',planNo:'IP-1',customerId:'A',appointmentNo:'AP-1',fbaWarehouseCode:'ONT8'}],total:1}),
+  getFbaAppointment: vi.fn(), updateFbaAppointment: vi.fn(), createFbaAppointment: vi.fn(), updateInboundPlan: vi.fn(),
+}))
+vi.mock('element-plus', () => ({ ElMessage: {warning:vi.fn(),success:vi.fn()} }))
+it('keeps the inbound appointment retry across close, reopen and route attempts', async () => {
+  vi.mocked(getFbaAppointment).mockResolvedValue({id:'1',appointmentNo:'AP-1',version:2,originWarehouseId:'100',fbaWarehouseCode:'ONT8',appointmentStatus:'PENDING',selectedCount:1,items:[]})
+  vi.mocked(updateFbaAppointment).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({} as never)
+  const wrapper=mount(InboundOrdersView,{global:{directives:{loading:{}},stubs:{
+    AdminPage:{template:'<main><slot/></main>'},ListPageLayout:{template:'<div><slot/></div>'},
+    DataTable:{props:['data'],template:'<div><slot v-for="row in data" name="actions" :row="row"/></div>'},
+    AppDialog:{name:'AppDialog',props:['modelValue','beforeClose'],template:'<section v-if="modelValue"><slot/><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save @click="$emit(\'confirm\')">保存</button></section>'},
+    ElButton:{template:'<button><slot/></button>'}, FbaAppointmentFields:true,SmartDispatchDialog:true,QueryToolbar:true,OperationErrorToast:true,
+  }}})
+  await flushPromises()
+  const open=()=>wrapper.findAll('button').find(b=>b.text()==='预约')!.trigger('click')
+  await open();await flushPromises();await wrapper.get('[data-save]').trigger('click');await flushPromises()
+  const original=vi.mocked(updateFbaAppointment).mock.calls[0]![1]
+  await wrapper.get('[data-close]').trigger('click')
+  const dialog=wrapper.findAllComponents({name:'AppDialog'})[0]!
+  const done=vi.fn();dialog.props('beforeClose')(done);expect(done).not.toHaveBeenCalled()
+  expect(wrapper.find('[data-save]').exists()).toBe(true)
+  await open();await flushPromises();expect(getFbaAppointment).toHaveBeenCalledTimes(1)
+  for(const hook of [onBeforeRouteLeave,onBeforeRouteUpdate]) expect((vi.mocked(hook).mock.calls[0]![0] as () => boolean)()).toBe(false)
+  await wrapper.get('[data-save]').trigger('click');await flushPromises()
+  expect(updateFbaAppointment).toHaveBeenNthCalledWith(2,'AP-1',original)
+  expect(wrapper.find('[data-save]').exists()).toBe(false)
+  expect((vi.mocked(onBeforeRouteLeave).mock.calls[0]![0] as () => boolean)()).toBe(true)
+  wrapper.unmount()
+})
diff --git a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
index 3c919ec9..44a3b7d7 100644
--- a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
@@ -3,7 +3,7 @@ import '@/styles/adminDensity.css'
 import { computed, onMounted, reactive, ref } from 'vue'
 import { CalendarCheck2, Truck } from '@lucide/vue'
 import { ElMessage } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRouter } from 'vue-router'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
@@ -127,6 +127,7 @@ function selectionError() {
 }
 
 function openAppointment() {
+  if (!canLeaveAppointment()) return
   const error = selectionError()
   if (error) { ElMessage.warning(error); return }
   appointmentMode.value = 'create'; editingAppointmentNo.value = ''
@@ -142,6 +143,7 @@ function openSmartDispatch() {
 }
 
 async function openAppointmentEdit(source: object) {
+  if (!canLeaveAppointment()) return
   const row = source as InboundOrderListItem
   if (!row.appointmentNo || row.appointmentNo === '—') return
   appointmentMode.value = 'edit'; editingAppointmentNo.value = row.appointmentNo
@@ -158,7 +160,16 @@ async function openAppointmentEdit(source: object) {
   } finally { appointmentLoading.value = false }
 }
 
+function canLeaveAppointment() {
+  if (saving.value || pendingAppointment.value) { ElMessage.warning('请先核实本次预约保存结果，再关闭或切换'); return false }
+  return true
+}
+function closeAppointment() { if (canLeaveAppointment()) appointmentOpen.value = false }
+function beforeCloseAppointment(done: () => void) { if (canLeaveAppointment()) done() }
+onBeforeRouteLeave(canLeaveAppointment)
+onBeforeRouteUpdate(canLeaveAppointment)
 async function submitAppointment() {
+  if (saving.value || appointmentLoading.value) return
   if (appointmentMode.value === 'create') { const error = selectionError(); if (error) { ElMessage.warning(error); return } }
   const validation = appointmentFormError(appointmentForm)
   if (!pendingAppointment.value && validation) { ElMessage.warning(validation); return }
@@ -213,7 +224,7 @@ onMounted(() => { void load() })
       <template #pagination-left>共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>
   </ListPageLayout>
-  <AppDialog class="admin-density-dialog" v-model="appointmentOpen" :title="appointmentTitle" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingAppointment ? '重试本次保存' : '保存预约安排'" :confirm-loading="saving" @confirm="submitAppointment">
+  <AppDialog class="admin-density-dialog" :model-value="appointmentOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :title="appointmentTitle" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingAppointment ? '重试本次保存' : '保存预约安排'" :confirm-loading="saving" @confirm="submitAppointment">
     <div v-loading="appointmentLoading">
     <div class="appointment-summary">已选择 {{ appointmentSelectedCount }} 条，FBA仓库：{{ appointmentFbaWarehouse }}</div>
     <FbaAppointmentFields :model="appointmentForm" :appointment-no="editingAppointmentNo || undefined" :timezone="appointmentTimezone" :disabled="saving || !!pendingAppointment" />
diff --git a/src/modules/overseas-warehouse/pages/realApiMount.test.ts b/src/modules/overseas-warehouse/pages/realApiMount.test.ts
index 9da737e8..21ec28eb 100644
--- a/src/modules/overseas-warehouse/pages/realApiMount.test.ts
+++ b/src/modules/overseas-warehouse/pages/realApiMount.test.ts
@@ -14,7 +14,7 @@ import InventoryTransactionsView from './InventoryTransactionsView.vue'
 import LastMileOrderDetailView from './LastMileOrderDetailView.vue'
 
 const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: {} as Record<string, string>, query: {} as Record<string, string> } }))
-vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
 vi.mock('../api/inboundOrders', () => ({
   listInboundOrders: vi.fn(), createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(),

From 315cb8e663d9200ee993b54a16cdc27dbef313ad Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 15:33:09 +0800
Subject: [PATCH 44/47] fix: align appointment viewing and fleet follow-up
 navigation

---
 .../AppointmentCalendarPanel.test.ts          | 11 +++++
 .../AppointmentCalendarPanel.vue              |  5 +-
 .../AppointmentCalendarView.test.ts           | 15 ++++++
 .../AppointmentCalendarView.vue               |  3 +-
 .../pages/OverseasBusinessViews.test.ts       | 13 +++++
 .../pages/TransportOrdersView.vue             | 11 ++++-
 .../components/CapacityInquiryDialog.vue      |  6 ++-
 .../TripBookingFulfillmentDialog.test.ts      |  2 +
 .../TripBookingFulfillmentDialog.vue          |  2 +-
 src/modules/overseas-master-data/index.ts     |  1 +
 .../inquiryNavigation.test.ts                 | 16 +++++++
 .../overseas-master-data/inquiryNavigation.ts | 16 +++++++
 .../pages/CapacityOfferDetailView.vue         | 33 ++++++++++---
 .../pages/CapacityOffersBehavior.test.ts      | 47 +++++++++++++++++--
 .../pages/CapacityOffersView.vue              | 23 +++++++--
 .../pages/TripDetailView.vue                  |  3 +-
 .../pages/DispatchDetailView.test.ts          | 13 ++++-
 .../pages/DispatchDetailView.vue              |  5 +-
 .../InboundOrdersView.appointment.test.ts     | 27 ++++++++---
 .../pages/InboundOrdersView.vue               | 18 ++++---
 .../pages/prototypeContract.test.ts           |  3 +-
 21 files changed, 232 insertions(+), 41 deletions(-)
 create mode 100644 src/modules/overseas-master-data/inquiryNavigation.test.ts
 create mode 100644 src/modules/overseas-master-data/inquiryNavigation.ts

diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
index 6d522a2a..b252e473 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts
@@ -10,6 +10,17 @@ describe('appointment calendar interactions', () => {
     global: { stubs: { ElButton: { template: '<button><slot /></button>' } }, directives: { loading: {} } },
   })
 
+  it('opens a readable appointment without exposing write actions', async () => {
+    const wrapper = render()
+    const event = {key:'a',type:'delivery' as const,date:'2026-09-24',time:'09:00',title:'预约',fields:[],canView:true,canEdit:false,canDelete:false}
+    await wrapper.setProps({events:[event]})
+    const actions=wrapper.get('.detail-event footer')
+    expect(actions.text()).toBe('查看预约')
+    await actions.get('button').trigger('click')
+    expect(wrapper.emitted('view')?.[0]).toEqual([event])
+    expect(wrapper.emitted('edit')).toBeUndefined()
+    wrapper.unmount()
+  })
   it('hides optional references by default and counts only appointments after enabling them', async () => {
     const wrapper = render()
     await wrapper.setProps({ events: [
diff --git a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
index 6e88fc04..cd4d492f 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarPanel.vue
@@ -15,6 +15,7 @@ export interface CalendarEvent {
   fields: Array<{ label: string; value?: string | null }>
   inboundCodes?: Array<string | null | undefined>
   canEdit?: boolean
+  canView?: boolean
   canDelete?: boolean
   sourcePath?: string
 }
@@ -32,6 +33,7 @@ const emit = defineEmits<{
   range: [range: { from: string; to: string }]
   create: [date: string]
   edit: [event: CalendarEvent]
+  view: [event: CalendarEvent]
   delete: [event: CalendarEvent]
   open: [event: CalendarEvent]
 }>()
@@ -124,7 +126,8 @@ defineExpose({ selectedDate, mode })
           <h3>{{ event.title }}</h3><p v-if="event.subtitle" class="event-subtitle">{{ event.subtitle }}</p>
           <dl><div v-for="field in event.fields" :key="field.label" :class="{ 'wide-field': ['系统单号', '完整时段', '预约备注'].includes(field.label) }"><dt>{{ field.label }}</dt><dd>{{ field.value || '—' }}</dd></div></dl>
           <AppointmentInboundCodes v-if="event.inboundCodes" :codes="event.inboundCodes" />
-          <footer v-if="event.canEdit || event.canDelete || event.sourcePath" class="density-actions">
+          <footer v-if="event.canView || event.canEdit || event.canDelete || event.sourcePath" class="density-actions">
+            <el-button v-if="event.canView" class="density-action" :disabled="loading" @click="emit('view', event)">查看预约</el-button>
             <el-button v-if="event.sourcePath" class="density-action" :disabled="loading" @click="emit('open', event)">查看来源</el-button>
             <el-button v-if="event.canEdit" class="density-action" :disabled="loading" @click="emit('edit', event)">编辑</el-button>
             <el-button v-if="event.canDelete" class="density-action" data-tone="danger" :disabled="loading" @click="emit('delete', event)">取消预约</el-button>
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
index 365c3e15..8c19a985 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.test.ts
@@ -70,6 +70,21 @@ describe('appointment calendar data integration', () => {
     vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
   })
 
+  it('opens a dated calendar appointment read-only for list-only users', async () => {
+    routing.canWrite=false
+    const record={version:0,id:'1',appointmentNo:'AP-DATED',plannedDate:'2026-10-15',originWarehouseId:'100',appointmentStatus:'PENDING',selectedCount:1,fbaWarehouseCode:'ABE3',items:[]}
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([record])
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper=render();await flushPromises()
+    const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
+    expect(panel.props('events')).toEqual(expect.arrayContaining([expect.objectContaining({key:'AP-DATED',canView:true,canEdit:false})]))
+    panel.vm.$emit('view',{key:'AP-DATED'});await flushPromises()
+    expect(getFbaAppointment).toHaveBeenCalledWith('AP-DATED')
+    expect(wrapper.findComponent({name:'FbaAppointmentFields'}).props('disabled')).toBe(true)
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    wrapper.findComponent({name:'AppDialog'}).vm.$emit('confirm');await flushPromises()
+    expect(updateFbaAppointment).not.toHaveBeenCalled();wrapper.unmount()
+  })
   it('uses the dedicated cancellation dialog for an undated appointment instead of editing its status', async () => {
     const record = { version: 3, id: '1', appointmentNo: 'AP-UNDATED', originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 1, fbaWarehouseCode: 'ABE3', items: [] }
     vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [record], total: 1})
diff --git a/src/modules/appointment-calendar/AppointmentCalendarView.vue b/src/modules/appointment-calendar/AppointmentCalendarView.vue
index 8dffe02a..843de4e2 100644
--- a/src/modules/appointment-calendar/AppointmentCalendarView.vue
+++ b/src/modules/appointment-calendar/AppointmentCalendarView.vue
@@ -166,6 +166,7 @@ const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival =>
   ].filter(field => field.value != null && field.value !== ''),
   inboundCodes: appointment.items.map(item => item.inboundCode),
   canEdit: access.can(permission.inboundOrderAppointment),
+  canView: access.can('platform:appointment:list'),
   canDelete: access.can('platform:appointment:delete'),
 })), ...tripEvents.value])
 
@@ -418,7 +419,7 @@ onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequ
     <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
     <details v-if="unscheduledTotal" class="appointment-extra"><summary>未定时安排（{{ unscheduledTotal }}）</summary><DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" row-key="appointmentNo" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()"><template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template></DataTable></details>
     <details class="appointment-extra" @toggle="cancellationsOpen = ($event.target as HTMLDetailsElement).open"><summary>取消记录</summary><AppointmentCancellationRecords v-if="cancellationsOpen" :key="cancellationsRevision" @view="openEdit({key: $event}, true)" /></details>
-    <AppointmentCalendarPanel :notices="[pickupNotice, showTripLayer ? tripNotice : ''].filter(Boolean)" :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @edit="openEdit" @delete="remove" @open="openSource">
+    <AppointmentCalendarPanel :notices="[pickupNotice, showTripLayer ? tripNotice : ''].filter(Boolean)" :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @view="openEdit($event, true)" @edit="openEdit" @delete="remove" @open="openSource">
       <template #notice-actions><el-button v-if="showTripLayer && unresolvedTrips.length" link type="primary" @click="unresolvedDialogOpen = true">查看待核实车次（{{ unresolvedTrips.length }}）</el-button></template>
     </AppointmentCalendarPanel>
     </div>
diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index b33309b6..f0fc4cca 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -281,4 +281,17 @@ describe('overseas business mounted pages', () => {
   it('keeps looseboard edit form and version unchanged after a 409', async () => { routing.route.params = { orderId: 'LB-300' }; routing.route.query = { customerId: '10003' }; vi.mocked(updateLocalLooseboardOrder).mockRejectedValue(new ApiResponseError('订单版本冲突', 'B0409', 409)); const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await destination.setValue('ONT-MARKER-EDIT'); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(updateLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003', expect.objectContaining({ version: 0, destination: 'ONT-MARKER-EDIT' })); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER-EDIT'); expect(document.body.textContent).toContain('订单版本冲突'); expect(routing.push).not.toHaveBeenCalled() })
   it('mounts looseboard create without a detail route or pending notice', async () => { const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); expect(wrapper.text()).toContain('客户信息'); expect(wrapper.text()).toContain('请选择客户'); expect(wrapper.text()).not.toContain('接口能力待后端补齐'); expect(wrapper.findAll('button').find((button) => button.text().includes('提交订单'))?.attributes('disabled')).toBeUndefined() })
   it('reuses one idempotency key and preserves looseboard create input after retries fail', async () => { vi.mocked(createLocalLooseboardOrder).mockRejectedValue(new ApiResponseError('temporary failure', 'S0500', 500)); const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0].vm.$emit('update:modelValue', '10001'); const groups = wrapper.findAllComponents({ name: 'ElRadioGroup' }); groups[0].vm.$emit('update:modelValue', 'SHARED_TRUCK'); groups[1].vm.$emit('update:modelValue', 'YES'); groups[2].vm.$emit('update:modelValue', 'WAREHOUSE_TO_WAREHOUSE'); const origin = wrapper.find('input[placeholder="城市 / 港口 / 州"]'); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await origin.setValue('LA-MARKER'); await destination.setValue('ONT-MARKER'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总重量'))!.find('input').setValue('80'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总体积'))!.find('input').setValue('1.8'); await wrapper.vm.$nextTick(); const submit = wrapper.findAll('button').find((button) => button.text().includes('提交订单')); await submit?.trigger('click'); await flushPromises(); await submit?.trigger('click'); await flushPromises(); expect(createLocalLooseboardOrder).toHaveBeenCalledTimes(2); const keys = vi.mocked(createLocalLooseboardOrder).mock.calls.map((call) => call[1].idempotencyKey); expect(keys[0]).toBeTruthy(); expect(keys[1]).toBe(keys[0]); expect((origin.element as HTMLInputElement).value).toBe('LA-MARKER'); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER'); expect(routing.push).not.toHaveBeenCalled() })
+  it.each([true, false])('opens only the matching pool order read-only arrangement: %s', matching => {
+    routing.route.query = { orderNo: truck.orderNo, fleetSource: 'inquiry', fleetOfferNo: 'FO-1', fleetBookingNo: matching ? arrangement.bookingNo : 'FB-OTHER' }
+    vi.mocked(listUsTruckOrders).mockResolvedValue({ records: [{ ...truck, fleetArrangement: arrangement }], page: 1, size: 20, total: 1, pages: 1 })
+    return (async () => {
+      const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises()
+      const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title') === '承运安排')!
+      expect(dialog.props('modelValue')).toBe(matching); expect(dialog.props('showConfirm')).toBe(false)
+      await wrapper.findAll('button').find(item => item.text() === '返回原拼车登记')!.trigger('click')
+      expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'FO-1' }, query: { inquiry: matching ? arrangement.bookingNo : 'FB-OTHER' } })
+      expect(updateUsTruckOrder).not.toHaveBeenCalled()
+    })()
+  })
+
 })
diff --git a/src/modules/overseas-business/pages/TransportOrdersView.vue b/src/modules/overseas-business/pages/TransportOrdersView.vue
index 3f3d9c02..08e89c81 100644
--- a/src/modules/overseas-business/pages/TransportOrdersView.vue
+++ b/src/modules/overseas-business/pages/TransportOrdersView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
-import { TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
+import { inquiryReturnTarget, TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
 import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Plus } from '@lucide/vue'
@@ -76,6 +76,9 @@ const columns = computed(() => {
 })
 function formatDateTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 16) : '—' }
 async function load() {
+  const sourceBooking = route.query.fleetBookingNo
+  const sourceOrder = route.query.orderNo
+  arrangementOpen.value = false; arrangement.value = null
   rows.value = []; total.value = 0; loadError.value = null; loading.value = true
   try {
     if (isLooseboard.value) {
@@ -85,6 +88,10 @@ async function load() {
       const result = await listUsTruckOrders({ page: page.value, size: pageSize.value, orderNo: String(applied.value.orderNo || ''), routeKeyword: String(applied.value.routeKeyword || ''), status: String(applied.value.status || '') as LocalTransportStatus | '' } satisfies LocalTransportQuery)
       rows.value = result.records; total.value = result.total
     }
+    if (inquiryReturnTarget(route.query) && route.query.fleetBookingNo === sourceBooking && route.query.orderNo === sourceOrder) {
+      const target = rows.value.find(row => row.orderNo === sourceOrder && row.fleetArrangement?.bookingNo === sourceBooking)
+      if (target) showArrangement(target)
+    }
   } catch (error) { loadError.value = getApiErrorDetails(error, `${domainLabel.value}订单加载失败，请稍后重试`) } finally { loading.value = false }
 }
 function search(model: QueryModel) { applied.value = { ...model }; if (page.value === 1) void load(); else page.value = 1 }
@@ -99,7 +106,7 @@ watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route
 
 
     <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" :preference-key="`overseas-business-${domain}`" row-key="id" :empty-text="`暂无符合筛选条件的${domainLabel}订单`">
-        <template #toolbar-start><h1>{{ domainLabel }}</h1></template>
+        <template #toolbar-start><el-button v-if="inquiryReturnTarget(route.query)" link @click="router.push(inquiryReturnTarget(route.query)!)">返回原拼车登记</el-button><h1>{{ domainLabel }}</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" :ariaLabel="`${domainLabel}订单筛选`" :preference-key="queryPreferenceKey" @search="search" /></template>
         <template #notices><template v-if="loadError"><LoadErrorState :title="`${domainLabel}订单暂时无法加载`" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
 
diff --git a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
index f6e63a1e..08b3c08d 100644
--- a/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
+++ b/src/modules/overseas-master-data/components/CapacityInquiryDialog.vue
@@ -12,6 +12,7 @@ import { offerTime, appointmentCoverageLabels, appointmentMissingLabels, inquiry
 import type { CapacityOffer, CapacityInquiry, InquiryResult, InquiryWrite, OfferCustomerOption } from '../capacityOfferTypes'
 import type { TripBookingCargo } from '../bookingTypes'
 import { useFleetDraftGuard } from '../useFleetDraftGuard'
+import { inquiryOrderTarget } from '../inquiryNavigation'
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ offer: CapacityOffer | null; inquiry: CapacityInquiry | null; readonly: boolean; confirmMode?: boolean }>()
 const emit = defineEmits<{ saved: [value: InquiryResult]; refresh: []; action: [key: string, row: CapacityInquiry] }>()
@@ -37,6 +38,7 @@ const primaryFollowup = computed(() => {
   return followupActions.value.find(action => action.key.toUpperCase() === key)
 })
 const secondaryFollowups = computed(() => followupActions.value.filter(action => action !== primaryFollowup.value))
+const canReadOrder = computed(() => props.inquiry && inquiryOrderTarget(props.inquiry, access.can))
 const blankCargo = (): TripBookingCargo => ({ destinationKey: '', cargoName: null, packageCount: null, palletSpaces: null, weightKg: null, volumeCbm: null, priceBasis: 'PALLET', unitPrice: null, currency: 'USD', contactName: null, contactPhone: null, remark: null })
 const form = reactive({ customerId: '', businessType: 'LOCAL_LOOSEBOARD' as CapacityInquiry['businessType'], deliveryMode: 'SELF_DELIVERY' as CapacityInquiry['deliveryMode'], estimatedArrivalAt: null as string | null, expectedPalletCount: null as number | null, cargo: blankCargo(), quoteRef: null as FleetQuoteReference | null })
 const quoteSource = ref<FleetQuoteSourceSnapshot | null>(null), customers = ref<OfferCustomerOption[]>([]), customerLoading = ref(false)
@@ -114,7 +116,7 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
     </section>
     <p v-if="pending" role="status">上次提交结果尚未确定，请保留原内容重试或核对。</p>
     <p v-if="offer">{{ offer.offerNo }} · {{ offer.warehouseName }} · {{ offer.blockReason || '询价不占位，调度确认承运后占位。' }}</p>
-    <section v-if="inquiry" aria-label="本票处理进度"><strong>{{ inquiry.progress.label }} · {{ inquiry.progress.reservation }}</strong><p>下一步负责人：{{ inquiry.progress.owner }} · {{ inquiry.progress.message }}</p></section>
+    <section v-if="inquiry" aria-label="本票处理进度"><strong>{{ inquiry.customerName }} · {{ inquiry.destinationLabel }}</strong><p>车次：{{ inquiry.tripNo }} · 登记：{{ inquiry.bookingNo }}</p><strong>{{ inquiry.progress.label }} · {{ inquiry.progress.reservation }}</strong><p>下一步负责人：{{ inquiry.progress.owner }} · {{ inquiry.progress.message }}</p></section>
     <p v-else>先选客户即可登记；多站车次需选择卸货站。保存后调度可见，尚不保位。</p>
     <p v-if="!inquiry">业务类型：{{ form.businessType === 'US_TRUCK' ? '本土卡车' : '本土散板' }}，可在“确认承运前待补资料”中调整。</p>
     <p v-if="offer">计划发车：{{ offerTime(offer.plannedDepartureAt) }} · 最晚送仓：{{ offerTime(offer.cutoffAt) }}</p>
@@ -163,7 +165,7 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
       <p v-for="appointment in inquiry.appointmentCoverage.appointments" :key="appointment.appointmentNo">预约：{{ appointment.appointmentNo }} · 外部确认号：{{ appointment.confirmationNo || '尚未确认' }}</p>
       <p v-if="inquiry.appointmentCoverage.changeReviewRequired">货源或数量发生变化，请负责预约的人员重新核对覆盖。</p>
     </section>
-    <p v-if="inquiry">本土订单：{{ inquiry.businessOrderNo || '尚未成交' }} · 来货：{{ inquiry.incomingNo || '尚未登记' }} · 排车：{{ inquiry.dispatchNo || '尚未关联' }}</p>
+    <p v-if="inquiry">本土订单：<el-button v-if="canReadOrder" link @click="emit('action', 'business-order', inquiry)">{{ inquiry.businessOrderNo }}</el-button><span v-else>{{ inquiry.businessOrderNo || '尚未成交' }}</span> · 来货：{{ inquiry.incomingNo || '尚未登记' }} · 排车：{{ inquiry.dispatchNo || '尚未关联' }}</p>
   </AppDialog>
 </template>
 <style scoped>.capacity-inquiry-form{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:var(--admin-space-4) var(--admin-space-6)}.capacity-inquiry-form :deep(.el-select),.capacity-inquiry-form :deep(.el-input-number),.capacity-inquiry-form :deep(.el-date-editor){width:100%}.capacity-inquiry-wide{grid-column:1/-1}</style>
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
index ce36d55e..d9382681 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts
@@ -1,3 +1,4 @@
+import { ElMessage } from 'element-plus'
 import { ElTable, ElTableColumn } from 'element-plus/es/components/table/index'
 import { ElInputNumber } from 'element-plus/es/components/input-number/index'
 import { ElInput } from 'element-plus/es/components/input/index'
@@ -35,6 +36,7 @@ it('uses server actual pallets and preview versions while requiring explicit pri
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
   expect(api.acceptTripIncoming).toHaveBeenCalledWith('TR-1', 'FB-1', expect.objectContaining({ tripRecordVersion: 5, recordVersion: 2, receiptHash: 'receipt-hash', unitPrice: 55, pallets: [{ warehousePalletId: '902', palletSpaces: 2 }] }))
   expect(api.startTripIncoming).not.toHaveBeenCalled(); expect(api.bindTripBookingDispatch).not.toHaveBeenCalled()
+  expect(ElMessage.success).toHaveBeenCalledWith('实收货量及约定运费已核实')
 })
 it('does not accept a receipt while the warehouse is still waiting for actual goods', async () => {
   vi.mocked(api.getTripIncoming).mockResolvedValue({ ...preview, incoming: { ...preview.incoming!, status: 'WAIT_PDA_RECEIVING', pallets: [], receivedPackages: 0 } })
diff --git a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
index 4565dd3d..3fac1437 100644
--- a/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
+++ b/src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.vue
@@ -98,7 +98,7 @@ async function save() {
     const value = props.pool ? await commandInquiryFulfillment(booking.bookingNo, mode === 'incoming' ? 'incoming' : mode === 'receipt' ? 'receipt-confirmation' : 'arrange-dispatch', mode === 'bind' ? { tripRecordVersion: (body as TripBookingBind).tripRecordVersion, recordVersion: (body as TripBookingBind).recordVersion, idempotencyKey: (body as TripBookingBind).idempotencyKey } : body) : mode === 'incoming' ? await startTripIncoming(props.trip.tripNo, booking.bookingNo, body as TripIncomingStart)
       : mode === 'bind' ? await bindTripBookingDispatch(props.trip.tripNo, booking.bookingNo, body as TripBookingBind)
         : await acceptTripIncoming(props.trip.tripNo, booking.bookingNo, body as TripIncomingAccept)
-    if (current === generation) { pending.value = null; guard.capture(); emit('saved', value); open.value = false; ElMessage.success('外接履约记录已更新') }
+    if (current === generation) { pending.value = null; guard.capture(); emit('saved', value); open.value = false; ElMessage.success(value.booking.status === 'BOUND' ? '已排入本车，尚未装车或发车' : value.booking.status === 'RECEIVED' ? '实收货量及约定运费已核实' : value.booking.incomingNo ? '已安排来货，等待仓库实际收货' : '履约命令已完成，请查看最新进度') }
   } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '外接履约操作未完成'); if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pending.value = null } }
   finally { busy.value = false }
 }
diff --git a/src/modules/overseas-master-data/index.ts b/src/modules/overseas-master-data/index.ts
index 32e76b27..7893dd60 100644
--- a/src/modules/overseas-master-data/index.ts
+++ b/src/modules/overseas-master-data/index.ts
@@ -1,4 +1,5 @@
 export { overseasMasterDataRoutes } from './routes'
+export { inquiryReturnTarget } from './inquiryNavigation'
 export { overseasMasterDataPermissions } from './permissions'
 export type * from './types'
 export { default as TransportRouteDialog } from './components/TransportRouteDialog.vue'
diff --git a/src/modules/overseas-master-data/inquiryNavigation.test.ts b/src/modules/overseas-master-data/inquiryNavigation.test.ts
new file mode 100644
index 00000000..75a3ff6c
--- /dev/null
+++ b/src/modules/overseas-master-data/inquiryNavigation.test.ts
@@ -0,0 +1,16 @@
+import { expect, it } from 'vitest'
+import { inquiryReturnTarget, inquirySourceQuery, inquiryOrderTarget } from './inquiryNavigation'
+import type { CapacityInquiry } from './capacityOfferTypes'
+
+it('returns only to a fixed internal inquiry route and rejects malformed or repeated values', () => {
+  expect(inquiryReturnTarget(inquirySourceQuery({ offerNo: 'FO-1', bookingNo: 'FB-2' }))).toEqual({ name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'FO-1' }, query: { inquiry: 'FB-2' } })
+  for (const value of ['https://example.com', '../FB-2', ['FB-2'], '', null]) expect(inquiryReturnTarget({ fleetSource: 'inquiry', fleetOfferNo: 'FO-1', fleetBookingNo: value })).toBeNull()
+  expect(inquiryReturnTarget({ returnTo: 'https://example.com' })).toBeNull()
+})
+it.each(['US_TRUCK', 'LOCAL_LOOSEBOARD'] as const)('opens %s using only its list permission and the business number', businessType => {
+  const row = { businessType, businessOrderNo: 'ORDER-1', offerNo: 'FO-1', bookingNo: 'FB-2' } as CapacityInquiry
+  const domain = businessType === 'US_TRUCK' ? 'truck' : 'looseboard'
+  expect(inquiryOrderTarget(row, permission => permission === `platform:overseas-business:${domain}:list`)).toMatchObject({ query: { orderNo: 'ORDER-1', fleetBookingNo: 'FB-2' } })
+  expect(inquiryOrderTarget(row, permission => permission.endsWith(':edit'))).toBeNull()
+  expect(inquiryOrderTarget({ ...row, businessOrderNo: null }, () => true)).toBeNull()
+})
diff --git a/src/modules/overseas-master-data/inquiryNavigation.ts b/src/modules/overseas-master-data/inquiryNavigation.ts
new file mode 100644
index 00000000..0fefd6a5
--- /dev/null
+++ b/src/modules/overseas-master-data/inquiryNavigation.ts
@@ -0,0 +1,16 @@
+import type { LocationQuery, RouteLocationRaw } from 'vue-router'
+import type { CapacityInquiry } from './capacityOfferTypes'
+
+const businessNo = (value: unknown): value is string => typeof value === 'string' && /^[A-Z][A-Z0-9-]{1,63}$/.test(value)
+export function inquirySourceQuery(row: Pick<CapacityInquiry, 'offerNo' | 'bookingNo'>) {
+  return { fleetSource: 'inquiry', fleetOfferNo: row.offerNo, fleetBookingNo: row.bookingNo }
+}
+export function inquiryReturnTarget(query: LocationQuery = {}): RouteLocationRaw | null {
+  if (query.fleetSource !== 'inquiry' || !businessNo(query.fleetOfferNo) || !businessNo(query.fleetBookingNo)) return null
+  return { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: query.fleetOfferNo }, query: { inquiry: query.fleetBookingNo } }
+}
+export function inquiryOrderTarget(row: CapacityInquiry, can: (permission: string) => boolean): RouteLocationRaw | null {
+  const domain = row.businessType === 'US_TRUCK' ? 'truck' : 'looseboard'
+  if (!row.businessOrderNo || !can(`platform:overseas-business:${domain}:list`)) return null
+  return { name: domain === 'truck' ? 'overseas-business-trucks' : 'overseas-business-looseboards', query: { orderNo: row.businessOrderNo, ...inquirySourceQuery(row) } }
+}
diff --git a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
index d2a9ccd4..24f21641 100644
--- a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
@@ -14,16 +14,30 @@ import CapacityInquiryFulfillment from '../components/CapacityInquiryFulfillment
 import CapacityInquiryDialog from '../components/CapacityInquiryDialog.vue'
 import { getCapacityOffer, getCapacityInquiry, listCapacityInquiries } from '../api/capacityOffers'
 import { offerStatusLabels, offerTime, loadText, type CapacityOfferDetail, type CapacityInquiry, type InquiryResult } from '../capacityOfferTypes'
+import { inquirySourceQuery, inquiryOrderTarget } from '../inquiryNavigation'
 import { useCapacityInquiryCommands } from '../useCapacityInquiryCommands'
 const route = useRoute(), router = useRouter(), access = useAccessPreviewStore()
 const detail = ref<CapacityOfferDetail | null>(null), loading = ref(false), error = ref<ApiErrorDetails | null>(null), inquiryError = ref<ApiErrorDetails | null>(null)
 const page = ref(1), size = ref(20), inquiryLoading = ref(false), editorOpen = ref(false), editing = ref<CapacityInquiry | null>(null), readonly = ref(false)
 const confirmMode = ref(false)
 const fulfillmentOpen = ref(false), fulfillmentRow = ref<CapacityInquiry | null>(null), fulfillmentMode = ref<'incoming' | 'receipt' | 'bind' | 'view'>('view')
+async function fulfillmentSaved() {
+  const row = fulfillmentRow.value
+  fulfillmentOpen.value = false
+  if (!row) return
+  const current = ++followupSequence
+  await load()
+  try {
+    const updated = await getCapacityInquiry(row.bookingNo)
+    if (current === followupSequence) await action('view', updated)
+  } catch (cause) { if (current === followupSequence) error.value = getApiErrorDetails(cause, '操作已完成，下一步进度读取失败，请刷新原登记') }
+}
+let followupSequence = 0
 function openFulfillment(key: string, row: CapacityInquiry) {
+  if (key === 'business-order') { const target = inquiryOrderTarget(row, access.can); if (target) void router.push(target); return true }
   if (key === 'appointment' && access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')) { void router.push({ name: 'appointment-calendar', query: { sourceKey: `BOOKING:${row.bookingNo}`, customerId: row.customerId, destinationKey: row.cargo.destinationKey } }); return true }
-  if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } }); return true }
-  if (key === 'trip' && row.dispatchNo && access.can('platform:fleet:trip:list')) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo } }); return true }
+  if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo }, query: inquirySourceQuery(row) }); return true }
+  if (key === 'trip' && row.dispatchNo && access.can('platform:fleet:trip:list')) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo }, query: inquirySourceQuery(row) }); return true }
   if (!['incoming', 'receipt', 'bind', 'fulfillment'].includes(key)) return false
   editorOpen.value = false
   fulfillmentRow.value = row; fulfillmentMode.value = key === 'fulfillment' ? 'view' : key as 'incoming' | 'receipt' | 'bind'; fulfillmentOpen.value = true
@@ -39,6 +53,11 @@ async function load() {
     const value = await getCapacityOffer(String(route.params.offerNo))
     let checked: CapacityInquiry | null = null
     if (editing.value && editorOpen.value) checked = value.inquiries.records.find(row => row.bookingNo === editing.value?.bookingNo) || await getCapacityInquiry(editing.value.bookingNo)
+    if (typeof route.query?.inquiry === 'string' && /^[A-Z][A-Z0-9-]{1,63}$/.test(route.query.inquiry)) {
+      const returned = await getCapacityInquiry(route.query.inquiry)
+      if (returned.offerNo !== value.offer.offerNo) throw new Error('登记不属于当前发布')
+      if (current === sequence) { checked = returned; readonly.value = true; confirmMode.value = false; editorOpen.value = true }
+    }
     if (current === sequence) { resetting = true; detail.value = value; if (checked) editing.value = checked; page.value = value.inquiries.page; size.value = value.inquiries.size; queueMicrotask(() => { resetting = false }) }
   }
   catch (cause) { if (current === sequence) { detail.value = null; error.value = getApiErrorDetails(cause, '发布详情读取失败') } }
@@ -61,14 +80,14 @@ function accept(value: InquiryResult) {
   for (const row of rows) { row.offerRecordVersion = value.offer.recordVersion; row.tripRecordVersion = value.offer.tripRecordVersion }
 }
 const commands = useCapacityInquiryCommands('capacity-offer-command', accept)
-async function action(key: string, row: CapacityInquiry) { if (openFulfillment(key, row)) return; if (key === 'cancel') await commands.run(row, key); else { if (key === 'confirm' && !access.can('platform:fleet:capacity-offer:manage')) return; confirmMode.value = key === 'confirm'; editing.value = row; readonly.value = key !== 'edit' && key !== 'confirm'; editorOpen.value = true } }
+async function action(key: string, row: CapacityInquiry) { followupSequence++; if (openFulfillment(key, row)) return; if (key === 'cancel') await commands.run(row, key); else { if (key === 'confirm' && !access.can('platform:fleet:capacity-offer:manage')) return; confirmMode.value = key === 'confirm'; editing.value = row; readonly.value = key !== 'edit' && key !== 'confirm'; editorOpen.value = true } }
 function create() { if (!canCreate.value) return; confirmMode.value = false; editing.value = null; readonly.value = false; editorOpen.value = true }
-watch(() => [route.name, route.params.offerNo], ([name, offerNo]) => {
+watch(() => [route.name, route.params.offerNo, route.query?.inquiry], ([name, offerNo]) => {
   if (name !== 'overseas-master-data-capacity-offer-detail' || typeof offerNo !== 'string' || !offerNo) return
-  detail.value = null; editorOpen.value = false; void load()
+  followupSequence++; detail.value = null; editorOpen.value = false; void load()
 }, { immediate: true })
 watch([page, size], loadInquiries)
-onBeforeUnmount(() => { sequence++; inquirySequence++ })
+onBeforeUnmount(() => { followupSequence++; sequence++; inquirySequence++ })
 </script>
 <template><AdminPage class="admin-density"><DetailPageLayout class="density-detail-layout surface-panel" aria-label="运力发布详情">
   <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-master-data-capacity-offers' })">返回拼车接货</el-button><h1 class="density-detail-title">{{ detail?.offer.offerNo || '运力发布详情' }}</h1><span v-if="detail">{{ offerStatusLabels[detail.offer.status] }}</span></div><div class="density-actions"><el-button :loading="loading" @click="load">重新核对</el-button><el-button v-if="hasCreatePermission" type="primary" :disabled="loading || !canCreate" @click="create">登记客户货物</el-button></div></div></template>
@@ -82,7 +101,7 @@ onBeforeUnmount(() => { sequence++; inquirySequence++ })
     <LoadErrorState v-if="inquiryError || commands.error.value" title="意向操作未完成" :message="(inquiryError || commands.error.value)?.message" @retry="commands.state.pending ? commands.retry() : loadInquiries()"><template #details><ApiErrorMeta :details="(inquiryError || commands.error.value)!" /></template></LoadErrorState><el-button v-if="commands.state.pending" :loading="commands.busy.value" @click="commands.retry">重试原操作</el-button>
     <CapacityInquiryTable v-model:page="page" v-model:size="size" :rows="detail.inquiries.records" :total="detail.inquiries.total" :loading="inquiryLoading" :failed="!!inquiryError" :busy="commands.busy.value" @action="action" />
   </template></div>
-  <CapacityInquiryFulfillment v-model="fulfillmentOpen" :inquiry="fulfillmentRow" :mode="fulfillmentMode" @saved="load" />
+  <CapacityInquiryFulfillment v-model="fulfillmentOpen" :inquiry="fulfillmentRow" :mode="fulfillmentMode" @saved="fulfillmentSaved" />
   <CapacityInquiryDialog v-model="editorOpen" :offer="detail?.offer || null" :inquiry="editing" :readonly="readonly" :confirm-mode="confirmMode" @action="action" @saved="accept" @refresh="load" />
 </DetailPageLayout></AdminPage></template>
 <style scoped>.capacity-section-title{font-size:var(--admin-font-section);margin:var(--admin-space-6) 0 var(--admin-space-3)}</style>
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index ecb84e8f..a74728ac 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -11,7 +11,7 @@ import { useUnsavedWorkStore } from '@/core/unsaved-work/unsavedWork'
 import * as api from '../api/capacityOffers'
 import type { CapacityOffer, CapacityInquiry } from '../capacityOfferTypes'
 import type { FleetTrip } from '../tripTypes'
-const state = vi.hoisted(() => ({ manage: false, write: true, quote: false, links: new Set<string>(), route: { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'CO-1' } }, push: vi.fn() }))
+const state = vi.hoisted(() => ({ manage: false, write: true, quote: false, links: new Set<string>(), route: { query: {} as Record<string, string>, name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'CO-1' } }, push: vi.fn() }))
 vi.mock('vue-router', () => ({ useRoute: () => state.route, useRouter: () => ({ push: state.push }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (p: string) => state.links.has(p) || (p === 'platform:fleet:capacity-offer:manage' ? state.manage : p === 'platform:fleet:quote:list' ? state.quote : p === 'platform:fleet:capacity-offer:list' || p.includes(':inquiry-') && state.write) }) }))
 vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn().mockResolvedValue(undefined) } }))
@@ -36,7 +36,7 @@ function mount(component: object, props: Record<string, unknown> = {}): { wrappe
   } } }); wrappers.push(wrapper); return { wrapper, pinia }
 }
 const button = (w: VueWrapper, label: string) => w.findAll('button').find(b => b.text() === label)!
-beforeEach(() => { vi.clearAllMocks(); state.manage = false; state.write = true; state.quote = false; state.links.clear(); vi.mocked(ElMessageBox.confirm).mockImplementation(vi.fn().mockResolvedValue(undefined)); vi.mocked(api.listCapacityOffers).mockResolvedValue(pageOf([structuredClone(offer)], 41)); vi.mocked(api.listCapacityInquiries).mockResolvedValue(pageOf([structuredClone(inquiry)])); vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer: structuredClone(offer), inquiries: pageOf([structuredClone(inquiry)]) }) })
+beforeEach(() => { state.route.query = {}; vi.clearAllMocks(); state.manage = false; state.write = true; state.quote = false; state.links.clear(); vi.mocked(ElMessageBox.confirm).mockImplementation(vi.fn().mockResolvedValue(undefined)); vi.mocked(api.listCapacityOffers).mockResolvedValue(pageOf([structuredClone(offer)], 41)); vi.mocked(api.listCapacityInquiries).mockResolvedValue(pageOf([structuredClone(inquiry)])); vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer: structuredClone(offer), inquiries: pageOf([structuredClone(inquiry)]) }) })
 afterEach(() => { wrappers.splice(0).forEach(w => w.unmount()); vi.useRealTimers() })
 it.each(['DRAFT', 'CONFIRMED', 'RECEIVED', 'BOUND', 'CANCELLED'] as const)('labels %s cargo consistently in the list and detail without treating estimated pallets as actual', async status => {
   const row: CapacityInquiry = { ...inquiry, status, expectedPalletCount: 7, cargo: { ...inquiry.cargo, packageCount: 12, palletSpaces: 3, weightKg: 80, volumeCbm: 2 } }
@@ -195,9 +195,9 @@ it.each([CapacityOffersView, CapacityOfferDetailView])('opens the bound trip sep
   const { wrapper } = mount(component); await flushPromises()
   const dialog = wrapper.findComponent(CapacityInquiryDialog)
   dialog.vm.$emit('action', 'dispatch', row); await flushPromises()
-  expect(state.push).toHaveBeenLastCalledWith({ name: 'overseas-dispatch-detail', params: { dispatchNo: 'DS-BOUND' } })
+  expect(state.push).toHaveBeenLastCalledWith({ name: 'overseas-dispatch-detail', params: { dispatchNo: 'DS-BOUND' }, query: { fleetSource: 'inquiry', fleetOfferNo: row.offerNo, fleetBookingNo: row.bookingNo } })
   dialog.vm.$emit('action', 'trip', row); await flushPromises()
-  expect(state.push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo } })
+  expect(state.push).toHaveBeenLastCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo }, query: { fleetSource: 'inquiry', fleetOfferNo: row.offerNo, fleetBookingNo: row.bookingNo } })
   expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
   state.links.clear(); state.push.mockClear()
   dialog.vm.$emit('action', 'trip', row); dialog.vm.$emit('action', 'dispatch', row); await flushPromises()
@@ -279,3 +279,42 @@ it('prioritizes the allowed current list action and keeps other actions in the o
   await wrapper.setProps({ rows: [{ ...inquiry, progress: { ...inquiry.progress, primaryAction: 'INCOMING' } }] })
   expect(primary()).toBe('incoming')
 })
+
+it('shows the business identity and exposes the order link only with its list permission', async () => {
+  const row = { ...inquiry, businessOrderNo: 'ORDER-1' }
+  const { wrapper } = mount(CapacityInquiryDialog, { modelValue: true, offer, inquiry: row, readonly: true })
+  await flushPromises()
+  const summary = wrapper.get('[aria-label="本票处理进度"]').text()
+  expect(summary).toContain(row.tripNo); expect(summary).toContain(row.bookingNo)
+  expect(summary).toContain(row.customerName); expect(summary).toContain(row.destinationLabel)
+  expect(button(wrapper, 'ORDER-1')).toBeUndefined()
+  state.links.add('platform:overseas-business:truck:list')
+  await wrapper.setProps({ inquiry: { ...row } }); await flushPromises()
+  await button(wrapper, 'ORDER-1').trigger('click')
+  expect(wrapper.emitted('action')?.[0]).toEqual(['business-order', row])
+})
+it('reopens a returned inquiry through an authorized fetch and refuses a different offer', async () => {
+  state.route.query = { inquiry: inquiry.bookingNo }
+  vi.mocked(api.getCapacityInquiry).mockResolvedValue(inquiry)
+  const { wrapper } = mount(CapacityOfferDetailView); await flushPromises()
+  const editor = wrapper.findComponent({ name: 'CapacityInquiryDialog' })
+  expect(editor.props('modelValue')).toBe(true); expect(editor.props('readonly')).toBe(true)
+  expect(editor.props('inquiry').bookingNo).toBe(inquiry.bookingNo)
+  wrapper.unmount()
+  vi.mocked(api.getCapacityInquiry).mockResolvedValue({ ...inquiry, offerNo: 'FO-OTHER' })
+  const rejected = mount(CapacityOfferDetailView).wrapper; await flushPromises()
+  expect(rejected.findComponent({ name: 'CapacityInquiryDialog' }).props('modelValue')).toBe(false)
+  expect(rejected.findComponent({ name: 'LoadErrorState' }).exists()).toBe(true)
+})
+it('opens refreshed server guidance after fulfillment succeeds without replaying a write', async () => {
+  state.manage = true
+  const { wrapper } = mount(CapacityOffersView); await flushPromises()
+  const updated = { ...inquiry, status: 'BOUND' as const, progress: { ...inquiry.progress, primaryAction: 'VIEW', message: '服务端下一待办', owner: '审核 / 仓库' } }
+  vi.mocked(api.getCapacityInquiry).mockResolvedValue(updated)
+  wrapper.findComponent({ name: 'CapacityInquiryTable' }).vm.$emit('action', 'bind', inquiry); await flushPromises()
+  wrapper.findComponent({ name: 'CapacityInquiryFulfillment' }).vm.$emit('saved'); await flushPromises()
+  const editor = wrapper.findComponent({ name: 'CapacityInquiryDialog' })
+  expect(editor.props('modelValue')).toBe(true); expect(editor.props('readonly')).toBe(true)
+  expect(editor.props('inquiry').progress.message).toBe('服务端下一待办')
+  expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
+})
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersView.vue b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
index 050af4df..4bbcc950 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOffersView.vue
@@ -15,6 +15,7 @@ import CapacityInquiryFulfillment from '../components/CapacityInquiryFulfillment
 import CapacityInquiryDialog from '../components/CapacityInquiryDialog.vue'
 import { listCapacityOffers, listCapacityInquiries, getCapacityOffer, getCapacityInquiry } from '../api/capacityOffers'
 import { offerStatusLabels, inquiryStatusLabels, offerTime, loadText, type CapacityOffer, type CapacityInquiry, type InquiryResult, type OfferQuery, type InquiryQuery } from '../capacityOfferTypes'
+import { inquirySourceQuery, inquiryOrderTarget } from '../inquiryNavigation'
 import { useCapacityInquiryCommands } from '../useCapacityInquiryCommands'
 const router = useRouter(), access = useAccessPreviewStore()
 const manage = computed(() => access.can('platform:fleet:capacity-offer:manage'))
@@ -25,10 +26,23 @@ const offers = ref<CapacityOffer[]>([]), inquiries = ref<CapacityInquiry[]>([])
 const editorOpen = ref(false), editing = ref<CapacityInquiry | null>(null), selectedOffer = ref<CapacityOffer | null>(null), readonly = ref(true)
 const confirmMode = ref(false)
 const fulfillmentOpen = ref(false), fulfillmentRow = ref<CapacityInquiry | null>(null), fulfillmentMode = ref<'incoming' | 'receipt' | 'bind' | 'view'>('view')
+async function fulfillmentSaved() {
+  const row = fulfillmentRow.value
+  fulfillmentOpen.value = false
+  if (!row) return
+  const current = ++followupSequence
+  await load()
+  try {
+    const updated = await getCapacityInquiry(row.bookingNo)
+    if (current === followupSequence) await inquiryAction('view', updated)
+  } catch (cause) { if (current === followupSequence) error.value = getApiErrorDetails(cause, '操作已完成，下一步进度读取失败，请刷新原登记') }
+}
+let followupSequence = 0
 function openFulfillment(key: string, row: CapacityInquiry) {
+  if (key === 'business-order') { const target = inquiryOrderTarget(row, access.can); if (target) void router.push(target); return true }
   if (key === 'appointment' && access.can('platform:appointment:list') && access.can('platform:overseas-warehouse:last-mile-order:list')) { void router.push({ name: 'appointment-calendar', query: { sourceKey: `BOOKING:${row.bookingNo}`, customerId: row.customerId, destinationKey: row.cargo.destinationKey } }); return true }
-  if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo } }); return true }
-  if (key === 'trip' && row.dispatchNo && access.can('platform:fleet:trip:list')) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo } }); return true }
+  if (key === 'dispatch' && row.dispatchNo && access.can('platform:overseas-warehouse:dispatch:list')) { void router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo: row.dispatchNo }, query: inquirySourceQuery(row) }); return true }
+  if (key === 'trip' && row.dispatchNo && access.can('platform:fleet:trip:list')) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: row.tripNo }, query: inquirySourceQuery(row) }); return true }
   if (!['incoming', 'receipt', 'bind', 'fulfillment'].includes(key)) return false
   editorOpen.value = false
   fulfillmentRow.value = row; fulfillmentMode.value = key === 'fulfillment' ? 'view' : key as 'incoming' | 'receipt' | 'bind'; fulfillmentOpen.value = true
@@ -83,6 +97,7 @@ function accept(value: InquiryResult) {
 }
 const commands = useCapacityInquiryCommands('capacity-pool-command', accept)
 async function inquiryAction(key: string, row: CapacityInquiry) {
+  followupSequence++
   if (openFulfillment(key, row)) return
   if (key === 'cancel') { await commands.run(row, key); return }
   if (key === 'confirm' && !manage.value) return
@@ -103,7 +118,7 @@ async function recheckEditor() {
     if (current === editorSequence) { selectedOffer.value = detail.offer; editing.value = checked }
   } catch (cause) { if (current === editorSequence) error.value = getApiErrorDetails(cause, '最新意向核对失败') }
 }
-watch([tab, page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++; editorSequence++ })
+watch([tab, page, size], load); onMounted(load); onBeforeUnmount(() => { followupSequence++; sequence++; editorSequence++ })
 </script>
 <template><AdminPage class="admin-density"><ListPageLayout aria-label="拼车接货">
   <DataTable v-if="tab === 'offers'" appearance="integrated" :stripe="false" preference-key="fleet-capacity-offers" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="offers" :columns="columns" :loading="loading" :total="total" row-key="offerNo" :empty-text="Object.values(applied).some(Boolean) ? '当前筛选条件下暂无运力发布' : '暂无获准查看的运力发布'">
@@ -133,6 +148,6 @@ watch([tab, page, size], load); onMounted(load); onBeforeUnmount(() => { sequenc
     </template>
     <template #notices><LoadErrorState v-if="error || commands.error.value" title="意向操作未完成" :message="(error || commands.error.value)?.message" @retry="commands.state.pending ? commands.retry() : load()"><template #details><ApiErrorMeta :details="(error || commands.error.value)!" /></template></LoadErrorState><el-button v-if="commands.state.pending" :loading="commands.busy.value" @click="commands.retry">重试原操作</el-button></template>
   </CapacityInquiryTable>
-  <CapacityInquiryFulfillment v-model="fulfillmentOpen" :inquiry="fulfillmentRow" :mode="fulfillmentMode" @saved="load" />
+  <CapacityInquiryFulfillment v-model="fulfillmentOpen" :inquiry="fulfillmentRow" :mode="fulfillmentMode" @saved="fulfillmentSaved" />
   <CapacityInquiryDialog v-model="editorOpen" :offer="selectedOffer" :inquiry="editing" :readonly="readonly" :confirm-mode="confirmMode" @action="inquiryAction" @saved="accept" @refresh="recheckEditor" />
 </ListPageLayout></AdminPage></template>
diff --git a/src/modules/overseas-master-data/pages/TripDetailView.vue b/src/modules/overseas-master-data/pages/TripDetailView.vue
index 68b133e7..b8a92ba0 100644
--- a/src/modules/overseas-master-data/pages/TripDetailView.vue
+++ b/src/modules/overseas-master-data/pages/TripDetailView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { inquiryReturnTarget } from '../inquiryNavigation'
 import TripDispatchSelector from '../components/TripDispatchSelector.vue'
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -185,7 +186,7 @@ onBeforeUnmount(() => { generation++; inspectionSequence++; historySequence++ })
 </script>
 <template>
   <AdminPage class="admin-density"><DetailPageLayout class="density-detail-layout surface-panel" aria-label="车次详情">
-    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-master-data-trips' })">返回车次列表</el-button><h1 class="density-detail-title">{{ detail?.trip.tripNo || '车次详情' }}</h1><span v-if="detail">{{ tripStatusLabels[detail.trip.status] }}</span></div><div class="density-actions"><el-button :disabled="!!busy" @click="load">刷新车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage')" @click="offerSettingsOpen = true">发布拼车余位</el-button><el-button v-if="editable" :disabled="!!busy" @click="editorOpen = true">编辑计划</el-button><el-button v-if="planned && access.can(permission.tripCancel)" type="danger" plain :disabled="!!busy || !!detail?.dispatches.length" @click="cancel">取消车次</el-button></div></div></template>
+    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push(inquiryReturnTarget(route.query) || { name: 'overseas-master-data-trips' })">{{ inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回车次列表' }}</el-button><h1 class="density-detail-title">{{ detail?.trip.tripNo || '车次详情' }}</h1><span v-if="detail">{{ tripStatusLabels[detail.trip.status] }}</span></div><div class="density-actions"><el-button :disabled="!!busy" @click="load">刷新车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage')" @click="offerSettingsOpen = true">发布拼车余位</el-button><el-button v-if="editable" :disabled="!!busy" @click="editorOpen = true">编辑计划</el-button><el-button v-if="planned && access.can(permission.tripCancel)" type="danger" plain :disabled="!!busy || !!detail?.dispatches.length" @click="cancel">取消车次</el-button></div></div></template>
     <LoadErrorState v-if="error" title="车次详情加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="operationError" title="操作未完成" :message="operationError.message" @retry="load"><template #details><ApiErrorMeta :details="operationError" /></template></LoadErrorState>
     <div v-loading="loading"><template v-if="detail">
diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts b/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts
index 7983f1be..6d71d062 100644
--- a/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts
@@ -5,13 +5,15 @@ import { getDispatch } from '../api/dispatches'
 import DispatchDetailView from './DispatchDetailView.vue'
 import { DataTableStub } from './phase5TestStubs'
 
+const sourceQuery = vi.hoisted(() => ({} as Record<string, string>))
 const routerPush = vi.hoisted(() => vi.fn())
-vi.mock('vue-router', () => ({ useRoute: () => ({ params: { dispatchNo: 'PC/1' } }), useRouter: () => ({ push: routerPush }) }))
+vi.mock('vue-router', () => ({ useRoute: () => ({ params: { dispatchNo: 'PC/1' }, query: sourceQuery }), useRouter: () => ({ push: routerPush }) }))
 vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn() }))
 
 describe('DispatchDetailView', () => {
   beforeEach(() => {
     routerPush.mockReset()
+    Object.keys(sourceQuery).forEach(key => delete sourceQuery[key])
     vi.mocked(getDispatch).mockReset().mockResolvedValue({
       id: '1', dispatchNo: 'PC/1', vehiclePlate: 'CA-100', driverName: '张师傅', status: 'PENDING_DEPARTURE',
       route: 'LAX → ONT8', items: [{ id: '11', planPalletId: '20', orderNo: 'LM-1', warehousePalletId: '21', fbaWarehouseCode: 'ONT8', grossWeightKg: 88.5, volumeCbm: 1.25 }],
@@ -40,4 +42,13 @@ describe('DispatchDetailView', () => {
     expect(wrapper.findComponent(DataTableStub).props('data')).toEqual([expect.objectContaining({ weight: null })])
     wrapper.unmount()
   })
+  it.each([false, true])('returns to the original inquiry only for a valid source: %s', async fromInquiry => {
+    if (fromInquiry) Object.assign(sourceQuery, { fleetSource: 'inquiry', fleetOfferNo: 'FO-1', fleetBookingNo: 'FB-2' })
+    const wrapper = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } })
+    await flushPromises()
+    wrapper.findComponent({ name: 'OverseasDetailShell' }).vm.$emit('back')
+    expect(routerPush).toHaveBeenCalledWith(fromInquiry ? { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'FO-1' }, query: { inquiry: 'FB-2' } } : { name: 'overseas-dispatches' })
+    wrapper.unmount()
+  })
+
 })
diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
index ad0443a8..a8b15b49 100644
--- a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { inquiryReturnTarget } from '@/modules/overseas-master-data'
 import { physicalWeightKg } from '../dispatchPhysicalWeight'
 import '@/styles/adminDensity.css'
 import { computed, onMounted, ref } from 'vue'
@@ -128,13 +129,13 @@ async function load() {
   catch (error) { loadError.value = getApiErrorDetails(error, '排车详情加载失败，请重试') }
   finally { loading.value = false }
 }
-function back() { void router.push({ name: 'overseas-dispatches' }) }
+function back() { void router.push(inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' }) }
 
 onMounted(load)
 </script>
 
 <template>
-  <OverseasDetailShell class="admin-density" dense title="排车详情" reference-label="排车单号" :reference-value="detail?.dispatchNo || dispatchNo" back-label="返回排车列表" domain="排车详情" :pending="false" :status-text="detail ? dispatchStatus(detail.status) : '加载中'" @back="back">
+  <OverseasDetailShell class="admin-density" dense title="排车详情" reference-label="排车单号" :reference-value="detail?.dispatchNo || dispatchNo" :back-label="inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表'" domain="排车详情" :pending="false" :status-text="detail ? dispatchStatus(detail.status) : '加载中'" @back="back">
     <LoadErrorState v-if="loadError" title="排车详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <div v-else v-loading="loading" class="dispatch-detail" :aria-busy="loading">
       <div class="summary-grid">
diff --git a/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts b/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts
index 11ca46e8..7ad70e0b 100644
--- a/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts
+++ b/src/modules/overseas-warehouse/pages/InboundOrdersView.appointment.test.ts
@@ -1,24 +1,37 @@
 import { flushPromises, mount } from '@vue/test-utils'
-import { expect, it, vi } from 'vitest'
+import { beforeEach, expect, it, vi } from 'vitest'
 import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import InboundOrdersView from './InboundOrdersView.vue'
 import { getFbaAppointment, updateFbaAppointment } from '../api/inboundOrders'
 vi.mock('vue-router', () => ({ useRouter: () => ({push: vi.fn()}), onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
-vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({can: () => true}) }))
+const access=vi.hoisted(()=>({canWrite:true}))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({can: (permission:string) => !permission.endsWith(':fba-appointment') || access.canWrite}) }))
 vi.mock('../api/inboundOrders', () => ({
   listInboundOrders: vi.fn().mockResolvedValue({records:[{lineId:'1',planNo:'IP-1',customerId:'A',appointmentNo:'AP-1',fbaWarehouseCode:'ONT8'}],total:1}),
   getFbaAppointment: vi.fn(), updateFbaAppointment: vi.fn(), createFbaAppointment: vi.fn(), updateInboundPlan: vi.fn(),
 }))
 vi.mock('element-plus', () => ({ ElMessage: {warning:vi.fn(),success:vi.fn()} }))
-it('keeps the inbound appointment retry across close, reopen and route attempts', async () => {
-  vi.mocked(getFbaAppointment).mockResolvedValue({id:'1',appointmentNo:'AP-1',version:2,originWarehouseId:'100',fbaWarehouseCode:'ONT8',appointmentStatus:'PENDING',selectedCount:1,items:[]})
-  vi.mocked(updateFbaAppointment).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({} as never)
-  const wrapper=mount(InboundOrdersView,{global:{directives:{loading:{}},stubs:{
+const render=()=>mount(InboundOrdersView,{global:{directives:{loading:{}},stubs:{
     AdminPage:{template:'<main><slot/></main>'},ListPageLayout:{template:'<div><slot/></div>'},
     DataTable:{props:['data'],template:'<div><slot v-for="row in data" name="actions" :row="row"/></div>'},
-    AppDialog:{name:'AppDialog',props:['modelValue','beforeClose'],template:'<section v-if="modelValue"><slot/><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save @click="$emit(\'confirm\')">保存</button></section>'},
+    AppDialog:{name:'AppDialog',props:['modelValue','beforeClose','showConfirm'],template:'<section v-if="modelValue"><slot/><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button v-if="showConfirm !== false" data-save @click="$emit(\'confirm\')">保存</button></section>'},
     ElButton:{template:'<button><slot/></button>'}, FbaAppointmentFields:true,SmartDispatchDialog:true,QueryToolbar:true,OperationErrorToast:true,
   }}})
+beforeEach(()=>{vi.clearAllMocks();access.canWrite=true;vi.mocked(getFbaAppointment).mockResolvedValue({id:'1',appointmentNo:'AP-1',version:2,originWarehouseId:'100',fbaWarehouseCode:'ONT8',appointmentStatus:'PENDING',selectedCount:1,items:[]})})
+it('opens linked appointment details for list-only users and blocks saving',async()=>{
+  access.canWrite=false
+  const wrapper=render();await flushPromises()
+  expect(wrapper.findAll('button').some(b=>b.text()==='预约')).toBe(false)
+  await wrapper.findAll('button').find(b=>b.text()==='查看预约')!.trigger('click');await flushPromises()
+  expect(getFbaAppointment).toHaveBeenCalledWith('AP-1')
+  expect(wrapper.findComponent({name:'FbaAppointmentFields'}).props('disabled')).toBe(true)
+  expect(wrapper.find('[data-save]').exists()).toBe(false)
+  wrapper.findComponent({name:'AppDialog'}).vm.$emit('confirm');await flushPromises()
+  expect(updateFbaAppointment).not.toHaveBeenCalled();wrapper.unmount()
+})
+it('keeps the inbound appointment retry across close, reopen and route attempts', async () => {
+  vi.mocked(updateFbaAppointment).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({} as never)
+  const wrapper=render()
   await flushPromises()
   const open=()=>wrapper.findAll('button').find(b=>b.text()==='预约')!.trigger('click')
   await open();await flushPromises();await wrapper.get('[data-save]').trigger('click');await flushPromises()
diff --git a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
index 44a3b7d7..48505b71 100644
--- a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
@@ -58,7 +58,9 @@ const appointmentVersion = ref(0)
 const appointmentForm = reactive(createAppointmentForm())
 const appointmentTimezone = ref<string | null>(null)
 const pendingAppointment = ref<{appointmentNo: string | null; version: number; originWarehouseId: string; fbaWarehouseCode: string; lineIds: string[]; details: ReturnType<typeof appointmentPayload>; idempotencyKey: string} | null>(null)
-const appointmentTitle = computed(() => appointmentMode.value === 'edit' ? '编辑预约' : '预约')
+const appointmentViewOnly = ref(false)
+const appointmentReadOnly = computed(() => appointmentViewOnly.value || !access.can(permission.inboundOrderAppointment))
+const appointmentTitle = computed(() => appointmentReadOnly.value ? '查看预约' : appointmentMode.value === 'edit' ? '编辑预约' : '预约')
 const planEditOpen = ref(false); const planEditLoading = ref(false); const planEditSaving = ref(false); const planEditTarget = ref<InboundOrderListItem | null>(null); const planEditForm = reactive({ warehouseId: '', warehouseCode: '', warehouseName: '', version: 0 }); const warehouses = ref<ReceivingOverseasWarehouseDto[]>([])
 
 function selectableRow(source: object) {
@@ -127,7 +129,8 @@ function selectionError() {
 }
 
 function openAppointment() {
-  if (!canLeaveAppointment()) return
+  if (!access.can(permission.inboundOrderAppointment) || !canLeaveAppointment()) return
+  appointmentViewOnly.value = false
   const error = selectionError()
   if (error) { ElMessage.warning(error); return }
   appointmentMode.value = 'create'; editingAppointmentNo.value = ''
@@ -142,10 +145,11 @@ function openSmartDispatch() {
   smartDispatchOpen.value = true
 }
 
-async function openAppointmentEdit(source: object) {
+async function openAppointmentEdit(source: object, readOnly = false) {
   if (!canLeaveAppointment()) return
   const row = source as InboundOrderListItem
   if (!row.appointmentNo || row.appointmentNo === '—') return
+  appointmentViewOnly.value = readOnly
   appointmentMode.value = 'edit'; editingAppointmentNo.value = row.appointmentNo
   appointmentLoading.value = true; mutationError.value = null; appointmentOpen.value = true
   try {
@@ -169,7 +173,7 @@ function beforeCloseAppointment(done: () => void) { if (canLeaveAppointment()) d
 onBeforeRouteLeave(canLeaveAppointment)
 onBeforeRouteUpdate(canLeaveAppointment)
 async function submitAppointment() {
-  if (saving.value || appointmentLoading.value) return
+  if (appointmentReadOnly.value || saving.value || appointmentLoading.value) return
   if (appointmentMode.value === 'create') { const error = selectionError(); if (error) { ElMessage.warning(error); return } }
   const validation = appointmentFormError(appointmentForm)
   if (!pendingAppointment.value && validation) { ElMessage.warning(validation); return }
@@ -220,14 +224,14 @@ onMounted(() => { void load() })
 
 
       <template #toolbar-actions><el-button v-if="access.can(permission.inboundOrderAppointment)" plain :disabled="!selectedRows.length" @click="openAppointment"><CalendarCheck2 :size="16" />预约</el-button><el-button v-if="access.can(permission.inboundOrderSmartDispatch)" type="primary" @click="openSmartDispatch"><Truck :size="16" />智能排车</el-button></template>
-      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" @click="openPlanEdit(row)">编辑</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" @click="openAppointmentEdit(row)">预约</el-button></div></template>
+      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" @click="openPlanEdit(row)">编辑</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderList)" size="small" @click="openAppointmentEdit(row, true)">查看预约</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" @click="openAppointmentEdit(row)">预约</el-button></div></template>
       <template #pagination-left>共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>
   </ListPageLayout>
-  <AppDialog class="admin-density-dialog" :model-value="appointmentOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :title="appointmentTitle" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingAppointment ? '重试本次保存' : '保存预约安排'" :confirm-loading="saving" @confirm="submitAppointment">
+  <AppDialog class="admin-density-dialog" :model-value="appointmentOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :title="appointmentTitle" :show-confirm="!appointmentReadOnly" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingAppointment ? '重试本次保存' : '保存预约安排'" :confirm-loading="saving" @confirm="submitAppointment">
     <div v-loading="appointmentLoading">
     <div class="appointment-summary">已选择 {{ appointmentSelectedCount }} 条，FBA仓库：{{ appointmentFbaWarehouse }}</div>
-    <FbaAppointmentFields :model="appointmentForm" :appointment-no="editingAppointmentNo || undefined" :timezone="appointmentTimezone" :disabled="saving || !!pendingAppointment" />
+    <FbaAppointmentFields :model="appointmentForm" :appointment-no="editingAppointmentNo || undefined" :timezone="appointmentTimezone" :disabled="appointmentReadOnly || appointmentLoading || saving || !!pendingAppointment" />
 
     </div>
   </AppDialog>
diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
index f65d9ab3..8eca76a7 100644
--- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
+++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
@@ -369,7 +369,8 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(detail).toContain('单据信息')
     expect(detail).toContain('关联订单明细')
     expect(detail).toContain(':data="relatedOrders"')
-    expect(detail).toContain("router.push({ name: 'overseas-dispatches' })")
+    expect(detail).toContain("router.push(inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' })")
+    expect(detail).toContain("inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表'")
     expect(detail).not.toContain('ElMessage.success')
   })
 

From f97cdad3538d22e8eef8bf473f785f1e55d2f081 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 16:11:58 +0800
Subject: [PATCH 45/47] fix: show inquiry return text on dispatch detail

---
 .../overseas-warehouse/components/OverseasDetailShell.vue    | 5 +++--
 .../overseas-warehouse/pages/DispatchDetailView.test.ts      | 4 +++-
 src/modules/overseas-warehouse/pages/DispatchDetailView.vue  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/overseas-warehouse/components/OverseasDetailShell.vue b/src/modules/overseas-warehouse/components/OverseasDetailShell.vue
index 83899620..fbee3fdc 100644
--- a/src/modules/overseas-warehouse/components/OverseasDetailShell.vue
+++ b/src/modules/overseas-warehouse/components/OverseasDetailShell.vue
@@ -11,6 +11,7 @@ withDefaults(defineProps<{
   referenceLabel: string
   referenceValue: string
   backLabel: string
+  backText?: string
   domain: string
   pending?: boolean
   statusText?: string
@@ -23,13 +24,13 @@ defineEmits<{ back: [] }>()
   <AdminPage as="div" class="overseas-detail-page" :class="{ 'admin-density': dense }" :aria-label="title">
     <header v-if="dense" class="density-detail-header">
       <div class="overseas-detail-title density-detail-heading">
-        <el-button link class="density-back" :aria-label="backLabel" @click="$emit('back')"><ArrowLeft :size="16" />返回列表</el-button>
+        <el-button link class="density-back" :aria-label="backLabel" @click="$emit('back')"><ArrowLeft :size="16" />{{ backText || '返回列表' }}</el-button>
         <h1 class="density-detail-title"><slot name="reference">{{ referenceValue }}</slot></h1>
         <StatusBadge v-if="statusText" :status="statusText" />
       </div>
     </header>
     <header v-else class="overseas-detail-head">
-      <el-button :class="{ 'density-back': dense }" :link="dense" :aria-label="backLabel" @click="$emit('back')"><ArrowLeft :size="16" />返回</el-button>
+      <el-button :class="{ 'density-back': dense }" :link="dense" :aria-label="backLabel" @click="$emit('back')"><ArrowLeft :size="16" />{{ backText || '返回' }}</el-button>
       <div class="overseas-detail-title">
         <h1>{{ title }}</h1>
         <p>{{ referenceLabel }} <strong><slot name="reference">{{ referenceValue }}</slot></strong></p>
diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts b/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts
index 6d71d062..c974bb7c 100644
--- a/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts
@@ -46,7 +46,9 @@ describe('DispatchDetailView', () => {
     if (fromInquiry) Object.assign(sourceQuery, { fleetSource: 'inquiry', fleetOfferNo: 'FO-1', fleetBookingNo: 'FB-2' })
     const wrapper = mount(DispatchDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub } } })
     await flushPromises()
-    wrapper.findComponent({ name: 'OverseasDetailShell' }).vm.$emit('back')
+    const backButton = wrapper.get('button.density-back')
+    expect(backButton.text()).toBe(fromInquiry ? '返回原拼车登记' : '返回列表')
+    await backButton.trigger('click')
     expect(routerPush).toHaveBeenCalledWith(fromInquiry ? { name: 'overseas-master-data-capacity-offer-detail', params: { offerNo: 'FO-1' }, query: { inquiry: 'FB-2' } } : { name: 'overseas-dispatches' })
     wrapper.unmount()
   })
diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
index a8b15b49..dcb1f0b6 100644
--- a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue
@@ -135,7 +135,7 @@ onMounted(load)
 </script>
 
 <template>
-  <OverseasDetailShell class="admin-density" dense title="排车详情" reference-label="排车单号" :reference-value="detail?.dispatchNo || dispatchNo" :back-label="inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表'" domain="排车详情" :pending="false" :status-text="detail ? dispatchStatus(detail.status) : '加载中'" @back="back">
+  <OverseasDetailShell class="admin-density" dense title="排车详情" reference-label="排车单号" :reference-value="detail?.dispatchNo || dispatchNo" :back-text="inquiryReturnTarget(route.query) ? '返回原拼车登记' : undefined" :back-label="inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表'" domain="排车详情" :pending="false" :status-text="detail ? dispatchStatus(detail.status) : '加载中'" @back="back">
     <LoadErrorState v-if="loadError" title="排车详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <div v-else v-loading="loading" class="dispatch-detail" :aria-busy="loading">
       <div class="summary-grid">

From 43611ecc5501b528c933084460a63ba905467ec9 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 19:33:25 +0800
Subject: [PATCH 46/47] fix: avoid duplicate inquiry fetch on capacity refresh

---
 .../pages/CapacityOfferDetailView.vue         |  3 +--
 .../pages/CapacityOffersBehavior.test.ts      | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
index 24f21641..c803d2fb 100644
--- a/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
+++ b/src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue
@@ -52,12 +52,11 @@ async function load() {
   try {
     const value = await getCapacityOffer(String(route.params.offerNo))
     let checked: CapacityInquiry | null = null
-    if (editing.value && editorOpen.value) checked = value.inquiries.records.find(row => row.bookingNo === editing.value?.bookingNo) || await getCapacityInquiry(editing.value.bookingNo)
     if (typeof route.query?.inquiry === 'string' && /^[A-Z][A-Z0-9-]{1,63}$/.test(route.query.inquiry)) {
       const returned = await getCapacityInquiry(route.query.inquiry)
       if (returned.offerNo !== value.offer.offerNo) throw new Error('登记不属于当前发布')
       if (current === sequence) { checked = returned; readonly.value = true; confirmMode.value = false; editorOpen.value = true }
-    }
+    } else if (editing.value && editorOpen.value) checked = value.inquiries.records.find(row => row.bookingNo === editing.value?.bookingNo) || await getCapacityInquiry(editing.value.bookingNo)
     if (current === sequence) { resetting = true; detail.value = value; if (checked) editing.value = checked; page.value = value.inquiries.page; size.value = value.inquiries.size; queueMicrotask(() => { resetting = false }) }
   }
   catch (cause) { if (current === sequence) { detail.value = null; error.value = getApiErrorDetails(cause, '发布详情读取失败') } }
diff --git a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
index a74728ac..c37a83b8 100644
--- a/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
+++ b/src/modules/overseas-master-data/pages/CapacityOffersBehavior.test.ts
@@ -318,3 +318,29 @@ it('opens refreshed server guidance after fulfillment succeeds without replaying
   expect(editor.props('inquiry').progress.message).toBe('服务端下一待办')
   expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
 })
+it('fetches an off-page returned inquiry once per refresh and retries without falling back to stale data', async () => {
+  state.route.query = { inquiry: inquiry.bookingNo }
+  vi.mocked(api.getCapacityOffer).mockResolvedValue({ offer, inquiries: pageOf<CapacityInquiry>([], 30) })
+  vi.mocked(api.getCapacityInquiry).mockResolvedValue(inquiry)
+  const { wrapper } = mount(CapacityOfferDetailView); await flushPromises()
+  const editor = wrapper.findComponent({ name: 'CapacityInquiryDialog' })
+  expect(editor.props('modelValue')).toBe(true)
+  vi.mocked(api.getCapacityOffer).mockClear(); vi.mocked(api.getCapacityInquiry).mockClear()
+  vi.mocked(api.getCapacityInquiry).mockResolvedValue({ ...inquiry, recordVersion: 7 })
+  await button(wrapper, '重新核对').trigger('click'); await flushPromises()
+  expect(api.getCapacityOffer).toHaveBeenCalledOnce()
+  expect(api.getCapacityInquiry).toHaveBeenCalledExactlyOnceWith(inquiry.bookingNo)
+  expect(editor.props('inquiry').recordVersion).toBe(7)
+  vi.mocked(api.getCapacityInquiry).mockRejectedValueOnce(new Error('读取失败'))
+  await button(wrapper, '重新核对').trigger('click'); await flushPromises()
+  const error = wrapper.findComponent({ name: 'LoadErrorState' })
+  expect(error.exists()).toBe(true)
+  vi.mocked(api.getCapacityOffer).mockClear(); vi.mocked(api.getCapacityInquiry).mockClear()
+  vi.mocked(api.getCapacityInquiry).mockResolvedValue({ ...inquiry, recordVersion: 8 })
+  error.vm.$emit('retry'); await flushPromises()
+  expect(api.getCapacityOffer).toHaveBeenCalledOnce()
+  expect(api.getCapacityInquiry).toHaveBeenCalledExactlyOnceWith(inquiry.bookingNo)
+  expect(editor.props('inquiry').recordVersion).toBe(8)
+  expect(api.listCapacityInquiries).not.toHaveBeenCalled()
+  expect(api.commandCapacityInquiry).not.toHaveBeenCalled()
+})

From 20b4d1425b8057f91e5d9e23a9b3821cfb7f9913 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 11 Oct 2026 21:09:30 +0800
Subject: [PATCH 47/47] fix(appointments): ignore stale impact history
 responses

---
 .../AppointmentImpactDialog.test.ts           | 45 +++++++++++++++++++
 .../AppointmentImpactDialog.vue               | 14 +++---
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
index a408f60b..f58855c8 100644
--- a/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.test.ts
@@ -11,6 +11,51 @@ const detail: ImpactDetail = { impact: { containerBookingId: '1', impactNo: 'AI-
 const render = (canWrite = true) => mount(AppointmentImpactDialog, { props: { containerId: '1', canWrite }, global: { provide: { 'appointment-register-leave-guard': guards.register }, plugins: [ElementPlus], stubs: { AppDialog: { name: 'AppDialog', props: ['beforeClose'], template: '<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button></section>' } } } })
 describe('appointment impact handling', () => {
   beforeEach(() => { vi.resetAllMocks(); guards.register.mockReturnValue(guards.unregister); vi.mocked(getImpact).mockResolvedValue(detail) })
+  function deferred() {
+    let resolve!: (value: ImpactDetail) => void, reject!: (reason: Error) => void
+    const promise=new Promise<ImpactDetail>((yes,no)=>{resolve=yes;reject=no})
+    return {promise,resolve,reject}
+  }
+  const pageDetail=(label:string):ImpactDetail=>({...detail,history:{total:60,records:[{version:1,action:'RECORD',operatorName:null,result:label,nextAction:null,followupDate:null,createdAt:'2026-10-11T00:00:00'}]}})
+  it('keeps the latest history page when responses finish in reverse order',async()=>{
+    vi.mocked(getImpact).mockResolvedValueOnce(pageDetail('第一页'))
+    const wrapper=render();await flushPromises()
+    const second=deferred(),third=deferred()
+    vi.mocked(getImpact).mockReturnValueOnce(second.promise).mockReturnValueOnce(third.promise)
+    const pager=wrapper.findComponent({name:'ElPagination'})
+    pager.vm.$emit('update:current-page',2);pager.vm.$emit('current-change',2)
+    pager.vm.$emit('update:current-page',3);pager.vm.$emit('current-change',3)
+    await flushPromises()
+    third.resolve(pageDetail('第三页最新'));await flushPromises()
+    second.resolve(pageDetail('第二页过期'));await flushPromises()
+    expect(wrapper.text()).toContain('第三页最新');expect(wrapper.text()).not.toContain('第二页过期')
+    wrapper.unmount()
+  })
+  it('ignores an obsolete failure and keeps loading until the current request finishes',async()=>{
+    vi.mocked(getImpact).mockResolvedValueOnce(pageDetail('第一页'))
+    const wrapper=render();await flushPromises()
+    const second=deferred(),third=deferred()
+    vi.mocked(getImpact).mockReturnValueOnce(second.promise).mockReturnValueOnce(third.promise)
+    const pager=wrapper.findComponent({name:'ElPagination'})
+    pager.vm.$emit('update:current-page',2);pager.vm.$emit('current-change',2)
+    pager.vm.$emit('update:current-page',3);pager.vm.$emit('current-change',3)
+    second.reject(new Error('obsolete page failure'));await flushPromises()
+    expect(wrapper.text()).not.toContain('obsolete page failure')
+    expect(pager.props('disabled')).toBe(true)
+    expect(wrapper.findAll('button').find(b=>b.text()==='认领跟进')!.attributes('disabled')).toBeDefined()
+    wrapper.findAllComponents({name:'ElButton'}).find(b=>b.text()==='认领跟进')!.vm.$emit('click')
+    await flushPromises();expect(handleImpact).not.toHaveBeenCalled()
+    third.resolve(pageDetail('第三页最新'));await flushPromises()
+    expect(pager.props('disabled')).toBe(false);wrapper.unmount()
+  })
+  it('does not let a closed dialog response replace a newly opened impact',async()=>{
+    const old=deferred();vi.mocked(getImpact).mockReturnValueOnce(old.promise)
+    const first=render();await flushPromises();first.unmount()
+    vi.mocked(getImpact).mockResolvedValueOnce({...pageDetail('新影响历史'),impact:{...detail.impact,impactNo:'AI-NEW'}})
+    const next=render();await flushPromises()
+    old.resolve(pageDetail('已关闭历史'));await flushPromises()
+    expect(next.text()).toContain('AI-NEW');expect(next.text()).not.toContain('已关闭历史');next.unmount()
+  })
   it('shows separate forecasts, unchanged confirmed appointment and omitted transport permission', async () => {
     const wrapper = render(false); await flushPromises()
     expect(wrapper.text()).toContain('2026-10-15T09:00:00')
diff --git a/src/modules/appointment-calendar/AppointmentImpactDialog.vue b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
index fcc57bdc..5b42d60f 100644
--- a/src/modules/appointment-calendar/AppointmentImpactDialog.vue
+++ b/src/modules/appointment-calendar/AppointmentImpactDialog.vue
@@ -12,14 +12,16 @@ const router = useRouter(), detail = ref<ImpactDetail | null>(null), loading = r
 const error = ref<ApiErrorDetails | null>(null), pending = ref<ImpactCommand | null>(null)
 const form = reactive({ result: '', nextAction: '', followupDate: '' })
 const actions: Record<string, string> = { OBSERVED: '船期核对', CLAIM: '认领', RECORD: '记录处理', RESOLVE: '完成核对' }
+let loadGeneration = 0
 async function load() {
+  const generation = ++loadGeneration
   loading.value = true; error.value = null
-  try { detail.value = await getImpact(props.containerId, historyPage.value) }
-  catch (cause) { error.value = getApiErrorDetails(cause, '影响详情加载失败') }
-  finally { loading.value = false }
+  try { const result = await getImpact(props.containerId, historyPage.value); if (generation === loadGeneration) detail.value = result }
+  catch (cause) { if (generation === loadGeneration) error.value = getApiErrorDetails(cause, '影响详情加载失败') }
+  finally { if (generation === loadGeneration) loading.value = false }
 }
 async function save(action: ImpactCommand['action']) {
-  if (!detail.value || saving.value || !props.canWrite) return
+  if (!detail.value || loading.value || saving.value || !props.canWrite) return
   if (!pending.value && action !== 'CLAIM' && !form.result.trim()) { ElMessage.warning('请填写实际处理结果'); return }
   pending.value ||= { expectedVersion: detail.value.impact.version, forecastToken: detail.value.impact.forecastToken, idempotencyKey: crypto.randomUUID(), action, result: form.result.trim() || null, nextAction: form.nextAction.trim() || null, followupDate: form.followupDate || null }
   saving.value = true; error.value = null
@@ -33,7 +35,7 @@ function beforeClose(done: () => void) { if (canLeave()) done() }
 function openTrip(tripNo: string) { if (canLeave()) void router.push(`/overseas-master-data/trips/${encodeURIComponent(tripNo)}`) }
 const register = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
 const unregister = register?.(canLeave)
-onBeforeUnmount(() => unregister?.())
+onBeforeUnmount(() => { ++loadGeneration; unregister?.() })
 onBeforeRouteLeave(canLeave)
 onBeforeRouteUpdate(canLeave)
 onMounted(load)
@@ -65,7 +67,7 @@ onMounted(load)
         <el-button v-if="!pending" type="primary" :disabled="saving || loading" @click="save('RESOLVE')">完成本次核对</el-button>
         <el-button v-else type="primary" :loading="saving" @click="save(pending.action)">重试本次处理</el-button>
       </div>
-      <details><summary>观察及处理历史（{{ detail.history.total }} 条）</summary><div class="impact-list"><p v-for="row in detail.history.records" :key="row.version">{{ actions[row.action] || '核对记录' }} · {{ row.operatorName || '—' }} · {{ row.createdAt }} UTC<br>{{ row.result || '记录来源观察' }} · {{ row.nextAction || '—' }} · {{ row.followupDate || '—' }}</p></div><el-pagination v-model:current-page="historyPage" :page-size="20" :total="detail.history.total" layout="prev, pager, next" :disabled="saving || !!pending" @current-change="load" /></details>
+      <details><summary>观察及处理历史（{{ detail.history.total }} 条）</summary><div class="impact-list"><p v-for="row in detail.history.records" :key="row.version">{{ actions[row.action] || '核对记录' }} · {{ row.operatorName || '—' }} · {{ row.createdAt }} UTC<br>{{ row.result || '记录来源观察' }} · {{ row.nextAction || '—' }} · {{ row.followupDate || '—' }}</p></div><el-pagination v-model:current-page="historyPage" :page-size="20" :total="detail.history.total" layout="prev, pager, next" :disabled="loading || saving || !!pending" @current-change="load" /></details>
     </template>
   </AppDialog>
 </template>