html/client-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test

Browse Source
This commit is contained in:
ouyangxq
2026-09-20 20:53:24 +08:00
parent dd7306c7fc 8a3a90217c
commit 3ab07188d1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs
+1
View File
@@ -14,6 +14,7 @@ test('退货签收照片通过客户鉴权下载接口加载并释放对象 URL'
}) })
test('新建退货预报选择海外仓后带出联系人和电话', () => { test('新建退货预报选择海外仓后带出联系人和电话', () => {
assert.match(view, /getMerchantWarehouses\(\{ page: 1, size: 200, warehouseType: 'OVERSEAS' \}\)/)
assert.match(view, /@change="selectOperationWarehouse"/) assert.match(view, /@change="selectOperationWarehouse"/)
assert.match(view, /warehouseContactName = warehouse\?\.contactName \|\| ''/) assert.match(view, /warehouseContactName = warehouse\?\.contactName \|\| ''/)
assert.match(view, /warehouseContactPhone = warehouse\?\.contactPhone \|\| ''/) assert.match(view, /warehouseContactPhone = warehouse\?\.contactPhone \|\| ''/)
src/modules/overseas-warehouse/views/ReturnOrdersView.vue
+1 -1
View File
@@ -98,7 +98,7 @@ async function loadOperationWarehouses() {
try { try {
// Managed transit warehouses are maintained as OVERSEAS_PARTNER in the warehouse master. // Managed transit warehouses are maintained as OVERSEAS_PARTNER in the warehouse master.
// Query the active catalogue and accept both overseas warehouse types. // 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) => operationWarehouses.value = result.records.filter((warehouse) =>
warehouse.status === 'ACTIVE' && ['OVERSEAS', 'OVERSEAS_PARTNER'].includes(warehouse.warehouseType), warehouse.status === 'ACTIVE' && ['OVERSEAS', 'OVERSEAS_PARTNER'].includes(warehouse.warehouseType),
) )