From c69d332b1bfc3d5d6a108223b830955feb692863 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 6 Aug 2026 04:05:27 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/orderManagement/config/order-common-config.ts | 7 +++++++ .../order/orderManagement/utils/order-index-helpers.ts | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index d11a6046..4e0c9732 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1210,6 +1210,7 @@ export const placeOrderTimeRangeScanField = scanBasicField({ label: '下单时 export const isUrgencyScanField = scanBasicField({ label: '是否紧急', value: 'is_urgency', type: 'select', options: isUrgencyFilterOptions }) export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', value: 'buyer_message_has', type: 'select', options: buyerMessageHasFilterOptions }) export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' }) +export const stockQueryScanField = scanBasicField({ label: '包含商品', value: 'stock_query', type: 'text', operators: ['like'], defaultOperator: 'like' }) /** 可复用 ScanBox 字段片段(工作流程) */ export const orderStatusScanField = (options: Array<{ label: string; value: string }>) => @@ -1348,6 +1349,7 @@ export const deliveryAvailableFields = [ { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1528,6 +1530,7 @@ export const reviewAvailableFields = [ { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1685,6 +1688,7 @@ export const pendingAvailableFields = [ { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1952,6 +1956,7 @@ export const workbenchAvailableFields = [ { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, { ...buyerNickScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...orderStatusScanField(workbenchStatusOptions), group: SCAN_PROCESS_STATUS_GROUP }, @@ -2020,6 +2025,7 @@ export const expectionOrderAvailableFields = [ { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2133,6 +2139,7 @@ export const archiveAvailableFields = [ { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...orderStatusScanField(archiveOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, diff --git a/src/views/order/orderManagement/utils/order-index-helpers.ts b/src/views/order/orderManagement/utils/order-index-helpers.ts index 8548b10b..8951c638 100644 --- a/src/views/order/orderManagement/utils/order-index-helpers.ts +++ b/src/views/order/orderManagement/utils/order-index-helpers.ts @@ -370,7 +370,8 @@ export function buildOrderWhereConditions(rawConditions: Record) { if (condition && typeof condition === 'object' && 'operator' in condition) { const normalized = normalizeWhereConditionEntry(condition) if (normalized) { - where[normalizedKey] = normalized + const { type: _type, ...rest } = normalized + where[normalizedKey] = rest } return } @@ -382,7 +383,6 @@ export function buildOrderWhereConditions(rawConditions: Record) { if (rangeValue) { where[normalizedKey] = { operator: 'between', - type: 'daterange', value: rangeValue } } @@ -390,8 +390,7 @@ export function buildOrderWhereConditions(rawConditions: Record) { } where[normalizedKey] = { operator: 'eq', - value: condition, - type: 'text' + value: condition } }) return where