散单策略列表增加是否显示下一波可以抓取的数量

Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
liufumingren 2026-05-10 03:59:58 +08:00
parent 18e875ad56
commit 6f6281f500

View File

@ -562,6 +562,13 @@
<el-button type="primary" size="small" :loading="waveStrategyListLoading" @click="fetchWaveStrategyList">
刷新
</el-button>
<el-switch
v-model="showWaveStrategyNextFetchOrderCount"
size="small"
active-text="显示下一波抓取数量"
inactive-text="隐藏下一波抓取数量"
@change="handleWaveStrategyNextFetchOrderCountChange"
/>
</div>
</div>
@ -575,15 +582,29 @@
>
<el-table-column prop="id" label="ID" width="72" align="center" />
<el-table-column prop="strategy_name" label="策略名称" min-width="140" show-overflow-tooltip />
<el-table-column prop="warehouse_id" label="仓库ID" width="96" align="center" />
<el-table-column prop="matched_order_count_filtered" label="匹配订单数" width="100" align="center" />
<el-table-column v-if="showWaveStrategyNextFetchOrderCount" prop="next_fetch_order_count" label="下一波抓取数量" width="120" align="center">
<template #default="{ row }">
{{ Number(row.next_fetch_order_count ?? 0) === 0 ? '-' : (row.next_fetch_order_count ?? '—') }}
</template>
</el-table-column>
<el-table-column label="策略类型" width="88" align="center">
<template #default="{ row }">{{ row.strategy_type ?? '—' }}</template>
<template #default="{ row }">
<el-tag v-if="row.strategy_type != null" size="small" :type="row.strategy_type == 2 ? 'warning' : 'primary'">{{ { 1: '散单', 2: '团购' }[row.strategy_type] ?? row.strategy_type }}</el-tag>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="状态" width="72" align="center">
<template #default="{ row }">{{ row.status ?? '—' }}</template>
<template #default="{ row }">
<el-tag v-if="row.status != null" size="small" :type="row.status == 1 ? 'success' : 'danger'">{{ { 1: '启用', 0: '停用' }[row.status] ?? row.status }}</el-tag>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="批次模式" width="88" align="center">
<template #default="{ row }">{{ row.batch_mode ?? '—' }}</template>
<el-table-column label="批次模式" width="100" align="center">
<template #default="{ row }">
<el-tag v-if="row.batch_mode != null" size="small" type="info">{{ { 0: '团购', 1: '单品单件', 2: '先拣后分', 3: '边拣边分', 4: '边拣边分H型', 5: '播种墙', 6: '流利架' }[row.batch_mode] ?? row.batch_mode }}</el-tag>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="SKU区间" min-width="120" align="center">
<template #default="{ row }">
@ -601,14 +622,32 @@
</template>
</el-table-column>
<el-table-column label="同快递" width="72" align="center">
<template #default="{ row }">{{ row.require_same_express ?? '—' }}</template>
<template #default="{ row }">
<el-tag v-if="row.require_same_express != null" size="small" :type="row.require_same_express ? 'success' : 'info'">{{ row.require_same_express ? '是' : '否' }}</el-tag>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="跨货主" width="72" align="center">
<template #default="{ row }">{{ row.allow_cross_owner ?? '—' }}</template>
<template #default="{ row }">
<el-tag v-if="row.allow_cross_owner != null" size="small" :type="row.allow_cross_owner ? 'warning' : 'info'">{{ row.allow_cross_owner ? '是' : '否' }}</el-tag>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="单波最大订单" width="112" align="center">
<template #default="{ row }">
{{ Number(row.batch_max_orders ?? 0) === 0 ? '-' : (row.batch_max_orders ?? '—') }}
</template>
</el-table-column>
<el-table-column label="单波最大SKU" width="112" align="center">
<template #default="{ row }">
{{ Number(row.batch_max_skus ?? 0) === 0 ? '-' : (row.batch_max_skus ?? '—') }}
</template>
</el-table-column>
<el-table-column label="团购单波最大" width="112" align="center">
<template #default="{ row }">
{{ Number(row.group_batch_max_orders ?? 0) === 0 ? '-' : (row.group_batch_max_orders ?? '—') }}
</template>
</el-table-column>
<el-table-column prop="batch_max_orders" label="单波最大订单" width="112" align="center" />
<el-table-column prop="batch_max_skus" label="单波最大SKU" width="112" align="center" />
<el-table-column prop="group_batch_max_orders" label="团购单波最大" width="112" align="center" />
<el-table-column label="创建时间" min-width="168">
<template #default="{ row }">
{{ formatDateTime(row.create_time) }}
@ -694,19 +733,25 @@
<el-input v-model="waveStrategyFormModel.strategy_name" clearable placeholder="请输入策略名称" maxlength="80" />
</el-form-item>
<el-form-item label="策略类型" prop="strategy_type">
<el-input-number v-model="waveStrategyFormModel.strategy_type" :min="1" :precision="0" controls-position="right" />
<el-select v-model="waveStrategyFormModel.strategy_type" clearable placeholder="请选择策略类型">
<el-option :value="1" label="散单" />
<el-option :value="2" label="团购" />
</el-select>
</el-form-item>
<el-form-item label="批次模式" prop="batch_mode">
<el-input-number v-model="waveStrategyFormModel.batch_mode" :min="1" :precision="0" controls-position="right" />
<el-form-item v-if="waveStrategyFormModel.strategy_type !== 2" label="批次模式" prop="batch_mode">
<el-select v-model="waveStrategyFormModel.batch_mode" clearable placeholder="请选择批次模式">
<el-option :value="1" label="单品单件" />
<el-option :value="2" label="先拣后分" />
<el-option :value="3" label="边拣边分" />
<el-option :value="4" label="边拣边分H型" />
<el-option :value="5" label="播种墙" />
<el-option :value="6" label="流利架" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="waveStrategyFormModel.status" clearable placeholder="请选择状态">
<el-option
v-for="option in waveStrategyStatusOptions"
:key="String(option.value)"
:label="option.label"
:value="option.value"
/>
<el-option :value="1" label="启用" />
<el-option :value="0" label="停用" />
</el-select>
</el-form-item>
@ -731,10 +776,10 @@
<el-form-item label="单波最大订单" prop="batch_max_orders">
<el-input-number v-model="waveStrategyFormModel.batch_max_orders" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="单波最大SKU" prop="batch_max_skus">
<el-input-number v-model="waveStrategyFormModel.batch_max_skus" :min="0" :precision="0" controls-position="right" />
<el-form-item v-if="waveStrategyFormModel.batch_mode === 2" label="单波最大SKU" prop="batch_max_skus">
<el-input-number v-model="waveStrategyFormModel.batch_max_skus" :min="1" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="团购单波最大" prop="group_batch_max_orders">
<el-form-item v-if="waveStrategyFormModel.strategy_type === 2" label="团购单波最大" prop="group_batch_max_orders">
<el-input-number v-model="waveStrategyFormModel.group_batch_max_orders" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="要求同快递" prop="require_same_express">
@ -1069,6 +1114,7 @@ const waveStrategyListLoading = ref(false)
const waveStrategyQuickScanSubmitting = ref(false)
const waveStrategyFetchSubmittingId = ref<number | null>(null)
const waveStrategyList = ref<any[]>([])
const showWaveStrategyNextFetchOrderCount = ref(false)
const waveStrategyFormDialogVisible = ref(false)
const waveStrategyFormSubmitting = ref(false)
const waveStrategyFormMode = ref<'create' | 'edit'>('create')
@ -1078,7 +1124,7 @@ const waveStrategyFormModel = reactive({
strategy_name: '',
strategy_type: undefined as number | undefined,
batch_mode: undefined as number | undefined,
status: undefined as number | undefined,
status: 1 as number | undefined,
order_min_sku: undefined as number | undefined,
order_max_sku: undefined as number | undefined,
order_min_qty: undefined as number | undefined,
@ -1088,8 +1134,8 @@ const waveStrategyFormModel = reactive({
batch_max_orders: undefined as number | undefined,
batch_max_skus: undefined as number | undefined,
group_batch_max_orders: undefined as number | undefined,
require_same_express: undefined as boolean | undefined,
allow_cross_owner: undefined as boolean | undefined,
require_same_express: true as boolean | undefined,
allow_cross_owner: true as boolean | undefined,
description: '',
allowed_owners: [] as string[],
allowed_expresses: [] as string[],
@ -1316,6 +1362,34 @@ watch(
}
)
watch(
() => waveStrategyFormModel.strategy_type,
(type) => {
if (type === 2) {
waveStrategyFormModel.batch_mode = 0
waveStrategyFormModel.batch_max_orders = 0
return
}
if (waveStrategyFormModel.batch_mode === 0) {
waveStrategyFormModel.batch_mode = undefined
}
waveStrategyFormModel.group_batch_max_orders = 0
}
)
watch(
() => waveStrategyFormModel.batch_mode,
(mode) => {
if (mode !== 2) {
waveStrategyFormModel.batch_max_skus = 0
return
}
if (!waveStrategyFormModel.batch_max_skus || waveStrategyFormModel.batch_max_skus <= 0) {
waveStrategyFormModel.batch_max_skus = 1
}
}
)
onMounted(() => {
initializePage()
})
@ -2780,8 +2854,9 @@ async function fetchWaveStrategyList() {
pagination: {
page: waveStrategyPagination.currentPage,
pageSize: waveStrategyPagination.pageSize
}
}) as WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }
},
calculate_next_fetch_order_count: showWaveStrategyNextFetchOrderCount.value ? 1 : 0
} as any) as WaveStrategyListResponse & { code?: number; message?: string; data?: Partial<WaveStrategyListResponse> }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '获取波次策略列表失败')
}
@ -2807,6 +2882,11 @@ async function fetchWaveStrategyList() {
}
}
function handleWaveStrategyNextFetchOrderCountChange() {
waveStrategyPagination.currentPage = 1
void fetchWaveStrategyList()
}
async function submitWaveStrategyFetchPda(row: Record<string, any>) {
const strategyId = Number(row?.id || 0)
if (!strategyId) {
@ -2842,6 +2922,7 @@ async function submitWaveStrategyFetchPda(row: Record<string, any>) {
const hint = summary || payload?.message || res?.message || '后台抓取任务已创建'
const suffix = [taskNo ? `任务编号:${taskNo}` : '', taskId ? `任务ID:${taskId}` : ''].filter(Boolean).join(',')
ElMessage.success(suffix ? `${hint}(${suffix})` : hint)
await fetchWaveStrategyList()
} catch (error: any) {
console.error('submit wave strategy fetch admin failed:', error)
ElMessage.error(error?.message || '提交后台抓取任务失败')
@ -2866,7 +2947,7 @@ function resetWaveStrategyForm() {
waveStrategyFormModel.strategy_name = ''
waveStrategyFormModel.strategy_type = undefined
waveStrategyFormModel.batch_mode = undefined
waveStrategyFormModel.status = undefined
waveStrategyFormModel.status = 1
waveStrategyFormModel.order_min_sku = undefined
waveStrategyFormModel.order_max_sku = undefined
waveStrategyFormModel.order_min_qty = undefined
@ -2876,8 +2957,8 @@ function resetWaveStrategyForm() {
waveStrategyFormModel.batch_max_orders = undefined
waveStrategyFormModel.batch_max_skus = undefined
waveStrategyFormModel.group_batch_max_orders = undefined
waveStrategyFormModel.require_same_express = undefined
waveStrategyFormModel.allow_cross_owner = undefined
waveStrategyFormModel.require_same_express = true
waveStrategyFormModel.allow_cross_owner = true
waveStrategyFormModel.description = ''
waveStrategyFormModel.allowed_owners = []
waveStrategyFormModel.allowed_expresses = []
@ -2888,10 +2969,23 @@ function resetWaveStrategyForm() {
}
function buildWaveStrategyPayload() {
const normalizedBatchMode = waveStrategyFormModel.strategy_type === 2
? 0
: waveStrategyFormModel.batch_mode
const normalizedBatchMaxSkus = normalizedBatchMode === 2
? Math.max(1, Number(waveStrategyFormModel.batch_max_skus || 0))
: 0
const normalizedBatchMaxOrders = waveStrategyFormModel.strategy_type === 2
? 0
: waveStrategyFormModel.batch_max_orders
const normalizedGroupBatchMaxOrders = waveStrategyFormModel.strategy_type === 2
? waveStrategyFormModel.group_batch_max_orders
: 0
const payload: Partial<WaveStrategyCreateParams & WaveStrategyUpdateParams> = {
strategy_name: waveStrategyFormModel.strategy_name.trim(),
strategy_type: waveStrategyFormModel.strategy_type,
batch_mode: waveStrategyFormModel.batch_mode,
batch_mode: normalizedBatchMode,
status: waveStrategyFormModel.status,
order_min_sku: waveStrategyFormModel.order_min_sku,
order_max_sku: waveStrategyFormModel.order_max_sku,
@ -2899,9 +2993,9 @@ function buildWaveStrategyPayload() {
order_max_qty: waveStrategyFormModel.order_max_qty,
min_same_structure: waveStrategyFormModel.min_same_structure,
max_same_structure: waveStrategyFormModel.max_same_structure,
batch_max_orders: waveStrategyFormModel.batch_max_orders,
batch_max_skus: waveStrategyFormModel.batch_max_skus,
group_batch_max_orders: waveStrategyFormModel.group_batch_max_orders,
batch_max_orders: normalizedBatchMaxOrders,
batch_max_skus: normalizedBatchMaxSkus,
group_batch_max_orders: normalizedGroupBatchMaxOrders,
require_same_express: waveStrategyFormModel.require_same_express,
allow_cross_owner: waveStrategyFormModel.allow_cross_owner,
description: waveStrategyFormModel.description.trim() || undefined
@ -2937,7 +3031,10 @@ function openEditWaveStrategyDialog(row: Record<string, any>) {
waveStrategyEditingId.value = Number(row?.id || 0) || null
waveStrategyFormModel.strategy_name = String(row?.strategy_name || '')
waveStrategyFormModel.strategy_type = Number(row?.strategy_type ?? 0) || undefined
waveStrategyFormModel.batch_mode = Number(row?.batch_mode ?? 0) || undefined
const rawBatchMode = row?.batch_mode
waveStrategyFormModel.batch_mode = rawBatchMode !== undefined && rawBatchMode !== null && Number(rawBatchMode) === 0
? 0
: Number(rawBatchMode ?? 0) || undefined
waveStrategyFormModel.status = row?.status === 0 || row?.status === 1 ? Number(row.status) : undefined
waveStrategyFormModel.order_min_sku = Number(row?.order_min_sku ?? 0) || undefined
waveStrategyFormModel.order_max_sku = Number(row?.order_max_sku ?? 0) || undefined
@ -2945,9 +3042,17 @@ function openEditWaveStrategyDialog(row: Record<string, any>) {
waveStrategyFormModel.order_max_qty = Number(row?.order_max_qty ?? 0) || undefined
waveStrategyFormModel.min_same_structure = Number(row?.min_same_structure ?? 0) || undefined
waveStrategyFormModel.max_same_structure = Number(row?.max_same_structure ?? 0) || undefined
waveStrategyFormModel.batch_max_orders = Number(row?.batch_max_orders ?? 0) || undefined
waveStrategyFormModel.batch_max_skus = Number(row?.batch_max_skus ?? 0) || undefined
waveStrategyFormModel.group_batch_max_orders = Number(row?.group_batch_max_orders ?? 0) || undefined
waveStrategyFormModel.batch_max_orders = waveStrategyFormModel.strategy_type === 2
? 0
: Number(row?.batch_max_orders ?? 0) || undefined
const rawBatchMaxSkus = row?.batch_max_skus
waveStrategyFormModel.batch_max_skus = rawBatchMaxSkus !== undefined && rawBatchMaxSkus !== null && Number(rawBatchMaxSkus) === 0
? 0
: Number(rawBatchMaxSkus ?? 0) || undefined
const rawGroupBatchMaxOrders = row?.group_batch_max_orders
waveStrategyFormModel.group_batch_max_orders = rawGroupBatchMaxOrders !== undefined && rawGroupBatchMaxOrders !== null && Number(rawGroupBatchMaxOrders) === 0
? 0
: Number(rawGroupBatchMaxOrders ?? 0) || undefined
if (row?.require_same_express === 1 || row?.require_same_express === true) {
waveStrategyFormModel.require_same_express = true
} else if (row?.require_same_express === 0 || row?.require_same_express === false) {