From 4b7becf9c29ab0a27e54942598ef13b0947a1fdf Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Sun, 20 Sep 2026 20:48:01 +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/overseas-warehouse/views/ReturnOrdersView.test.mjs | 1 + src/modules/overseas-warehouse/views/ReturnOrdersView.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs b/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs index 39bc20e..22d2073 100644 --- a/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs @@ -14,6 +14,7 @@ test('退货签收照片通过客户鉴权下载接口加载并释放对象 URL' }) test('新建退货预报选择海外仓后带出联系人和电话', () => { + assert.match(view, /getMerchantWarehouses\(\{ page: 1, size: 200, warehouseType: 'OVERSEAS' \}\)/) assert.match(view, /@change="selectOperationWarehouse"/) assert.match(view, /warehouseContactName = warehouse\?\.contactName \|\| ''/) assert.match(view, /warehouseContactPhone = warehouse\?\.contactPhone \|\| ''/) diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue index 1c3b9b4..01de759 100644 --- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue @@ -98,7 +98,7 @@ async function loadOperationWarehouses() { try { // Managed transit warehouses are maintained as OVERSEAS_PARTNER in the warehouse master. // Query the active catalogue and accept both overseas warehouse types. - const result = await getMerchantWarehouses({ page: 1, size: 200 }) + const result = await getMerchantWarehouses({ page: 1, size: 200, warehouseType: 'OVERSEAS' }) operationWarehouses.value = result.records.filter((warehouse) => warehouse.status === 'ACTIVE' && ['OVERSEAS', 'OVERSEAS_PARTNER'].includes(warehouse.warehouseType), )