From 91f5295b4f34d1c36c362a7691a2bd39fb8f1d31 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 7 May 2026 01:41:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E5=8D=95=E6=8A=93=E5=8F=96=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E6=94=B9=E5=8A=A8=EF=BC=8C=E8=AE=B0?= =?UTF-8?q?=E5=BE=97=E6=8B=89=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.wave/orderwave.ts | 36 +- .../order/waveOrder/WaveBatchListPanel.vue | 493 +++++++++--------- 2 files changed, 265 insertions(+), 264 deletions(-) diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index b7c72347..cf22208c 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -23,6 +23,21 @@ export type WaveGroupOrderFetchListParams = { return_order_ids?: boolean } +export type WaveStrategyFallbackOrderListParams = { + pagination?: { + page?: number + pageSize?: number + currentPage?: number + page_size?: number + size?: number + } + where?: Record + sort?: { + sortField?: string + sortOrder?: 'ASC' | 'DESC' | string + } +} + export type WaveFetchParams = { structure_list: Array<{ item_detail_machine: string @@ -224,12 +239,12 @@ export function orderWaveGroupOrderFetchList(data: WaveGroupOrderFetchListParams } as any) } -export function orderWaveSingleOrderFetchList(data: WaveGroupOrderFetchListParams = {}): Promise { +export function orderWaveWaveStrategyFallbackOrderList(data: WaveStrategyFallbackOrderListParams = {}): Promise { return request({ url: '/system', method: 'post', params: { - method: 'order.wave.singleOrderFetchList', + method: 'order.wave.waveStrategyFallbackOrderList', v, timestamp: new Date().getTime() }, @@ -285,6 +300,20 @@ export function orderWaveFetch(data: WaveFetchParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.wave.groupFetch', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + export function orderWaveFetchTaskProgress(data: WaveFetchTaskProgressParams): Promise { return request({ url: '/system', @@ -456,8 +485,9 @@ export function orderWaveBatchRemoveOrders(data: WaveBatchRemoveOrdersParams): P export const orderWave = { batchList: orderWaveBatchList, groupOrderFetchList: orderWaveGroupOrderFetchList, - singleOrderFetchList: orderWaveSingleOrderFetchList, + waveStrategyFallbackOrderList: orderWaveWaveStrategyFallbackOrderList, singleFetchByIds: orderWaveSingleFetchByIds, + groupFetch: orderWaveGroupFetch, fetch: orderWaveFetch, fetchTaskProgress: orderWaveFetchTaskProgress, batchAllocateExpress: orderWaveBatchAllocateExpress, diff --git a/src/views/order/waveOrder/WaveBatchListPanel.vue b/src/views/order/waveOrder/WaveBatchListPanel.vue index 881e7075..5f10ab13 100644 --- a/src/views/order/waveOrder/WaveBatchListPanel.vue +++ b/src/views/order/waveOrder/WaveBatchListPanel.vue @@ -435,169 +435,90 @@ -
- - - - - - - - - - - - - - - - - - - - - - 查询 - 重置 - - + + + + + + + + + + -
-
- 已选 {{ singleOrderSelectionRows.length }} 个结构 + + + +
+ +
+
- 返回订单 ID 列表 -
+ - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - -
- -
-
@@ -620,9 +541,9 @@