From 31e420c32af835b7ddaa84d8618162de96583f44 Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Wed, 4 Nov 2026 10:39:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/cross-border/businessOrders.test.mjs | 10 ++++++++++ .../cross-border/components/BusinessOrdersView.vue | 7 +++---- src/modules/cross-border/fleetArrangement.ts | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/modules/cross-border/businessOrders.test.mjs b/src/modules/cross-border/businessOrders.test.mjs index 6a6759a..ee6d66c 100644 --- a/src/modules/cross-border/businessOrders.test.mjs +++ b/src/modules/cross-border/businessOrders.test.mjs @@ -24,6 +24,16 @@ test('all current truck statuses display Chinese labels in lists and details', ( assert.equal(displayCell({ status }, 'status'), statusLabel(status)) } assert.equal(statusLabel('DISPATCHED'), '待取货') + assert.equal(statusLabel('IN_TRANSIT'), '派送中') + assert.equal(poolOrderStatusLabels.IN_TRANSIT, '派送中') +}) + +test('truck search excludes warehouse and dispatch preparation stages', () => { + const truckingOptions = view.split("options: props.kind === 'trucking' ? [")[1].split('] : [')[0] + for (const status of ['WAITING_INBOUND', 'RECEIVING', 'WAITING_CONSOLIDATION', 'PALLET_OVERAGE_REVIEW', 'PARTIALLY_ALLOCATED', 'ALLOCATED', 'PENDING_DISPATCH']) { + assert.ok(!truckingOptions.includes(status), status) + } + assert.match(truckingOptions, /label: '派送中', value: 'IN_TRANSIT'/) }) test('renders unknown pallet service and container type as dashes while preserving explicit values', () => { diff --git a/src/modules/cross-border/components/BusinessOrdersView.vue b/src/modules/cross-border/components/BusinessOrdersView.vue index f40d267..199c550 100644 --- a/src/modules/cross-border/components/BusinessOrdersView.vue +++ b/src/modules/cross-border/components/BusinessOrdersView.vue @@ -115,9 +115,8 @@ const queryFields = computed(() => [ { label: '订单受理中', value: 'FUNDING_PENDING' }, { label: '订单处理失败', value: 'FUNDING_FAILED' }, { label: '待审核', value: 'PENDING_REVIEW' }, - { label: '待排车', value: 'PENDING_DISPATCH' }, { label: '待取货', value: 'DISPATCHED' }, - { label: '运输中', value: 'IN_TRANSIT' }, + { label: '派送中', value: 'IN_TRANSIT' }, { label: '已完成', value: 'COMPLETED' }, { label: '已拒绝', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }, @@ -130,7 +129,7 @@ const queryFields = computed(() => [ { label: '待接单', value: 'PENDING_ACCEPTANCE' }, ...Object.entries(poolOrderStatusLabels).filter(([value]) => !['IN_TRANSIT', 'COMPLETED', 'CANCELLED'].includes(value)).map(([value, label]) => ({ value, label })), { label: '处理中', value: 'PROCESSING' }, - { label: '运输中', value: 'IN_TRANSIT' }, + { label: '派送中', value: 'IN_TRANSIT' }, { label: '已完成', value: 'COMPLETED' }, { label: '已取消', value: 'CANCELLED' }, ], @@ -201,7 +200,7 @@ function localMinute(value: unknown) { return value ? String(value).replace('T', function transportTypeLabel(value: unknown) { return ({ PORT_PICKUP: '港口提柜', WAREHOUSE_TO_WAREHOUSE: '仓到仓', WAREHOUSE_TO_DOOR: '仓到门' } as Record)[String(value)] || text(value) } function statusLabel(value: unknown) { if (poolOrderStatusLabels[String(value)]) return poolOrderStatusLabels[String(value)] - return ({ FUNDING_PENDING: '订单受理中', FUNDING_FAILED: '订单处理失败', PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_ACCEPTANCE: '待接单', PROCESSING: '处理中', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消' } as Record)[String(value)] || text(value) + return ({ FUNDING_PENDING: '订单受理中', FUNDING_FAILED: '订单处理失败', PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_ACCEPTANCE: '待接单', PROCESSING: '处理中', IN_TRANSIT: '派送中', COMPLETED: '已完成', CANCELLED: '已取消' } as Record)[String(value)] || text(value) } function statusTone(value: unknown) { return ({ APPROVED: 'success', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info', FUNDING_PENDING: 'warning', FUNDING_FAILED: 'danger', PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', PROCESSING: 'primary', IN_TRANSIT: 'primary' } as Record)[String(value)] || 'info' diff --git a/src/modules/cross-border/fleetArrangement.ts b/src/modules/cross-border/fleetArrangement.ts index 6f0cd01..62e5f87 100644 --- a/src/modules/cross-border/fleetArrangement.ts +++ b/src/modules/cross-border/fleetArrangement.ts @@ -25,5 +25,5 @@ export interface FleetArrangement { export const poolOrderStatusLabels: Record = { WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PALLET_OVERAGE_REVIEW: '托数超量待审核', PARTIALLY_ALLOCATED: '部分已排车', ALLOCATED: '已排车', DISPATCHED: '待取货', - PENDING_DISPATCH: '待派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消', + PENDING_DISPATCH: '待派车', IN_TRANSIT: '派送中', COMPLETED: '已完成', CANCELLED: '已取消', }