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

1

Browse Source
This commit is contained in:
wujinliang
2026-08-25 22:08:30 +08:00
parent 63170f9b73
commit b12196c7a8
11 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/first-leg/views/FirstLegOrdersView.vue
+4 -3
View File
@@ -1544,7 +1544,8 @@ async function searchOrders(model: QueryModel) {
const cargoKeyword = typeof model.cargoKeyword === 'string' ? model.cargoKeyword.trim() : ''
const range = Array.isArray(createdRange) ? createdRange.filter((value): value is string => typeof value === 'string') : []
const query = {
keyword: cargoKeyword || undefined,
keyword: undefined,
inboundCode: cargoKeyword || undefined,
orderNo: orderNo || undefined,
receivingWarehouseId: typeof model.receivingWarehouseId === 'string' && model.receivingWarehouseId ? model.receivingWarehouseId : undefined,
mainStatus: statusValue && statusValue !== 'DRAFT' ? statusValue : undefined,
@@ -1554,9 +1555,9 @@ async function searchOrders(model: QueryModel) {
createdTo: range[1] ? `${range[1]}T23:59:59` : undefined,
}
await store.load(query)
const cargoMatched = cargoKeyword && store.orders.some((order) => orderMatchesCargoKeyword(order, cargoKeyword))
const cargoMatched = cargoKeyword && store.orders.some((order) => order.status !== 'DRAFT' && orderMatchesCargoKeyword(order, cargoKeyword))
if (cargoKeyword && !cargoMatched && statusValue !== 'DRAFT') {
await store.load({ ...query, keyword: undefined, fbaCode: cargoKeyword })
await store.load({ ...query, keyword: undefined, inboundCode: undefined, fbaCode: cargoKeyword })
}
selectedOrders.value = []
orderTableVersion.value += 1