From 1836500043b20ae13c2441d56c11db08af3f3730 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 30 Sep 2026 02:23:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8):=20?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E5=8C=BA=E9=97=B4=E4=B8=8E=E9=87=8D=E9=87=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/order-common-config.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 464eaeeb..56f31d68 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1501,6 +1501,37 @@ export const itemsTotalScanField = scanBasicField({ defaultOperator: 'ge' }) +/** + * ScanBox:重量类型(订单表列 weight_type)。0=常规、1=轻货、2=重货、3=冷链。 + * 与 wave_scope 一致,选项值用数字,where 输出 { operator: 'eq', value: 1 }。 + */ +export const weightTypeScanField = scanBasicField({ + label: '重量类型', + value: 'weight_type', + type: 'select', + options: [ + { label: '常规', value: 0 }, + { label: '轻货', value: 1 }, + { label: '重货', value: 2 }, + { label: '冷链', value: 3 } + ], + operators: ['eq'], + defaultOperator: 'eq' +}) + +/** + * ScanBox:商品重量(g)(订单表列 items_weight,订单内商品重量合计)。 + * 仅区间查询,where 输出 { operator: 'between', value: [min, max] }。 + */ +export const itemsWeightRangeScanField = scanBasicField({ + label: '商品重量(g)', + value: 'items_weight', + type: 'number', + operators: ['between'], + defaultOperator: 'between', + hideOperator: true +}) + /** 可复用 ScanBox 字段片段(工作流程) */ export const orderStatusScanField = (options: Array<{ label: string; value: string }>) => scanWorkflowField({ label: '订单状态', value: 'status', type: 'select', options }) @@ -1646,9 +1677,11 @@ export const deliveryAvailableFields = [ { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, // 商品统计 { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsWeightRangeScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1844,9 +1877,11 @@ export const reviewAvailableFields = [ { ...createChannelScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, // 商品统计 { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsWeightRangeScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2011,9 +2046,11 @@ export const pendingAvailableFields = [ { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, // 商品统计 { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsWeightRangeScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2406,9 +2443,11 @@ export const expectionOrderAvailableFields = [ { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, // 商品统计 { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsWeightRangeScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2531,9 +2570,11 @@ export const archiveAvailableFields = [ { ...createChannelScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...weightTypeScanField, group: SCAN_ORDER_INFO_GROUP }, // 商品统计 { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsWeightRangeScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...orderStatusScanField(archiveOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },