From 7e380d6c543343378ee6548ed50439838e90df0d Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 5 Sep 2026 02:17:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B3=A2=E6=AC=A1=E6=8B=A3=E8=B4=A7):=20?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B3=A2=E6=AC=A1=E5=8F=B7/=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA/=E6=8B=A3=E8=B4=A7=E4=BA=BA/=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BA=BA/=E5=A4=8D=E6=A0=B8=E4=BA=BA=E7=AD=9B=E9=80=89?= =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E7=AC=A6=E7=BB=8F=20where=20?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=90=8E=E7=AB=AF=EF=BC=9Bcontains/in/notin?= =?UTF-8?q?=20=E7=9A=84=20value=20=E6=8C=89=E5=85=A8=E7=AB=99=E7=BA=A6?= =?UTF-8?q?=E5=AE=9A=E4=BB=A5=E6=95=B0=E7=BB=84=E4=BC=A0=E9=80=92=EF=BC=8C?= =?UTF-8?q?like=20=E7=AD=89=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.wave/orderwave.ts | 1 + .../order/waveOrder/WavePickTaskListPanel.vue | 51 ++++++++++++++++++- .../order/waveOrder/config/wave-config.ts | 7 +++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 6a59fbdc..cda4d68b 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -28,6 +28,7 @@ export type WavePickTaskListParams = { keyword?: string start_time_start?: string start_time_end?: string + /** 人员名称(operator_name 操作人/pick_user_name/review_user_name/claim_operator)与关联波次号 wave_no 通过 where 传 { operator, value },由后端按 operator 处理(默认模糊 like) */ where?: Record strategy_id?: number } diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index 748ebfee..c6f941f9 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -480,6 +480,36 @@ function toPositiveId(value: unknown): number | undefined { return Math.trunc(num) } +/** 读取 ScanBox 条件中指定字段的操作符(如 eq/like);未选择时默认模糊(like) */ +function resolveScanConditionOperator( + rawConditions: Record, + key: string, + fallback = 'like' +): string { + const root = unwrapScanBoxConditionMap(rawConditions) + const condition = root[key] + if (condition && typeof condition === 'object' && !Array.isArray(condition)) { + const op = condition.operator + if (typeof op === 'string' && op) return op + } + return fallback +} + +/** where 文本条件 value 归一化:contains/in/notin 与全站列表页约定一致,以数组下发(逗号/换行分隔,单值也包成数组);其余操作符以字符串下发 */ +function toWhereTextValue(raw: unknown, operator: string): string | string[] | undefined { + if (raw === undefined || raw === null) return undefined + const text = (Array.isArray(raw) ? raw.join(',') : String(raw)).trim() + if (!text) return undefined + if (['contains', 'in', 'notin'].includes(operator)) { + const values = text + .split(',') + .map((v) => v.trim()) + .filter(Boolean) + return values.length ? values : undefined + } + return text +} + /** 有输入即透传:纯数字转 number,其余按字符串传递(避免被过滤成空) */ function toIdFilterValue(value: unknown): number | string | undefined { if (value === undefined || value === null) return undefined @@ -712,6 +742,18 @@ async function loadData() { const reviewUserId = toIdFilterValue(resolveScanFilterValue(flat, ['review_user_id', 'recheck_user_id'], rawConditions)) const cartId = toIdFilterValue(resolveScanFilterValue(flat, ['cart_id', 'pick_car_id'], rawConditions)) const startRange = Array.isArray(flat.start_time_range) ? flat.start_time_range : [] + const operatorNameOp = resolveScanConditionOperator(rawConditions, 'operator_name') + const pickUserNameOp = resolveScanConditionOperator(rawConditions, 'pick_user_name') + const claimOperatorNameOp = resolveScanConditionOperator(rawConditions, 'claim_operator') + const reviewUserNameOp = resolveScanConditionOperator(rawConditions, 'review_user_name') + const waveNoOp = resolveScanConditionOperator(rawConditions, 'wave_no') + /** 人员名称筛选:操作人 / 拣货人 / 领料人 / 复核人;操作符交由后端处理;contains/in/notin 的 value 与全站列表页一致以数组下发(单值也包成数组),其余为字符串 */ + const operatorName = toWhereTextValue(resolveScanFilterValue(flat, ['operator_name', 'creator_name', 'creator'], rawConditions), operatorNameOp) + const pickUserName = toWhereTextValue(resolveScanFilterValue(flat, ['pick_user_name', 'picker_name'], rawConditions), pickUserNameOp) + const claimOperatorName = toWhereTextValue(resolveScanFilterValue(flat, ['claim_operator', 'claim_operator_name'], rawConditions), claimOperatorNameOp) + const reviewUserName = toWhereTextValue(resolveScanFilterValue(flat, ['review_user_name', 'recheck_user_name'], rawConditions), reviewUserNameOp) + /** 波次号:固定仅模糊查询(like),value 为字符串 */ + const waveNo = toWhereTextValue(resolveScanFilterValue(flat, ['wave_no'], rawConditions), waveNoOp) const res = await orderWaveWavePickTaskList({ warehouse_id: wid, page_no: pagination.currentPage, @@ -728,11 +770,16 @@ async function loadData() { keyword: String(flat.keyword || '').trim() || undefined, start_time_start: startRange[0] || undefined, start_time_end: startRange[1] || undefined, - // 兼容接口历史 where 解析逻辑;顶层参数仍为主路径 + // 人员名称(操作人/拣货人/领料人/复核人)与关联波次号仅通过 where 传 { operator, value },由后端按 operator 决定匹配语义(默认模糊 like) where: { pick_user_id: pickUserId, review_user_id: reviewUserId, - cart_id: cartId + cart_id: cartId, + operator_name: operatorName ? { operator: operatorNameOp, value: operatorName } : undefined, + pick_user_name: pickUserName ? { operator: pickUserNameOp, value: pickUserName } : undefined, + review_user_name: reviewUserName ? { operator: reviewUserNameOp, value: reviewUserName } : undefined, + claim_operator: claimOperatorName ? { operator: claimOperatorNameOp, value: claimOperatorName } : undefined, + wave_no: waveNo ? { operator: waveNoOp, value: waveNo } : undefined } }) diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 53d3670b..ab3808ee 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -1045,6 +1045,13 @@ export const pickTaskStatusFilterOptions = [ export const pickTaskWaveAvailableFields = [ // ===== 任务信息 ===== pickTaskScanBasicField({ label: '任务编号', value: 'task_no', type: 'text' }), + // 波次号:固定仅模糊查询(like,隐藏操作符下拉) + pickTaskScanBasicField({ label: '波次号', value: 'wave_no', type: 'text', hideOperator: true, operators: ['like'], defaultOperator: 'like' }), + // 人员名字按模糊/包含搜索:左侧操作符下拉可选「模糊匹配/包含/模糊排除」,默认「模糊匹配」 + pickTaskScanBasicField({ label: '操作人', value: 'operator_name', type: 'text', operators: ['like', 'contains', 'notlike'], defaultOperator: 'like' }), + pickTaskScanBasicField({ label: '拣货人', value: 'pick_user_name', type: 'text', operators: ['like', 'contains', 'notlike'], defaultOperator: 'like' }), + pickTaskScanBasicField({ label: '领料人', value: 'claim_operator', type: 'text', operators: ['like', 'contains', 'notlike'], defaultOperator: 'like' }), + pickTaskScanBasicField({ label: '复核人', value: 'review_user_name', type: 'text', operators: ['like', 'contains', 'notlike'], defaultOperator: 'like' }), pickTaskScanBasicField({ label: '开始时间', value: 'start_time_range', type: 'daterange' }), // ===== 流程状态(合并为一组,对齐波次列表 ScanBox) =====