feat(order): 订单列表新增波次内序号 wave_index 显示列与区间筛选
This commit is contained in:
parent
8839bbc601
commit
1b7025a1e8
@ -92,6 +92,8 @@ export type DeliveryOrderListItem = {
|
||||
items_weight?: string
|
||||
wave_id?: number
|
||||
wave_no?: string
|
||||
/** 波次内序号 */
|
||||
wave_index?: number | string
|
||||
wave_strategy_version?: number
|
||||
wave_scan_result?: number
|
||||
post_status?: string
|
||||
|
||||
@ -375,6 +375,7 @@ export type RecheckOrderSingleListItem = {
|
||||
order_type?: string
|
||||
wave_id?: number
|
||||
wave_no?: string
|
||||
wave_index?: number | string
|
||||
pick_status?: string
|
||||
recheck_status?: string
|
||||
shop_nick?: string
|
||||
|
||||
@ -117,6 +117,7 @@
|
||||
</div>
|
||||
<div class="field-control">
|
||||
<el-select
|
||||
v-if="!field.hideOperator"
|
||||
v-model="customConditions[field.value].operator"
|
||||
placeholder="请选择"
|
||||
size="small"
|
||||
@ -131,9 +132,9 @@
|
||||
/>
|
||||
</el-select>
|
||||
<!-- isnull / isnotnull: 无需填值 -->
|
||||
<span v-if="isNullishOperator(customConditions[field.value].operator)" class="no-value-tip">无需填值</span>
|
||||
<span v-if="isNullishOperator(resolveFieldOperator(field))" class="no-value-tip">无需填值</span>
|
||||
<!-- between / notbetween: 区间双输入 -->
|
||||
<template v-else-if="isRangeOperator(customConditions[field.value].operator)">
|
||||
<template v-else-if="isRangeOperator(resolveFieldOperator(field))">
|
||||
<el-input-number
|
||||
v-model="customConditions[field.value].valueMin"
|
||||
:controls="false"
|
||||
@ -154,7 +155,7 @@
|
||||
</template>
|
||||
<!-- in / notin: 逗号分隔文本 -->
|
||||
<el-input
|
||||
v-else-if="isMultiOperator(customConditions[field.value].operator)"
|
||||
v-else-if="isMultiOperator(resolveFieldOperator(field))"
|
||||
v-model="customConditions[field.value].value"
|
||||
placeholder="多个值逗号分隔"
|
||||
size="small"
|
||||
@ -490,7 +491,7 @@
|
||||
:value="op.value"
|
||||
/>
|
||||
</el-select>
|
||||
<template v-if="isRangeOperator(customConditions[field.value].operator)">
|
||||
<template v-if="isRangeOperator(resolveFieldOperator(field))">
|
||||
<el-input
|
||||
:model-value="customConditions[field.value].valueMin"
|
||||
@update:model-value="(v: string) => handleCompactRangeInput(field, 'min', v)"
|
||||
@ -510,7 +511,7 @@
|
||||
/>
|
||||
</template>
|
||||
<el-input
|
||||
v-else-if="!isNullishOperator(customConditions[field.value].operator)"
|
||||
v-else-if="!isNullishOperator(resolveFieldOperator(field))"
|
||||
:model-value="customConditions[field.value].value"
|
||||
@update:model-value="(v: string) => handleCompactNumberInput(field, v)"
|
||||
:placeholder="field.label"
|
||||
@ -520,7 +521,7 @@
|
||||
/>
|
||||
<span v-else class="no-value-tip">无需填值</span>
|
||||
</div>
|
||||
<template v-else-if="isRangeOperator(customConditions[field.value].operator)">
|
||||
<template v-else-if="isRangeOperator(resolveFieldOperator(field))">
|
||||
<div class="compact-field-control">
|
||||
<el-input
|
||||
:model-value="customConditions[field.value].valueMin"
|
||||
@ -1029,6 +1030,13 @@ function isRangeOperator(op: string) {
|
||||
function isMultiOperator(op: string) {
|
||||
return ['in', 'notin'].includes(op)
|
||||
}
|
||||
/** 单操作符字段(hideOperator 且仅一个操作符):固定使用该操作符,避免历史缓存残留旧操作符 */
|
||||
function resolveFieldOperator(field: any) {
|
||||
if (field.hideOperator && Array.isArray(field.operators) && field.operators.length === 1) {
|
||||
return field.operators[0]
|
||||
}
|
||||
return customConditions[field.value]?.operator ?? ''
|
||||
}
|
||||
function isMultiValueTextOperator(op: string) {
|
||||
return ['contains', 'in', 'notin'].includes(op)
|
||||
}
|
||||
@ -1341,7 +1349,7 @@ function buildAndEmitCustomCondition() {
|
||||
|
||||
props.availableFields.forEach((field: any) => {
|
||||
const condition = customConditions[field.value]
|
||||
const op = condition.operator
|
||||
const op = resolveFieldOperator(field)
|
||||
|
||||
// isnull / isnotnull: 无需值,直接包含
|
||||
if (isNullishOperator(op)) {
|
||||
@ -1523,7 +1531,7 @@ function buildConditionsObject() {
|
||||
const conditions: any = {}
|
||||
props.availableFields.forEach((field: any) => {
|
||||
const condition = customConditions[field.value]
|
||||
const op = condition.operator
|
||||
const op = resolveFieldOperator(field)
|
||||
|
||||
// isnull / isnotnull
|
||||
if (isNullishOperator(op)) {
|
||||
|
||||
@ -1209,6 +1209,15 @@ export const storeScanField = scanBasicField({ label: '货主', value: 'store_id
|
||||
export const orderIdScanField = scanBasicField({ label: '订单ID', value: 'id', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' })
|
||||
export const orderFlagScanField = scanBasicField({ label: '订单标记', value: 'order_flag', type: 'text', operators: ['like', 'notlike'], defaultOperator: 'like' })
|
||||
export const waveNoScanField = scanBasicField({ label: '波次号', value: 'wave_no', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' })
|
||||
/** 波次内序号(wave_index):仅区间查询,where 输出 { operator: 'between', value: [min, max] } */
|
||||
export const waveIndexRangeScanField = scanBasicField({
|
||||
label: '序号',
|
||||
value: 'wave_index',
|
||||
type: 'number',
|
||||
operators: ['between'],
|
||||
defaultOperator: 'between',
|
||||
hideOperator: true
|
||||
})
|
||||
export const deliveryOrderCodeScanField = scanBasicField({ label: '发货单号', value: 'delivery_order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' })
|
||||
/** ScanBox:外部订单号(待处理订单专用,模糊匹配发货单号,替代表格右上角快捷搜索) */
|
||||
export const pendingOrderQuickSearchScanField = scanBasicField({ label: '外部订单号', value: 'delivery_order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'like' })
|
||||
@ -1368,6 +1377,7 @@ export const deliveryAvailableFields = [
|
||||
{ ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
@ -1434,8 +1444,18 @@ export const orderStoreRemarkColumn = {
|
||||
showOverflowTooltip: true
|
||||
}
|
||||
|
||||
/** 订单列表:波次内序号(接口字段 wave_index) */
|
||||
export const orderWaveIndexColumn = {
|
||||
prop: 'wave_index',
|
||||
label: '序号',
|
||||
width: '70',
|
||||
align: 'center',
|
||||
showOverflowTooltip: true
|
||||
}
|
||||
|
||||
export const deliveryColumns = applyOrderListCopyActions([
|
||||
{ prop: 'id', label: '订单ID', width: '80' },
|
||||
orderWaveIndexColumn,
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '170', fixed: 'left' },
|
||||
{ prop: 'pre_delivery_order_code', label: '前置单号', width: '150' },
|
||||
{ prop: 'shop_nick', label: '店铺名称', width: '140' },
|
||||
@ -1552,6 +1572,7 @@ export const reviewAvailableFields = [
|
||||
{ ...orderQuickSearchScanField, label: '发货单号', group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
@ -1573,6 +1594,7 @@ export const reviewAvailableFields = [
|
||||
|
||||
export const reviewColums = applyOrderListCopyActions([
|
||||
{ prop: 'id', label: '订单ID', width: '80' },
|
||||
orderWaveIndexColumn,
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '170' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: '260' },
|
||||
@ -1709,6 +1731,7 @@ export const pendingAvailableFields = [
|
||||
{ ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
@ -1742,6 +1765,7 @@ export const pendingAvailableFields = [
|
||||
|
||||
export const pendingCloums = [
|
||||
{ prop: 'id', label: '订单ID', width: '80' },
|
||||
orderWaveIndexColumn,
|
||||
{ prop: 'delivery_order_code', label: '外部订单号', width: '170' ,fixed: 'left'},
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: '260' },
|
||||
@ -2012,6 +2036,7 @@ export const workbenchAvailableFields = [
|
||||
{ ...deliveryOrderCodeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...buyerNickScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
@ -2024,6 +2049,7 @@ export const workbenchAvailableFields = [
|
||||
|
||||
export const workbenchColumns = applyOrderListCopyActions([
|
||||
{ prop: 'id', label: '订单ID', width: '80' },
|
||||
orderWaveIndexColumn,
|
||||
{ prop: 'delivery_order_code', label: '发货单号', minWidth: 160 },
|
||||
{ prop: 'wave_no', label: '波次号', minWidth: 160 },
|
||||
{ prop: 'order_flag', label: '订单标记', minWidth: 260 },
|
||||
@ -2077,6 +2103,7 @@ export const expectionOrderAvailableFields = [
|
||||
{ ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...expressCodeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
@ -2103,6 +2130,7 @@ export const expectionOrderAvailableFields = [
|
||||
|
||||
export const expectionColumns = [
|
||||
{ prop: 'id', label: '订单ID', width: '80' },
|
||||
orderWaveIndexColumn,
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '170' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '170' },
|
||||
{ prop: 'sys_platform_name', label: '平台编码', width: '120' },
|
||||
@ -2195,6 +2223,7 @@ export const archiveAvailableFields = [
|
||||
{ ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...waveIndexRangeScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
|
||||
@ -2214,6 +2243,7 @@ export const archiveAvailableFields = [
|
||||
|
||||
export const archiveColumns = applyOrderListCopyActions([
|
||||
{ prop: 'id', label: '订单ID', width: '80' },
|
||||
orderWaveIndexColumn,
|
||||
{ prop: 'order_code', label: '发货单号', width: '180' },
|
||||
{ prop: 'delivery_order_code', label: '发货单号', width: '160' },
|
||||
{ prop: 'wave_no', label: '波次号', width: '160' },
|
||||
|
||||
@ -315,6 +315,15 @@ function normalizeWhereConditionEntry(condition: Record<string, any>): Record<st
|
||||
return null
|
||||
}
|
||||
|
||||
// 数值区间(type=number + between/notbetween):保持数字类型,输出 { operator, value: [min, max] }
|
||||
if (type === 'number' && DATE_RANGE_OPERATORS.has(operator) && Array.isArray(value) && value.length >= 2) {
|
||||
const min = Number(value[0])
|
||||
const max = Number(value[1])
|
||||
if (Number.isFinite(min) && Number.isFinite(max)) {
|
||||
return { operator, type: 'number', value: [min, max] }
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
type === 'daterange'
|
||||
|| type === 'datetimerange'
|
||||
|
||||
@ -89,6 +89,7 @@
|
||||
>
|
||||
<el-table-column type="selection" width="46" :selectable="isRowSelectable" />
|
||||
<el-table-column prop="order_id" label="订单 ID" width="90" />
|
||||
<el-table-column prop="wave_index" label="序号" width="70" align="center" />
|
||||
<el-table-column prop="delivery_order_code" label="发货单号" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="wave_no" label="波次号" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="shop_nick" label="店铺" min-width="110" show-overflow-tooltip />
|
||||
|
||||
@ -258,6 +258,7 @@ export function getPickTaskWaveNos(row: any): string[] {
|
||||
/** 不符合波次策略订单列表:UpperTable 列配置 */
|
||||
export const fallbackOrderColumns = applyWaveListCopyActions([
|
||||
{ prop: 'id', label: 'ID', width: 80, align: 'center', fixed: 'left' },
|
||||
{ prop: 'wave_index', label: '序号', width: 70, align: 'center' },
|
||||
{ prop: 'delivery_no', label: '订单号', minWidth: 180, fixed: 'left' },
|
||||
{ prop: 'tracking_no', label: '物流单号', minWidth: 160 },
|
||||
{ prop: 'store_name', label: '店铺', minWidth: 140 },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user