diff --git a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue
index a8f23802..97ba4f35 100644
--- a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue
+++ b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue
@@ -562,6 +562,13 @@
刷新
+
@@ -575,15 +582,29 @@
>
-
+
+
+
+ {{ Number(row.next_fetch_order_count ?? 0) === 0 ? '-' : (row.next_fetch_order_count ?? '—') }}
+
+
- {{ row.strategy_type ?? '—' }}
+
+ {{ { 1: '散单', 2: '团购' }[row.strategy_type] ?? row.strategy_type }}
+ —
+
- {{ row.status ?? '—' }}
+
+ {{ { 1: '启用', 0: '停用' }[row.status] ?? row.status }}
+ —
+
-
- {{ row.batch_mode ?? '—' }}
+
+
+ {{ { 0: '团购', 1: '单品单件', 2: '先拣后分', 3: '边拣边分', 4: '边拣边分H型', 5: '播种墙', 6: '流利架' }[row.batch_mode] ?? row.batch_mode }}
+ —
+
@@ -601,14 +622,32 @@
- {{ row.require_same_express ?? '—' }}
+
+ {{ row.require_same_express ? '是' : '否' }}
+ —
+
- {{ row.allow_cross_owner ?? '—' }}
+
+ {{ row.allow_cross_owner ? '是' : '否' }}
+ —
+
+
+
+
+ {{ Number(row.batch_max_orders ?? 0) === 0 ? '-' : (row.batch_max_orders ?? '—') }}
+
+
+
+
+ {{ Number(row.batch_max_skus ?? 0) === 0 ? '-' : (row.batch_max_skus ?? '—') }}
+
+
+
+
+ {{ Number(row.group_batch_max_orders ?? 0) === 0 ? '-' : (row.group_batch_max_orders ?? '—') }}
+
-
-
-
{{ formatDateTime(row.create_time) }}
@@ -694,19 +733,25 @@
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
+
+
@@ -731,10 +776,10 @@
-
-
+
+
-
+
@@ -1069,6 +1114,7 @@ const waveStrategyListLoading = ref(false)
const waveStrategyQuickScanSubmitting = ref(false)
const waveStrategyFetchSubmittingId = ref(null)
const waveStrategyList = ref([])
+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 }
+ },
+ calculate_next_fetch_order_count: showWaveStrategyNextFetchOrderCount.value ? 1 : 0
+ } as any) as WaveStrategyListResponse & { code?: number; message?: string; data?: Partial }
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) {
const strategyId = Number(row?.id || 0)
if (!strategyId) {
@@ -2842,6 +2922,7 @@ async function submitWaveStrategyFetchPda(row: Record) {
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 = {
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) {
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) {
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) {