优化

src/modules/overseas-warehouse/pages/DispatchDetailView.test.ts

@@ -19,6 +19,21 @@ vi.mock('@/modules/overseas-master-data', async () => ({
 const options = { global: { plugins: [ElementPlus], stubs: { DataTable: DataTableStub, DispatchWorkflowDialog: true } } }
 beforeEach(() => { vi.clearAllMocks(); vi.mocked(getDispatch).mockResolvedValue(detail()); can.mockReturnValue(false); push.mockReset(); Object.keys(query).forEach(key => delete query[key]) })
 describe('whole-dispatch four-tab detail', () => {
+  it('returns to the original appointment date and view from the dispatch detail', async () => {
+    query.appointmentReturn = '/appointment-calendar?date=2026-10-21&mode=week'
+    const wrapper = mount(DispatchDetailView, options); await flushPromises()
+    expect(wrapper.get('button.density-back').text()).toContain('返回预约日历')
+    await wrapper.get('button.density-back').trigger('click')
+    expect(push).toHaveBeenCalledWith('/appointment-calendar?date=2026-10-21&mode=week')
+    wrapper.unmount()
+  })
+  it('ignores an external calendar return URL and keeps the normal dispatch-list return', async () => {
+    query.appointmentReturn = 'https://outside.invalid/appointment-calendar?date=2026-10-21'
+    const wrapper = mount(DispatchDetailView, options); await flushPromises()
+    await wrapper.get('button.density-back').trigger('click')
+    expect(push).toHaveBeenCalledWith({ name: 'overseas-dispatches' })
+    wrapper.unmount()
+  })
   it('uses only four accessible colored tabs and switches without another network read', async () => {
     const value = detail(); value.dispatchInfo.fbaAppointments = [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'BATCH-1', appointmentNo: 'FBA-AP-1', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', status: 'CONFIRMED', confirmedAt: null, blockReason: null }]
     vi.mocked(getDispatch).mockResolvedValueOnce(value)

src/modules/overseas-warehouse/pages/DispatchDetailView.vue

@@ -3,6 +3,7 @@ import '@/styles/adminDensity.css'
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { inquiryReturnTarget, vehicleStatusLabels } from '@/modules/overseas-master-data'
+import { appointmentReturnTarget } from '@/modules/appointment-calendar'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -65,7 +66,9 @@ async function load() {
   catch (error) { if (current === generation) loadError.value = getApiErrorDetails(error, '排车详情加载失败，请重试') }
   finally { if (current === generation) loading.value = false }
 }
-function back() { void router.push(inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' }) }
+const appointmentReturn = computed(() => appointmentReturnTarget(route.query))
+const backLabel = computed(() => appointmentReturn.value ? '返回预约日历' : inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表')
+function back() { void router.push(appointmentReturn.value || inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' }) }
 function openAction(value: DispatchAction, requestedOperation?: 'ROUTE') { if (!canDispatchAction(detail.value?.actions, value, access.can)) return; rejectionError.value = null; operation.value = requestedOperation; action.value = value; actionOpen.value = true }
 async function handleRejection(details: ApiErrorDetails) { rejectionError.value = details; await load() }
 async function handleSaved() { rejectionError.value = null; await load() }
@@ -74,7 +77,7 @@ onBeforeUnmount(() => { generation++ })
 </script>
 
 <template>
-  <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 ? detail.status === 'CANCELLED' ? '已取消' : stageLabel(detail.stage) : '加载中'" @back="back">
+  <OverseasDetailShell class="admin-density" dense title="排车详情" reference-label="排车单号" :reference-value="detail?.dispatchNo || dispatchNo" :back-text="appointmentReturn || inquiryReturnTarget(route.query) ? backLabel : undefined" :back-label="backLabel" domain="排车详情" :pending="false" :status-text="detail ? detail.status === 'CANCELLED' ? '已取消' : stageLabel(detail.stage) : '加载中'" @back="back">
     <LoadErrorState v-if="rejectionError" title="排车操作未完成" :message="rejectionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="rejectionError" /></template></LoadErrorState>
     <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">

src/modules/overseas-warehouse/pages/ReturnInventoryDialogs.test.ts

@@ -105,7 +105,10 @@ describe('return inventory operation dialogs', () => {
     const wrapper = await openPlan(); await clickPlan(wrapper); const view = dialog(wrapper, '合箱计划详情')
     expect(view.get('[aria-label="计划来源箱明细"]').text()).toContain('取出来源'); expect(view.get('[aria-label="计划来源箱明细"]').text()).toContain('预计剩余')
     expect(view.get('[aria-label="实际合箱流向"]').text()).toContain('BOX-B')
-    const results = view.get('[aria-label="合箱结果"]'); expect(results.text()).toContain('完成时快照'); expect(results.text()).toContain('30 × 20 × 10 cm / 2 kg')
+    const results = view.get('[aria-label="合箱结果"]'); expect(results.text()).not.toContain('结果数量为完成时快照');
+    await results.get('[aria-label="查看合箱结果说明"]').trigger('focus')
+    await vi.waitFor(() => expect(document.body.textContent).toContain('结果数量为完成时快照'));
+    expect(results.text()).toContain('30 × 20 × 10 cm / 2 kg')
     expect(results.findAllComponents({ name: 'ElTableColumn' })[0]!.props('label')).toBe('操作')
     const oldBox = results.findAll('.el-table__body tr').filter(item => item.text().includes('OLD-BOX')).at(-1)!
     expect(oldBox.get('button').attributes('disabled')).toBeDefined(); await oldBox.get('button').trigger('click'); expect(api.label).not.toHaveBeenCalled()

src/modules/overseas-warehouse/pages/prototypeContract.test.ts

@@ -335,7 +335,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(detail).toContain('单据信息')
     expect(detail).toContain('关联订单明细')
     expect(detail).toContain(':data="relatedOrders"')
-    expect(detail).toContain("router.push(inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' })")
+    expect(detail).toContain("inquiryReturnTarget(route.query) || { name: 'overseas-dispatches' }")
     expect(detail).toContain("inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回排车列表'")
     expect(detail).not.toContain('ElMessage.success')
   })