From 34f0ec49801704c7feeb594f4edb5ea7b71ef4af Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Tue, 8 Sep 2026 18:02:56 +0800 Subject: [PATCH] fix(overseas): label private delivery fee --- .../pages/DeliveryOrderDetailView.test.ts | 8 +++++++- .../overseas-warehouse/pages/DeliveryOrderDetailView.vue | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts index 23c2b7f8..7caa4701 100644 --- a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts +++ b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts @@ -17,7 +17,10 @@ describe('DeliveryOrderDetailView', () => { status: 'DELIVERING', overseasWarehouseName: '洛杉矶仓', palletCount: 1, packageCount: 2, createdAt: '2026-09-01T10:00:00', }, - skus: [], fees: [], operations: [], + skus: [], fees: [ + { id: 'fee-private', feeDirection: 'RECEIVABLE', feeType: 'PRIVATE_LAST_MILE_DELIVERY', currency: 'USD', amount: 88 }, + { id: 'fee-delivery', feeDirection: 'RECEIVABLE', feeType: 'DELIVERY_FEE', currency: 'USD', amount: 66 }, + ], operations: [], }) }) @@ -28,6 +31,9 @@ describe('DeliveryOrderDetailView', () => { expect(wrapper.text()).toContain('DEL/1') expect(wrapper.text()).toContain('派送中') expect(wrapper.text()).toContain('洛杉矶仓') + await wrapper.find('.el-tabs__item:nth-child(3)').trigger('click') + expect(wrapper.text()).toContain('私人仓尾程派送费') + expect(wrapper.text()).toContain('派送费用') wrapper.unmount() }) diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue index 64152d13..9a3672e7 100644 --- a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue +++ b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue @@ -24,7 +24,7 @@ const statusLabels: Record = { WAIT_DELIVERY: '待派送', DELIV const methodLabels: Record = { FBA_PICKUP: 'FBA自提', CUSTOMER_PICKUP: '客户自提', TRUCK: '卡车派送', TRUCK_PALLET: '卡派打托', TRUCK_FLOOR: '卡派地板', EXPRESS: '快递', OUTSOURCED: '外配', DEDICATED_TRUCK: '专车直送', LTL: '零担派送', SELF_DELIVERY: '自送', THIRD_PARTY: '第三方配送' } const pickupLabels: Record = { ONE_PICKUP_ONE_DROP: '一提一卸', ONE_PICKUP_MULTI_DROP: '一提多卸', MULTI_PICKUP_ONE_DROP: '多提一卸', MULTI_PICKUP_MULTI_DROP: '多提多卸', WAREHOUSE_PICKUP: '仓库自提', DOOR_PICKUP: '上门提货', SELF_PICKUP: '自提' } const loadingLabels: Record = { PALLET: '托盘', FLOOR: '地板', MIXED: '混装', CARTON: '散箱' } -const feeLabels: Record = { DELIVERY_FEE: '派送费用', EXPRESS_FEE: '快递费用', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费用', OTHER: '其他费用' } +const feeLabels: Record = { DELIVERY_FEE: '派送费用', PRIVATE_LAST_MILE_DELIVERY: '私人仓尾程派送费', EXPRESS_FEE: '快递费用', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费用', OTHER: '其他费用' } const operationLabels: Record = { CREATE_DELIVERY: '创建派送单', ASSIGN_VEHICLE: '车队分配', DISPATCH: '开始派送', SIGN: '签收', COMPLETE_DELIVERY: '完成派送', UPDATE_DELIVERY_STATUS: '更新派送状态', CUSTOMER_VISIT: '客户回访', MARK_RETURN: '标记退货', CANCEL_OUTBOUND: '取消出库' } const resultLabels: Record = { CREATED: '已创建' }