diff --git a/src/api/order/packing/index.ts b/src/api/order/packing/index.ts index 99151217..cd031b92 100644 --- a/src/api/order/packing/index.ts +++ b/src/api/order/packing/index.ts @@ -26,6 +26,8 @@ export type PackingListWhere = { wave_no?: string /** 订单ID(精确匹配) */ order_id?: number | string + /** 打包员名称(对应响应 operator_text,支持模糊/包含/精确) */ + operator_text?: string /** 工作台ID(精确匹配) */ workbench_id?: number | string /** 快捷搜索:运单号/波次号模糊匹配 */ diff --git a/src/views/data/packingflow/packingflow-config.ts b/src/views/data/packingflow/packingflow-config.ts index 3dde0a26..d1675878 100644 --- a/src/views/data/packingflow/packingflow-config.ts +++ b/src/views/data/packingflow/packingflow-config.ts @@ -238,6 +238,15 @@ export const baseAvailableFields = [ value: 'order_id', type: 'text' as const }), + // 打包员(operator_text,任务主表展示文本列;默认模糊匹配,支持精确/包含) + packingScanField('basic', { + label: '打包员', + value: 'operator_text', + type: 'text' as const, + placeholder: '请输入打包员', + operators: ['like', 'contains', 'eq'], + defaultOperator: 'like' + }), packingScanField('workflow', { label: '任务状态', value: 'status', diff --git a/src/views/express/returnUnpack/index.vue b/src/views/express/returnUnpack/index.vue index 93b153df..6775796e 100644 --- a/src/views/express/returnUnpack/index.vue +++ b/src/views/express/returnUnpack/index.vue @@ -698,6 +698,8 @@ function buildWhereFromConditions(conditions: Record) { switch (key) { case 'unpack_no': case 'waybill_code': + // 拆包人按姓名模糊筛选(接口文档未列 unpacker_name,待后端确认;不支持时该条件会被忽略) + case 'unpacker_name': where[key] = { operator: 'like', value: String(value) } break case 'unpack_date': diff --git a/src/views/express/returnUnpack/returnUnpack-config.ts b/src/views/express/returnUnpack/returnUnpack-config.ts index e6365d7f..7bcf0074 100644 --- a/src/views/express/returnUnpack/returnUnpack-config.ts +++ b/src/views/express/returnUnpack/returnUnpack-config.ts @@ -43,6 +43,16 @@ export const returnUnpackAvailableFields = [ { label: '未识别', value: 'none_recognized' }, ], }, + // 拆包人:按姓名模糊筛选(发送 where.unpacker_name) + // ⚠️ 接口文档 where 仅列出 unpacker_id(工号ID,等值),unpacker_name 为响应字段,筛选键待后端确认支持 + { + value: 'unpacker_name', + label: '拆包人', + type: 'text', + placeholder: '拆包人姓名模糊搜索', + operators: ['like', 'eq'], + defaultOperator: 'like', + }, { value: 'unpack_date', label: '拆包日期', diff --git a/src/views/express/waybill/config/template-config.ts b/src/views/express/waybill/config/template-config.ts index 8c738918..1f5d0644 100644 --- a/src/views/express/waybill/config/template-config.ts +++ b/src/views/express/waybill/config/template-config.ts @@ -27,11 +27,13 @@ export const PAGE_CONFIG = { } /** - * 列表(筛选条件)查询超时时间:60 秒 - * 说明:全局 axios 默认超时为 10 秒,运单列表在大范围时间条件 + 多条件筛选下 - * 后端响应可能超过 10 秒,此处单独放宽为 60 秒,避免误报“请求超时”。 + * 列表(筛选条件)查询超时时间:5 分钟 + * 说明:与 `src/utils/request.ts` 的 list 类接口默认超时保持一致(5 分钟)。 + * 注意:`request.ts` 的「list 方法名以 list 结尾 → 5 分钟」规则仅在 + * 调用方未显式传 timeout 时生效,此处一旦显式传值就会覆盖该规则, + * 所以这里必须与全局保持一致(曾因写死 60 秒导致按 1 分钟超时)。 */ -export const LIST_REQUEST_TIMEOUT = 60 * 1000 +export const LIST_REQUEST_TIMEOUT = 5 * 60 * 1000 // ============================================================ // 〇-A、组件注册表