From 1b4107c4370ec83ed4ce5c3eb5d63e5cc284c6ba Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 10 Sep 2026 23:33:36 +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=B8=AD=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=8C=E8=BD=A6=E7=BC=96=E7=A0=81=E3=80=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88where.cart=5Fcode?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.wave/orderwave.ts | 2 +- src/views/order/waveOrder/WavePickTaskListPanel.vue | 8 ++++++-- src/views/order/waveOrder/config/wave-config.ts | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index dcd43e00..89346b90 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -31,7 +31,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) */ + /** 人员名称(operator_name 操作人/pick_user_name/review_user_name/claim_operator)、关联波次号 wave_no、车编码 cart_code 通过 where 传 { operator, value },由后端按 operator 处理(默认模糊 like) */ where?: Record strategy_id?: number /** 后端排序:sortField 取列 prop(如 order_count),结构对齐 stock.warehouse.list */ diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index 9748a807..474e0f56 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -841,6 +841,7 @@ async function loadData() { const claimOperatorNameOp = resolveScanConditionOperator(rawConditions, 'claim_operator') const reviewUserNameOp = resolveScanConditionOperator(rawConditions, 'review_user_name') const waveNoOp = resolveScanConditionOperator(rawConditions, 'wave_no') + const cartCodeOp = resolveScanConditionOperator(rawConditions, 'cart_code') /** 人员名称筛选:操作人 / 拣货人 / 领料人 / 复核人;操作符交由后端处理;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) @@ -848,6 +849,8 @@ async function loadData() { const reviewUserName = toWhereTextValue(resolveScanFilterValue(flat, ['review_user_name', 'recheck_user_name'], rawConditions), reviewUserNameOp) /** 波次号:固定仅模糊查询(like),value 为字符串 */ const waveNo = toWhereTextValue(resolveScanFilterValue(flat, ['wave_no'], rawConditions), waveNoOp) + /** 车编码(cart_code):默认模糊 like,操作符交由后端处理 */ + const cartCode = toWhereTextValue(resolveScanFilterValue(flat, ['cart_code'], rawConditions), cartCodeOp) const sort: WaveListRpcSort | undefined = currentSort.prop ? { sortField: currentSort.prop, @@ -870,7 +873,7 @@ async function loadData() { keyword: String(flat.keyword || '').trim() || undefined, start_time_start: startRange[0] || undefined, start_time_end: startRange[1] || undefined, - // 人员名称(操作人/拣货人/领料人/复核人)与关联波次号仅通过 where 传 { operator, value },由后端按 operator 决定匹配语义(默认模糊 like) + // 人员名称(操作人/拣货人/领料人/复核人)、关联波次号与车编码仅通过 where 传 { operator, value },由后端按 operator 决定匹配语义(默认模糊 like) where: { pick_user_id: pickUserId, review_user_id: reviewUserId, @@ -879,7 +882,8 @@ async function loadData() { 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 + wave_no: waveNo ? { operator: waveNoOp, value: waveNo } : undefined, + cart_code: cartCode ? { operator: cartCodeOp, value: cartCode } : undefined }, sort }) diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 2d89b950..ed9e1134 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -1055,6 +1055,8 @@ export const pickTaskWaveAvailableFields = [ pickTaskScanBasicField({ label: '任务编号', value: 'task_no', type: 'text' }), // 波次号:固定仅模糊查询(like,隐藏操作符下拉) pickTaskScanBasicField({ label: '波次号', value: 'wave_no', type: 'text', hideOperator: true, operators: ['like'], defaultOperator: 'like' }), + // 车编码(拣货车编码 cart_code):默认模糊查询,可切换等于/包含/模糊排除 + pickTaskScanBasicField({ label: '车编码', value: 'cart_code', type: 'text', operators: ['like', 'contains', 'eq', 'notlike'], 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' }),