From ce7422a5061479586ac02a65eb684e2d255266ff Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Tue, 8 Sep 2026 13:08:54 +0800 Subject: [PATCH] fix(overseas): clarify last-mile search fields --- .../pages/LastMileOrdersView.behavior.test.ts | 17 ++++++++++++----- .../pages/LastMileOrdersView.vue | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts index 5ec6c4e2..7a80717b 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts +++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts @@ -165,13 +165,17 @@ describe('LastMileOrdersView pending order and container conversion', () => { } toolbar.vm.$emit('search', model) await flushPromises() - expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ - page: 1, orderNo: 'LMO-SEARCH', inboundCode: 'IN-SEARCH', lxCode: 'LX-SEARCH', orderType: 'FIRST_LEG', + expect(listLastMileOrders).toHaveBeenLastCalledWith({ + page: 1, size: 10, orderNo: 'LMO-SEARCH', inboundCode: 'IN-SEARCH', lxCode: 'LX-SEARCH', orderType: 'FIRST_LEG', warehouse: 'LAX', sourceOrderNo: 'SOURCE-SEARCH', containerNo: 'CONT-SEARCH', transferWarehouseCode: 'ONT8', currentStatus: 'DELIVERED', abnormal: true, detained: false, createdFrom: '2026-09-01T00:00:00', createdTo: '2026-09-07T23:59:59', - })) - expect((toolbar.props('availableFields') as Array<{ key: string }>).map((field) => field.key)).toContain('lxCode') + }) + const availableFields = toolbar.props('availableFields') as Array<{ key: string; label: string; placeholder?: string }> + expect(availableFields.find((field) => field.key === 'lxCode')).toMatchObject({ + label: 'LX代码', placeholder: '请输入LX代码', + }) + expect(availableFields.map((field) => field.key)).not.toEqual(expect.arrayContaining(['planNo', 'inboundOrderNo'])) await wrapper.findAll('.el-radio-button').find((item) => item.text() === '待分配')!.trigger('click') await flushPromises() @@ -179,7 +183,10 @@ describe('LastMileOrdersView pending order and container conversion', () => { await wrapper.findAll('.el-radio-button').find((item) => item.text().startsWith('柜子'))!.trigger('click') await flushPromises() - expect(listContainerPlanProgress).toHaveBeenLastCalledWith(expect.objectContaining({ containerNo: 'CONT-SEARCH', createdFrom: '2026-09-01T00:00:00', createdTo: '2026-09-07T23:59:59' })) + expect(listContainerPlanProgress).toHaveBeenLastCalledWith({ + page: 1, size: 10, containerNo: 'CONT-SEARCH', + createdFrom: '2026-09-01T00:00:00', createdTo: '2026-09-07T23:59:59', + }) await wrapper.findAll('.el-radio-button').find((item) => item.text() === '全部')!.trigger('click') await flushPromises() diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue index 310e64bf..67cdb785 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue +++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue @@ -86,7 +86,7 @@ const filters = ref({ orderNo: '', orderType: '', warehouse: '', inb const allFields: QueryField[] = [ { key: 'orderNo', type: 'input', label: '尾程单号', width: 190, placeholder: '请输入尾程单号' }, { key: 'inboundCode', type: 'input', label: '入仓码', width: 180, placeholder: '请输入入仓码' }, - { key: 'lxCode', type: 'input', label: 'LX代码', width: 180, placeholder: '请输入领星入库单代码' }, + { key: 'lxCode', type: 'input', label: 'LX代码', width: 180, placeholder: '请输入LX代码' }, { 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' },