{{ metric.label }}
diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts index 149e5772..7d0664dd 100644 --- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts +++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts @@ -75,6 +75,9 @@ describe('overseas business mounted pages', () => { expect(document.body.textContent).toContain('池来源订单按实际运输履约推进') expect(document.body.textContent).toContain('FB-TEST'); expect(document.body.textContent).toContain('— / — / —') expect(listUsTruckOrders).toHaveBeenCalledOnce(); expect(getUsTruckOrder).not.toHaveBeenCalled() + const dialog = wrapper.findComponent(AppDialog) + await dialog.findAll('.app-dialog__footer button').find(button => button.text() === '关闭')!.trigger('click'); await flushPromises() + expect(dialog.props('modelValue')).toBe(false) }) it('keeps a pool order read-only even when an old edit deep link is used', async () => { routing.route.params = { orderId: 'TR-200' }; routing.route.query = { customerId: truck.customerId } diff --git a/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts b/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts new file mode 100644 index 00000000..3cb86770 --- /dev/null +++ b/src/modules/overseas-master-data/components/CapacityDialogClosing.test.ts @@ -0,0 +1,58 @@ +import ElementPlus, { ElMessageBox } from 'element-plus' +import { createPinia } from 'pinia' +import { mount, flushPromises, type VueWrapper } from '@vue/test-utils' +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import CapacityInquiryDialog from './CapacityInquiryDialog.vue' +import CapacityOfferSettingsDialog from './CapacityOfferSettingsDialog.vue' +import type { CapacityOffer } from '../capacityOfferTypes' +import type { FleetTrip } from '../tripTypes' +import { useUnsavedWorkStore } from '@/core/unsaved-work/unsavedWork' +import { listCapacityOffers } from '../api/capacityOffers' + +vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) })) +vi.mock('../api/capacityOffers', () => ({ listCapacityOffers: vi.fn(), listOfferCustomers: vi.fn(), listOfferQuotes: vi.fn(), saveCapacityInquiry: vi.fn(), saveCapacityOffer: vi.fn(), commandCapacityOffer: 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 }) }) +afterEach(async () => { ElMessageBox.close(); wrappers.splice(0).forEach(wrapper => wrapper.unmount()); await flushPromises(); document.body.innerHTML = '' }) +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] } }) + wrappers.push(wrapper) + return { wrapper, pinia } +} +async function continueEditing() { + const message = [...document.querySelectorAll('.el-message-box')].at(-1)! + expect(message).not.toBeNull() + const button = [...message.querySelectorAll('button')].find(node => node.textContent?.trim() === '继续填写')! + expect(button).toBeTruthy(); button.click(); await flushPromises() + await new Promise(resolve => setTimeout(resolve, 50)); await flushPromises() +} +it.each(['inquiry', 'settings'] as const)('keeps the real %s dialog and edited input visible through cancel, Escape and X vetoes', async kind => { + const { wrapper, pinia } = mountDialog(kind) + if (kind === 'settings') await wrapper.setProps({ modelValue: true }) + await flushPromises() + const input = wrapper.find上次提交结果尚未确定，请保留原内容重试或核对。
{{ offer.offerNo }} · {{ offer.warehouseName }} · {{ offer.blockReason || '询价不占位，调度确认承运后占位。' }}
diff --git a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue index dc9b0169..6147c9ab 100644 --- a/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue +++ b/src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.vue @@ -19,7 +19,7 @@ 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), () => { open.value = false }) +const guard = useFleetDraftGuard('capacity-offer-settings', open, form, 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 @@ -51,7 +51,7 @@ async function command(action: 'publish' | 'pause' | 'resume' | 'close') { } onBeforeUnmount(() => { generation++ }) -{{ trip.tripNo }} · {{ offer ? `${offer.offerNo} · ${offerStatusLabels[offer.status]}` : '尚未建立发布' }}
{{ offer.blockReason }}
上次结果尚未确定，原请求已保留，请重试核对。
{{ row.offerNo }}
{{ row.tripNo }}
{{ stop.name }} · {{ row.capacityKnown ? loadText(stop.remaining) : '待调度核对' }}
{{ offerTime(row.plannedDepartureAt) }}
截止 {{ offerTime(row.cutoffAt) }}
- {{ segment.fromName }} → {{ segment.toName }}
计划 {{ loadText(segment.planned) }}
预留 {{ loadText(segment.reserved) }}
+ {{ row.capacityKnown ? '—' : '待调度核对' }}计划 {{ loadText(segment.planned) }}
预留 {{ loadText(segment.reserved) }}
{{ segment.fromName }} → {{ segment.toName }}
计划 {{ loadText(segment.planned) }}
预留 {{ loadText(segment.reserved) }}
{{ offerStatusLabels[(row as CapacityOffer).status] }} · {{ row.canConfirm ? '可确认承运' : '暂不可确认' }}计划 {{ loadText(segment.planned) }}
预留 {{ loadText(segment.reserved) }}
{{ row.blockReason }}
{{ row.contactName || '—' }}
{{ row.contactPhone || '—' }}
diff --git a/src/modules/overseas-master-data/useFleetDraftGuard.ts b/src/modules/overseas-master-data/useFleetDraftGuard.ts
index 90083e1b..8b033ba1 100644
--- a/src/modules/overseas-master-data/useFleetDraftGuard.ts
+++ b/src/modules/overseas-master-data/useFleetDraftGuard.ts
@@ -2,21 +2,22 @@ import { computed, getCurrentInstance, reactive, ref, type Ref } from 'vue'
import { ElMessageBox } from 'element-plus'
import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
-/** All dialog close paths use requestClose; the shared registry also protects route/tab exits. */
-export function useFleetDraftGuard(key: string, open: Ref{{ title }}
运力列表
' }, meta: { requiresAuth: true } }, + { path: '/pool/:offerNo', name: 'overseas-master-data-capacity-offer-detail', component: CapacityOfferDetailView, meta: { requiresAuth: true } }, + { path: '/outside', name: 'outside', component: { template: '外部页面
' }, meta: { workspaceTab: false } }, + ] }) + // Match the application's intentional policy: cross-workspace switching skips the global prompt. + router.beforeEach(async (to, from) => { + const fromId = workspaceRouteId(from) + if (!fromId || isWorkspaceRoute(to) && workspaceRouteId(to) !== fromId || !registry.findForWorkspace(fromId).length) return true + try { await ElMessageBox.confirm('当前页面有未保存内容', '全局离开确认', { confirmButtonText: '放弃并继续', cancelButtonText: '继续填写' }); registry.removeWorkspaces([fromId]); return true } catch { return false } + }) + const Host = defineComponent({ components: { RouterView }, template: '{{ arrangement.readOnlyReason }}
--
+
- 订单号
- {{ arrangement.businessOrderNo }}
- 外接预订号
- {{ arrangement.bookingNo }}
- 车次号
{{ arrangement.tripNo }} {{ arrangement.tripNo }}- 车次号
{{ arrangement.tripNo }} {{ arrangement.tripNo }}- 计划发车
- {{ time(arrangement.plannedDepartureAt) }}
- 起运仓
- {{ arrangement.originWarehouseName || '—' }}
- 目的地
- {{ arrangement.destinationLabel || '—' }}
- 阶段时间
- {{ time(arrangement.stageOccurredAt) }}
- 约定运费（非实收）
- {{ arrangement.agreedFreightAmount == null ? '—' : `${Number(arrangement.agreedFreightAmount).toFixed(2)} ${arrangement.currency || ''}` }}
- 来货单号
- {{ arrangement.incomingNo || '—' }}
- 排车单号
{{ arrangement.dispatchNo }} {{ arrangement.dispatchNo || '—' }}- 排车单号
{{ arrangement.dispatchNo }} {{ arrangement.dispatchNo || '—' }}- 派送单号
- {{ arrangement.deliveryNo || '—' }}
- 已签 / 未签 / 退回箱数
- {{ arrangement.signedPackages ?? '—' }} / {{ arrangement.unsignedPackages ?? '—' }} / {{ arrangement.returnedPackages ?? '—' }}
履约说明：{{ arrangement.exceptionSummary }}