fix(express/waybill): 修正运单列表筛选条件与接口传参口径

- 状态/运单类型/是否字段按接口要求转换为 0-1、main-child、Y-N、布尔值,映射后再做类型转换,避免中文值被转成 NaN
- 运单号、主单号、订单ID、物流接口ID、包材ID 限定接口支持的操作符,并修正运单号默认模糊匹配
- 恢复物流公司、平台筛选,货主改为单选并传货主ID
- 移除后端暂不支持的发货单号、关键词筛选
- 快递/平台/货主下拉兼容 data 为数组及 list/items/records 结构,修复快递编码缺失

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
liufumingren 2026-11-10 00:48:57 +08:00
parent 2c657bd416
commit 468e970943
2 changed files with 75 additions and 60 deletions

View File

@ -66,6 +66,9 @@ export interface FieldDefinition {
options?: { label: string; value: any }[] options?: { label: string; value: any }[]
multiple?: boolean multiple?: boolean
filterable?: boolean filterable?: boolean
operators?: string[]
defaultOperator?: string
hideOperator?: boolean
} | null } | null
table: { table: {
minWidth?: number minWidth?: number
@ -192,8 +195,8 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
waybill_code: { waybill_code: {
key: 'waybill_code', key: 'waybill_code',
label: '运单号', label: '运单号',
// 传参口径(对齐 waybill.warehouse.list 文档):单值字符串 = 模糊 LIKE;多值(ScanBox 的「包含/IN」切数组)= **精确 Op.in** // 接口按单值 LIKE、多值 IN 处理,不支持其它 ScanBox 文本操作符。
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, scanBox: { type: 'text', group: SCANBOX_GROUPS.basic, operators: ['like', 'in'], defaultOperator: 'like' },
table: { minWidth: 170, fixed: 'left', copyAction: 'copy', showOverflowTooltip: true }, table: { minWidth: 170, fixed: 'left', copyAction: 'copy', showOverflowTooltip: true },
slot: null, slot: null,
detailLabel: '运单号' detailLabel: '运单号'
@ -203,7 +206,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
label: '主单号', label: '主单号',
// 传参口径(2026-10-07 文档):单值/多值均为**精确匹配**,先定位 order_id 再返回该订单下全部(主+子)运单; // 传参口径(2026-10-07 文档):单值/多值均为**精确匹配**,先定位 order_id 再返回该订单下全部(主+子)运单;
// 与运单号同时传入时**按 AND 叠加**(旧「主单号优先」口径已废弃) // 与运单号同时传入时**按 AND 叠加**(旧「主单号优先」口径已废弃)
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, scanBox: { type: 'text', group: SCANBOX_GROUPS.basic, operators: ['eq', 'in'], defaultOperator: 'eq' },
table: { minWidth: 170, copyAction: 'copy', showOverflowTooltip: true }, table: { minWidth: 170, copyAction: 'copy', showOverflowTooltip: true },
slot: null, slot: null,
detailLabel: '主单号' detailLabel: '主单号'
@ -211,16 +214,17 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
waybill_type: { waybill_type: {
key: 'waybill_type', key: 'waybill_type',
label: '运单类型', label: '运单类型',
scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: getOptions('waybillType') }, scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: getOptions('waybillType'), hideOperator: true },
table: { minWidth: 90, align: 'center' }, table: { minWidth: 90, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveWaybillTypeTag', translateField: 'waybillType' }, slot: { type: 'tag', tagResolver: 'resolveWaybillTypeTag', translateField: 'waybillType' },
detailLabel: '运单类型' detailLabel: '运单类型',
filterParamMap: { 主单号: '1', 子单号: '2' }
}, },
order_no: { order_no: {
key: 'order_no', key: 'order_no',
label: '发货单号', label: '发货单号',
// ⚠️ waybill.warehouse.list 文档:orderNo 模糊搜索「暂不可用,待快照字段就绪」→ 当前传了也不会生效,保留筛选项等后端就绪 // waybill.warehouse.list 的 orderNo 暂不可用,故不提供无效筛选项。
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, scanBox: null,
table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true }, table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true },
slot: null, slot: null,
detailLabel: '订单号' detailLabel: '订单号'
@ -228,7 +232,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
order_id: { order_id: {
key: 'order_id', key: 'order_id',
label: '订单ID', label: '订单ID',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, scanBox: { type: 'number', group: SCANBOX_GROUPS.basic, operators: ['eq'], defaultOperator: 'eq' },
table: { minWidth: 90, align: 'center', copyAction: 'copy' }, table: { minWidth: 90, align: 'center', copyAction: 'copy' },
slot: null, slot: null,
detailLabel: '订单ID' detailLabel: '订单ID'
@ -236,7 +240,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
source_order_codes: { source_order_codes: {
key: 'source_order_codes', key: 'source_order_codes',
label: '平台交易单号', label: '平台交易单号',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, scanBox: null,
table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true }, table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true },
slot: null, slot: null,
detailLabel: '平台交易单号' detailLabel: '平台交易单号'
@ -244,7 +248,8 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
keyword: { keyword: {
key: 'keyword', key: 'keyword',
label: '关键词', label: '关键词',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, // 服务端目前仅按运单号搜索,且会覆盖 waybillCode;避免提供误导性筛选。
scanBox: null,
table: null, table: null,
slot: null slot: null
}, },
@ -267,7 +272,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
store_name: { store_name: {
key: 'store_name', key: 'store_name',
label: '货主', label: '货主',
scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: [], multiple: true, filterable: true }, scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: [], filterable: true, hideOperator: true },
table: { minWidth: 120, showOverflowTooltip: true }, table: { minWidth: 120, showOverflowTooltip: true },
slot: null, slot: null,
detailLabel: '货主名称' detailLabel: '货主名称'
@ -321,14 +326,14 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
detailLabel: '打包人' detailLabel: '打包人'
}, },
// —— 物流信息 —— // —— 物流信息 ——
// logistics_code: { logistics_code: {
// key: 'logistics_code', key: 'logistics_code',
// label: '物流编码', label: '物流公司',
// scanBox: { type: 'select', group: SCANBOX_GROUPS.logistics, options: [] }, scanBox: { type: 'select', group: SCANBOX_GROUPS.logistics, options: [], hideOperator: true },
// table: { minWidth: 100, align: 'center' }, table: { minWidth: 100, align: 'center' },
// slot: null, slot: null,
// detailLabel: '物流公司编码' detailLabel: '物流公司编码'
// }, },
logistics_name: { logistics_name: {
key: 'logistics_name', key: 'logistics_name',
label: '物流公司', label: '物流公司',
@ -340,7 +345,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
logistics_interface_id: { logistics_interface_id: {
key: 'logistics_interface_id', key: 'logistics_interface_id',
label: '物流接口ID', label: '物流接口ID',
scanBox: { type: 'text', group: SCANBOX_GROUPS.logistics }, scanBox: { type: 'number', group: SCANBOX_GROUPS.logistics, operators: ['eq'], defaultOperator: 'eq' },
table: { minWidth: 110, align: 'center' }, table: { minWidth: 110, align: 'center' },
slot: null, slot: null,
detailLabel: '物流接口ID' detailLabel: '物流接口ID'
@ -353,19 +358,19 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
slot: null, slot: null,
detailLabel: '物流接口' detailLabel: '物流接口'
}, },
// platform_code: { platform_code: {
// key: 'platform_code', key: 'platform_code',
// label: '平台', label: '平台',
// scanBox: { type: 'select', group: SCANBOX_GROUPS.logistics, options: [] }, scanBox: { type: 'select', group: SCANBOX_GROUPS.logistics, options: [], hideOperator: true },
// table: { minWidth: 90, align: 'center' }, table: { minWidth: 90, align: 'center' },
// slot: null, slot: null,
// detailLabel: '平台编码' detailLabel: '平台编码'
// }, },
// —— 包裹信息 —— // —— 包裹信息 ——
package_material_id: { package_material_id: {
key: 'package_material_id', key: 'package_material_id',
label: '包材ID', label: '包材ID',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic }, scanBox: { type: 'number', group: SCANBOX_GROUPS.basic, operators: ['eq'], defaultOperator: 'eq' },
table: { minWidth: 90, align: 'center' }, table: { minWidth: 90, align: 'center' },
slot: null, slot: null,
detailLabel: '包材ID' detailLabel: '包材ID'
@ -390,7 +395,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
status: { status: {
key: 'status', key: 'status',
label: '运单状态', label: '运单状态',
scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('waybillStatus') }, scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('waybillStatus'), hideOperator: true },
table: { minWidth: 100, align: 'center' }, table: { minWidth: 100, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveWaybillStatusTag', translateField: 'waybillStatus' }, slot: { type: 'tag', tagResolver: 'resolveWaybillStatusTag', translateField: 'waybillStatus' },
detailLabel: '运单状态', detailLabel: '运单状态',
@ -407,26 +412,29 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
is_back: { is_back: {
key: 'is_back', key: 'is_back',
label: '是否退回', label: '是否退回',
scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('yesNo') }, scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('yesNo'), hideOperator: true },
table: { minWidth: 100, align: 'center' }, table: { minWidth: 100, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveYesNoTag', translateField: 'yesNo' }, slot: { type: 'tag', tagResolver: 'resolveYesNoTag', translateField: 'yesNo' },
detailLabel: '是否退回' detailLabel: '是否退回',
filterParamMap: { 是: 'Y', 否: 'N' }
}, },
is_intercept: { is_intercept: {
key: 'is_intercept', key: 'is_intercept',
label: '是否拦截', label: '是否拦截',
scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('yesNo') }, scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('yesNo'), hideOperator: true },
table: { minWidth: 100, align: 'center' }, table: { minWidth: 100, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveYesNoTag', translateField: 'yesNo' }, slot: { type: 'tag', tagResolver: 'resolveYesNoTag', translateField: 'yesNo' },
detailLabel: '是否拦截' detailLabel: '是否拦截',
filterParamMap: { 是: 'Y', 否: 'N' }
}, },
is_galaxy_receive: { is_galaxy_receive: {
key: 'is_galaxy_receive', key: 'is_galaxy_receive',
label: '揽收', label: '是否星河签收',
scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('yesNo') }, scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('yesNo'), hideOperator: true },
table: { minWidth: 100, align: 'center' }, table: { minWidth: 100, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveYesNoTag', translateField: 'yesNo' }, slot: { type: 'tag', tagResolver: 'resolveYesNoTag', translateField: 'yesNo' },
detailLabel: '是否揽收' detailLabel: '是否星河签收',
filterParamMap: { 是: 'Y', 否: 'N' }
}, },
// —— 重量与打印 —— // —— 重量与打印 ——
weighing_weight: { weighing_weight: {
@ -448,9 +456,10 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
hasWeighingWeight: { hasWeighingWeight: {
key: 'hasWeighingWeight', key: 'hasWeighingWeight',
label: '是否已称重', label: '是否已称重',
scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('bool') }, scanBox: { type: 'select', group: SCANBOX_GROUPS.status, options: getOptions('bool'), hideOperator: true },
table: null, table: null,
slot: null slot: null,
filterParamMap: { 是: 'true', 否: 'false' }
}, },
print_count: { print_count: {
key: 'print_count', key: 'print_count',
@ -630,6 +639,9 @@ export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig {
group: def.scanBox.group, group: def.scanBox.group,
multiple: def.scanBox.multiple, multiple: def.scanBox.multiple,
filterable: def.scanBox.filterable, filterable: def.scanBox.filterable,
operators: def.scanBox.operators,
defaultOperator: def.scanBox.defaultOperator,
hideOperator: def.scanBox.hideOperator,
required: (def.scanBox as any).required required: (def.scanBox as any).required
}) })
} }
@ -777,19 +789,18 @@ export function buildWhereConditions(rawConditions: Record<string, any>): Record
// 字段名映射(snake_case → camelCase) // 字段名映射(snake_case → camelCase)
const apiKey = WHERE_FIELD_MAP[key] || key const apiKey = WHERE_FIELD_MAP[key] || key
// 类型转换(对齐 API 参数类型:number / boolean)
value = coerceValue(value, apiKey)
// filterParamMap 值映射(仅单值) // filterParamMap 值映射(仅单值)
const def = FIELD_DICT[key] const def = FIELD_DICT[key]
if (def?.filterParamMap && !Array.isArray(value)) { if (def?.filterParamMap && !Array.isArray(value)) {
const mapped = def.filterParamMap[String(value)] const mapped = def.filterParamMap[String(value)]
if (mapped !== undefined) { if (mapped !== undefined) {
where[apiKey] = mapped value = mapped
continue
} }
} }
// 类型转换(映射后再转换,避免中文标签被转成 NaN)
value = coerceValue(value, apiKey)
// 扁平传值(string / number / boolean / array) // 扁平传值(string / number / boolean / array)
where[apiKey] = value where[apiKey] = value
} }
@ -886,9 +897,7 @@ export const tabPages: TabPageRawConfig[] = [
scanBoxFieldKeys: [ scanBoxFieldKeys: [
'waybill_code', 'waybill_code',
'main_waybill_code', 'main_waybill_code',
'keyword',
'waybill_type', 'waybill_type',
'order_no',
'order_id', 'order_id',
'store_name', 'store_name',
'logistics_code', 'logistics_code',

View File

@ -273,6 +273,11 @@ import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vu
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue' import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
import { waybillWarehouseDetail } from '@/api/waybill.warehouse' import { waybillWarehouseDetail } from '@/api/waybill.warehouse'
import { useAsyncExportTask } from '@/composables/useAsyncExportTask' import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
import {
extractStoreListFromResponse,
mapExpressListToCompanySelectOptions,
mapStoreListToSelectOptions
} from '@/utils/storeScanOptions'
import type { ToolbarButtonConfig as OrderToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types' import type { ToolbarButtonConfig as OrderToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
import { import {
PAGE_CONFIG, PAGE_CONFIG,
@ -327,7 +332,7 @@ function syncScanBoxFields() {
} }
/** 注入 ScanBox 下拉选项 */ /** 注入 ScanBox 下拉选项 */
function injectScanBoxOptions(fieldValue: string, options: { label: string; value: string }[]) { function injectScanBoxOptions(fieldValue: string, options: { label: string; value: string | number }[]) {
const field = dynamicScanBoxFields.value.find((f: any) => f.value === fieldValue) const field = dynamicScanBoxFields.value.find((f: any) => f.value === fieldValue)
if (field) { if (field) {
field.options = options field.options = options
@ -342,30 +347,31 @@ async function loadScanBoxOptions() {
getPlatformList({ systemOnly: true }), getPlatformList({ systemOnly: true }),
loadStores() loadStores()
]) ])
const expressRaw: any[] = expressRes?.data?.list ?? expressRes?.data ?? [] const expressPayload = expressRes?.data ?? expressRes
const platformRaw: any[] = platformRes?.data?.list ?? platformRes?.data ?? [] const expressRaw: any[] = Array.isArray(expressPayload)
const storesRaw: any[] = (storesRes as any)?.data?.stores ?? (storesRes as any)?.stores ?? [] ? expressPayload
: expressPayload?.list ?? expressPayload?.items ?? expressPayload?.records ?? []
const platformPayload = platformRes?.data ?? platformRes
const platformRaw: any[] = Array.isArray(platformPayload)
? platformPayload
: platformPayload?.list ?? platformPayload?.items ?? platformPayload?.records ?? []
const storesRaw = extractStoreListFromResponse(storesRes)
const expressOptions = expressRaw.map((item: any) => ({ const expressOptions = mapExpressListToCompanySelectOptions(expressRaw)
label: `${item.code ?? item.logistics_code ?? ''} — ${item.name ?? item.logistics_name ?? ''}`,
value: String(item.code ?? item.logistics_code ?? '')
})).filter((opt: any) => opt.value)
const platformOptions = platformRaw.map((item: any) => ({ const platformOptions = platformRaw.map((item: any) => ({
label: `${item.code ?? item.platform_code ?? ''} — ${item.name ?? item.platform_name ?? ''}`, label: `${item.code ?? item.platform_code ?? ''} — ${item.name ?? item.platform_name ?? ''}`,
value: String(item.code ?? item.platform_code ?? '') value: String(item.code ?? item.platform_code ?? '')
})).filter((opt: any) => opt.value) })).filter((opt: any) => opt.value)
const storeOptions = storesRaw.map((item: any) => ({ const storeOptions = mapStoreListToSelectOptions(storesRaw)
label: item.label ?? item.name ?? item.store_name ?? '',
value: item.value ?? item.id ?? item.store_id
})).filter((opt: any) => opt.value != null && opt.value !== '')
injectScanBoxOptions('logistics_code', expressOptions) injectScanBoxOptions('logistics_code', expressOptions)
injectScanBoxOptions('platform_code', platformOptions) injectScanBoxOptions('platform_code', platformOptions)
injectScanBoxOptions('store_name', storeOptions) injectScanBoxOptions('store_name', storeOptions)
} catch { } catch (error) {
// 选项加载失败时使用空数组 console.error('[WaybillWarehouse] 加载筛选选项失败:', error)
ElMessage.error('加载筛选选项失败,请刷新页面重试')
} }
} }