diff --git a/src/views/Externalwarehouse/shipperSigning/index.vue b/src/views/Externalwarehouse/shipperSigning/index.vue index 44bcb558..20c96c9c 100644 --- a/src/views/Externalwarehouse/shipperSigning/index.vue +++ b/src/views/Externalwarehouse/shipperSigning/index.vue @@ -140,7 +140,7 @@ import { ref, reactive, onMounted } from 'vue' import { ElMessage } from 'element-plus' import { Search, Refresh } from '@element-plus/icons-vue' -import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse' +import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 6493b5a1..ace5655e 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1427,6 +1427,38 @@ export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' }) export const stockQueryScanField = scanBasicField({ label: '包含商品', value: 'stock_query', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'like' }) +/** + * 数量类数值筛选字段操作符(商品种类数量 / 商品总数)。 + * 与收货单列表 numberConfig 一致,仅保留比较与区间,避免出现 in/regexp 等无意义操作符。 + */ +export const ORDER_NUMBER_SCAN_OPERATORS = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'between'] + +/** + * ScanBox:商品种类数量(订单表列 items_count)。 + * where 输出 { operator: 'ge'|'gt'|'between'..., value },后者区间为 [min, max]。 + */ +export const itemsCountScanField = scanBasicField({ + label: '商品种类数量', + value: 'items_count', + type: 'number', + placeholder: '请输入商品种类数量', + operators: ORDER_NUMBER_SCAN_OPERATORS, + defaultOperator: 'ge' +}) + +/** + * ScanBox:商品总数(订单表列 items_total)。 + * where 输出 { operator: 'ge'|'gt'|'between'..., value },后者区间为 [min, max]。 + */ +export const itemsTotalScanField = scanBasicField({ + label: '商品总数', + value: 'items_total', + type: 'number', + placeholder: '请输入商品总数', + operators: ORDER_NUMBER_SCAN_OPERATORS, + defaultOperator: 'ge' +}) + /** 可复用 ScanBox 字段片段(工作流程) */ export const orderStatusScanField = (options: Array<{ label: string; value: string }>) => scanWorkflowField({ label: '订单状态', value: 'status', type: 'select', options }) @@ -1545,6 +1577,7 @@ export function fillStoreScanFieldOptions(availableFields: any[], rawStores: any // === ScanBox 筛选分组常量 === const SCAN_QUICK_FILTER_GROUP = '快速筛选' const SCAN_ORDER_INFO_GROUP = '订单信息' +const SCAN_GOODS_STATS_GROUP = '商品统计' const SCAN_PROCESS_STATUS_GROUP = '流程状态' const SCAN_RECEIVING_INFO_GROUP = '收货信息' const SCAN_TIME_GROUP = '时间' @@ -1569,6 +1602,9 @@ export const deliveryAvailableFields = [ { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + // 商品统计 + { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1761,6 +1797,9 @@ export const reviewAvailableFields = [ { ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + // 商品统计 + { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1924,6 +1963,9 @@ export const pendingAvailableFields = [ { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + // 商品统计 + { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2309,6 +2351,9 @@ export const expectionOrderAvailableFields = [ { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + // 商品统计 + { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2428,6 +2473,9 @@ export const archiveAvailableFields = [ { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, { ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP }, + // 商品统计 + { ...itemsCountScanField, group: SCAN_GOODS_STATS_GROUP }, + { ...itemsTotalScanField, group: SCAN_GOODS_STATS_GROUP }, // 流程状态 { ...orderStatusScanField(archiveOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, diff --git a/src/views/store/shipperSigning/index.vue b/src/views/store/shipperSigning/index.vue index cf6b6c33..7ee51fb6 100644 --- a/src/views/store/shipperSigning/index.vue +++ b/src/views/store/shipperSigning/index.vue @@ -192,7 +192,7 @@