diff --git a/docs/进度条弹窗-使用清单.md b/docs/进度条弹窗-使用清单.md index 5b384a7f..b29f50b1 100644 --- a/docs/进度条弹窗-使用清单.md +++ b/docs/进度条弹窗-使用清单.md @@ -1,15 +1,20 @@ # 进度条类弹窗 / 表单使用清单 -> 整理范围:`el-dialog` 内展示 `el-progress` 的“任务进度弹窗”,以及提交任务后在**弹窗表单内**原地展示进度的表单。 +> 整理范围:任务进度弹窗,以及提交任务后在**弹窗表单内**原地展示进度的表单。 > 不含页面内联进度(如库位容量、仪表盘统计、账号安全强度)。 > +> **状态(2026-10-20)**:下列 9 个进度弹窗组件均已改为基于 +> `components/task-progress/UnifiedTaskProgressDialog.vue`(猎豹进度条)渲染, +> 组件名与页面调用方式保持不变。 +> 任务完成后弹窗保持打开并展示完成状态,由用户手动关闭(导出、抓取、波次批量任务同样)。 +> > 示例入口:`order/waveOrder?tab=sandanFallbackOrders` → 「不符合波次策略订单列表」→ 工具栏「快速扫描」→ 波次策略快速扫描进度弹窗。 ## 总览 - 共 **9 个组件**、约 **55 处使用** - 两种形态: - 1. **独立进度弹窗**:`el-dialog` + 任务 ID + `el-progress` + 状态/数量信息(6 个组件) + 1. **独立进度弹窗**:任务 ID + 进度 + 状态/数量信息(6 个组件) 2. **弹窗表单内嵌进度**:先做表单提交,任务开始后在同一个弹窗里显示进度(3 个组件) - 只改这 9 个组件即可覆盖全部此类 UI @@ -19,7 +24,8 @@ ### 1. `src/components/AsyncExportProgressDialog.vue` - 标题由调用方传入,默认形态:任务 ID、状态、进度百分比、更新时间、提示文案 -- 进度:`el-progress :stroke-width="16"`,宽 `min(520px, 92vw)` +- 参数摘要:导出范围、导出模式、文件格式、数据量(由提交导出的 payload 自动提取,缺失则不显示) +- 进度:`UnifiedTaskProgressDialog`(猎豹进度条 + 指标区),宽 `min(560px, 92vw)` - 使用位置(23 个文件 / 25 处): | 模块 | 文件 | @@ -40,13 +46,19 @@ ### 2. `src/components/TaskProgressDialog.vue` - 通用异步任务进度:任务 ID、状态、进度、更新时间、错误/结果 -- 进度:`el-progress :stroke-width="16"`,执行中带条纹流动(`striped` / `striped-flow`) +- 实现:`UnifiedTaskProgressDialog`(轮询中禁用关闭,保留原交互) - 使用位置: - - `views/order/orderManagement/pendingOrder.vue`(分配快递号进度) - - `views/order/orderManagement/exceptionOrder.vue`(分配快递号进度) + - `views/order/orderManagement/pendingOrder.vue`(分配快递号) + - `views/order/orderManagement/exceptionOrder.vue`(分配快递号) ### 3. `src/views/order/orderManagement/component/OrderExportProgressDialog.vue` -- 订单导出进度:任务状态、任务 ID、条纹流动进度条 +- 订单导出进度:任务状态、任务 ID、进度与完成提示(`UnifiedTaskProgressDialog`) +- 参数摘要:导出模式(如「导出全部(含明细)」)、文件格式(Excel .xlsx) +- 进度明细:`已完成 current_count / total_count`、预计剩余时间 +- 指标:已完成、页数、耗时 + - 页数优先取后端 `message` 中的 `(a/b页)`,其次取 `sheet_count`,均无时显示 `—` + - 后端 message 中的「已完成 x/y 条 … (a/b页)」会被解析并从提示文案中移除,避免重复展示 +- 前置字段设置弹窗 `OrderExportColumnsDialog` 顶部同样展示:导出模式、文件格式、已选字段数 - 使用位置(8 个订单页面): - `reviewOrder.vue`、`pendingOrder.vue`、`outboundOrder.vue`、`deliveryOrder.vue` - `exceptionOrder.vue`、`deliveryException.vue`、`archiveOrder.vue`、`entrustWarehouse.vue` @@ -62,27 +74,35 @@ - `views/order/waveOrder/FallbackOrderListPanel.vue` ← **`tab=sandanFallbackOrders` 不符合波次策略订单列表** - `views/order/waveOrder/GroupWaveBatchListPanel.vue` ← `tab=groupWave` 团购波次 - 触发:工具栏「快速扫描」(`wave-config.ts` 中 `label: '快速扫描'`) +- 已改为基于 `UnifiedTaskProgressDialog` 渲染(猎豹进度条);扫描中可「后台运行」关闭弹窗,轮询继续,任务结束后刷新列表。 ### 5. `views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue` -- 标题:`抓取任务进度` +- 标题:`抓取任务` +- 实现:`UnifiedTaskProgressDialog`;弹窗显隐由 `taskId` 自动控制,底部操作区常驻(运行中为禁用的「处理中…」,完成后为「关闭」) - 使用位置(2 处): - `SandanWaveBatchListPanel.vue`(散单波次) - `GroupWaveBatchListPanel.vue`(团购波次) ### 6. `views/order/waveOrder/component/WaveBatchTaskProgressDialog.vue` - 标题由调用方传入,同一组件复用 4 类任务 +- 实现:`UnifiedTaskProgressDialog`;弹窗显隐由 `taskId` 自动控制,底部操作区常驻(运行中为禁用的「处理中…」,完成后为「关闭」) - 使用位置(8 处,散单波次 / 团购波次各 4 处): | 标题 | 所在文件 | |---|---| - | `快递号分配任务进度` | `SandanWaveBatchListPanel.vue`、`GroupWaveBatchListPanel.vue` | - | `储位分配任务进度` | 同上 | - | `移除异常订单任务进度` | 同上 | - | `批量取消波次任务进度` | 同上 | + | `快递号分配任务` | `SandanWaveBatchListPanel.vue`、`GroupWaveBatchListPanel.vue` | + | `储位分配任务` | 同上 | + | `移除异常订单任务` | 同上 | + | `批量取消波次任务` | 同上 | --- ## 三、弹窗表单内嵌进度(提交后原地显示进度) +> 已统一改为基于 `components/task-progress/UnifiedTaskProgressDialog.vue`(猎豹进度条)。 +> 下面 3 个表单组件保留原有 props/emits 作为业务包装层,页面调用方式无需改动: +> 无任务 ID 时显示 `mode="form"` 参数区,提交后切到 `mode="progress"` 进度区。 +> 任务完成后**不自动关闭**,停留在完成状态,由用户点击「关闭」退出。 + ### 7. `views/order/orderManagement/form/SyncOrderIdsForm.vue` - 表单:同步订单 ID(勾选数量 → 确认同步 → 任务 ID / 状态 / 处理进度 / 总数/已处理/成功/失败) - 使用位置(3 处): @@ -114,9 +134,9 @@ --- -## 五、若统一替换为「豹子进度条」的改造入口 +## 五、统一替换进度(已完成) -按影响面排序,优先改: +以下组件均已改为 `UnifiedTaskProgressDialog`,页面无需再改: 1. `src/components/AsyncExportProgressDialog.vue` → 覆盖 23 个页面 / 25 处 2. `src/components/TaskProgressDialog.vue` → 2 处 @@ -124,7 +144,7 @@ 4. 波次 3 个专用弹窗 → 12 处 5. 3 个表单内嵌进度 → 8 处 -> 说明:独立进度弹窗统一使用 `el-progress :stroke-width="16"`;表单内嵌同样使用 `stroke-width=16`,可将进度条部分抽成公共组件(如 `TaskProgressBar.vue`)后在一处替换。 +> 说明:以上 9 个组件已全部基于 `UnifiedTaskProgressDialog` 渲染,无需再逐个替换进度条。 --- @@ -156,3 +176,22 @@ - `progress` 到 100 或状态为 `failed` 时不显示 - 文案固定带「预计」前缀;`etaText` 仍可显式覆盖 +--- + +## 七、进度 / 数字平滑动画 + +后端按轮询间隔(常见 1.5s / 2s)返回阶梯式进度,直接渲染会「跳一下 → 停一段 → 再跳一下」。 +`UnifiedTaskProgressDialog` 内置了逐帧补间,页面无需改造: + +- 百分比、猎豹位置、进度条宽度由 `src/components/task-progress/smoothing.ts` 用 + `requestAnimationFrame` 逐帧驱动,不再依赖 CSS `transition`。 +- 动画时长按最近两次接口返回的间隔自适应(取其 85%,320–1700ms), + 轮询 2s 就动画约 1.7s,避免中途长时间停顿。 +- 进度明细(如「已处理 1,286 / 2,040」)与指标数字(`AnimatedNumber.vue`)同样补间; + 文本结构变化(如追加页数)或数值下降(任务重置)时直接吸附。 +- 任务进入完成 / 失败状态时立即对齐目标值,避免绿色进度条还在缓慢爬行。 +- 尊重系统「减少动态效果」:开启 `prefers-reduced-motion` 时全部直接吸附。 + +明细里如果含日期/时间(如 `TaskProgressDialog` 的「更新时间」),传 `:animate-detail="false"`, +避免时钟数字被补间。 + diff --git a/public/animation/animation.gif b/public/animation/animation.gif index 36fddef0..67c8695e 100644 Binary files a/public/animation/animation.gif and b/public/animation/animation.gif differ diff --git a/public/animation/animation1.gif b/public/animation/animation1.gif new file mode 100644 index 00000000..36fddef0 Binary files /dev/null and b/public/animation/animation1.gif differ diff --git a/public/animation/animation2.gif b/public/animation/animation2.gif new file mode 100644 index 00000000..c74ea339 Binary files /dev/null and b/public/animation/animation2.gif differ diff --git a/src/components/AsyncExportProgressDialog.vue b/src/components/AsyncExportProgressDialog.vue index 4803fa8c..f6462869 100644 --- a/src/components/AsyncExportProgressDialog.vue +++ b/src/components/AsyncExportProgressDialog.vue @@ -1,37 +1,31 @@ - - diff --git a/src/components/TaskProgressDialog.vue b/src/components/TaskProgressDialog.vue index 7afa0967..cdc4e6a9 100644 --- a/src/components/TaskProgressDialog.vue +++ b/src/components/TaskProgressDialog.vue @@ -1,52 +1,40 @@ - - diff --git a/src/components/task-progress/AnimatedNumber.vue b/src/components/task-progress/AnimatedNumber.vue new file mode 100644 index 00000000..a87609d8 --- /dev/null +++ b/src/components/task-progress/AnimatedNumber.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/components/task-progress/CheetahProgressBar.vue b/src/components/task-progress/CheetahProgressBar.vue index dcf1935e..3181d745 100644 --- a/src/components/task-progress/CheetahProgressBar.vue +++ b/src/components/task-progress/CheetahProgressBar.vue @@ -5,16 +5,18 @@
-
- - 猎豹奔跑 - -
+ +
+ + 猎豹奔跑 + +
+
@@ -38,6 +40,9 @@ const clamped = computed(() => { if (!Number.isFinite(value)) return 0 return Math.min(100, Math.max(0, value)) }) + +/** 仅「运行中且未跑完」才展示 GIF;到达 100% 或失败时淡出 */ +const showRunner = computed(() => props.state === 'running' && clamped.value < 100) diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 32940938..3c8c3cba 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -127,6 +127,7 @@ :task-id="exportTaskProgress.taskId" :message="exportTaskProgress.message" :error="exportTaskProgress.error" + :meta="exportTaskProgress" /> diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 9091b13e..2f83b864 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -299,6 +299,7 @@ :task-id="exportTaskProgress.taskId" :message="exportTaskProgress.message" :error="exportTaskProgress.error" + :meta="exportTaskProgress" /> diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index 23da8920..0f103a99 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -127,6 +127,7 @@ :task-id="exportTaskProgress.taskId" :message="exportTaskProgress.message" :error="exportTaskProgress.error" + :meta="exportTaskProgress" /> diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 0f4391f4..a066082b 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -202,7 +202,7 @@ /> diff --git a/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue b/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue index 10f63460..d669e378 100644 --- a/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue +++ b/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue @@ -1,77 +1,50 @@ - - diff --git a/src/views/order/orderManagement/form/StorageAllocateForm.vue b/src/views/order/orderManagement/form/StorageAllocateForm.vue index f3c63c67..4a9737bd 100644 --- a/src/views/order/orderManagement/form/StorageAllocateForm.vue +++ b/src/views/order/orderManagement/form/StorageAllocateForm.vue @@ -1,50 +1,48 @@ - - diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue index c4cb8f2e..7766babf 100644 --- a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -1,48 +1,47 @@ - - diff --git a/src/views/order/orderManagement/outboundOrder.vue b/src/views/order/orderManagement/outboundOrder.vue index 36208b5d..bfed3467 100644 --- a/src/views/order/orderManagement/outboundOrder.vue +++ b/src/views/order/orderManagement/outboundOrder.vue @@ -194,6 +194,7 @@ :task-id="exportTaskProgress.taskId" :message="exportTaskProgress.message" :error="exportTaskProgress.error" + :meta="exportTaskProgress" /> diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 89df696b..92f6036d 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -198,7 +198,7 @@ /> diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index 3bd9dbd7..663f6cf1 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -175,6 +175,7 @@ :task-id="exportTaskProgress.taskId" :message="exportTaskProgress.message" :error="exportTaskProgress.error" + :meta="exportTaskProgress" /> diff --git a/src/views/order/orderManagement/utils/toolbar-actions.ts b/src/views/order/orderManagement/utils/toolbar-actions.ts index b667b269..52632037 100644 --- a/src/views/order/orderManagement/utils/toolbar-actions.ts +++ b/src/views/order/orderManagement/utils/toolbar-actions.ts @@ -440,6 +440,16 @@ function normalizeAsyncTaskStatus(value: unknown) { return String(value ?? '').trim().toLowerCase() } +/** 取第一个可转成有效数字的值;全部缺失时返回 undefined(用于可选进度字段) */ +function toOptionalNumber(...values: unknown[]): number | undefined { + for (const value of values) { + if (value === undefined || value === null || value === '') continue + const num = Number(value) + if (Number.isFinite(num)) return num + } + return undefined +} + function isAsyncTaskSuccessStatus(status: string) { return ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete'].includes(status) } @@ -553,10 +563,10 @@ export function createPendingToolbarController(params: { const syncOrderIdsRequestId = ref('') const syncOrderIdsTaskStatus = ref('') const syncOrderIdsProgressPercent = ref(0) - const syncOrderIdsTotalCount = ref(0) - const syncOrderIdsProcessedCount = ref(0) - const syncOrderIdsSuccessCount = ref(0) - const syncOrderIdsFailedCount = ref(0) + const syncOrderIdsTotalCount = ref(undefined) + const syncOrderIdsProcessedCount = ref(undefined) + const syncOrderIdsSuccessCount = ref(undefined) + const syncOrderIdsFailedCount = ref(undefined) const syncOrderIdsMessage = ref('') const batchQuickRecheckDialogVisible = ref(false) @@ -821,8 +831,15 @@ export function createPendingToolbarController(params: { } if (isCancel) { + applyStorageAllocateProgress({ + status: 'success', + progress_percent: 100, + total_count: order_ids.length, + success_count: order_ids.length, + failed_count: 0, + message: res.message || '取消分配储位完成' + }) ElMessage.success(res.message || '取消分配储位已提交') - storageDialogVisible.value = false params.clearSelection() await params.loadData() return @@ -831,8 +848,15 @@ export function createPendingToolbarController(params: { const acceptedPayload = getApiResponsePayload<{ request_id?: string }>(res) const requestId = String(acceptedPayload.request_id || res?.request_id || '').trim() if (!requestId) { + applyStorageAllocateProgress({ + status: 'success', + progress_percent: 100, + total_count: order_ids.length, + success_count: order_ids.length, + failed_count: 0, + message: res.message || '储位分配完成' + }) ElMessage.success(res.message || '储位分配已提交') - storageDialogVisible.value = false params.clearSelection() await params.loadData() return @@ -880,8 +904,9 @@ export function createPendingToolbarController(params: { ?? progressPayload.result?.updated_count ?? order_ids.length ) || order_ids.length + storageAllocateProgressPercent.value = 100 + storageAllocateMessage.value = `储位分配完成 ${updatedCount} 条` ElMessage.success(`储位分配完成 ${updatedCount} 条`) - storageDialogVisible.value = false await params.loadData() } catch { ElMessage.error(isCancel ? '取消分配储位失败' : '储位分配失败') @@ -1044,10 +1069,10 @@ export function createPendingToolbarController(params: { syncOrderIdsRequestId.value = '' syncOrderIdsTaskStatus.value = '' syncOrderIdsProgressPercent.value = 0 - syncOrderIdsTotalCount.value = 0 - syncOrderIdsProcessedCount.value = 0 - syncOrderIdsSuccessCount.value = 0 - syncOrderIdsFailedCount.value = 0 + syncOrderIdsTotalCount.value = undefined + syncOrderIdsProcessedCount.value = undefined + syncOrderIdsSuccessCount.value = undefined + syncOrderIdsFailedCount.value = undefined syncOrderIdsMessage.value = '' syncOrderIdsDialogVisible.value = true } @@ -1104,8 +1129,16 @@ export function createPendingToolbarController(params: { if (!requestId) { // 无 request_id,视为同步完成 const count = Array.isArray(res?.data?.order_ids) ? res.data.order_ids.length : order_ids.length + applySyncOrderIdsProgress({ + status: 'success', + progress: 100, + total_count: count, + processed_count: count, + success_count: count, + failed_count: 0, + message: res?.message || '同步完成' + }) ElMessage.success((res?.message || '同步请求已受理') + `(${count} 条)`) - syncOrderIdsDialogVisible.value = false params.clearSelection() await params.loadData() return @@ -1146,16 +1179,13 @@ export function createPendingToolbarController(params: { } const progressPayload = await pollProgress() - const successCount = Number( - progressPayload.success_count - ?? progressPayload.result?.success_count - ?? order_ids.length - ) || order_ids.length - const failedCount = Number(progressPayload.failed_count ?? progressPayload.result?.failed_count ?? 0) || 0 - const parts = [`同步完成 ${successCount} 条`] - if (failedCount > 0) parts.push(`失败 ${failedCount} 条`) + const successCount = toOptionalNumber(progressPayload.success_count, progressPayload.result?.success_count) + const failedCount = toOptionalNumber(progressPayload.failed_count, progressPayload.result?.failed_count) + const parts = successCount === undefined ? ['同步完成'] : [`同步完成 ${successCount} 条`] + if (failedCount) parts.push(`失败 ${failedCount} 条`) + syncOrderIdsProgressPercent.value = 100 + syncOrderIdsMessage.value = parts.join(',') ElMessage.success(parts.join(',')) - syncOrderIdsDialogVisible.value = false await params.loadData() } catch { ElMessage.error('同步订单ID失败') @@ -1168,10 +1198,17 @@ export function createPendingToolbarController(params: { syncOrderIdsRequestId.value = String(progress.request_id || fallbackRequestId || syncOrderIdsRequestId.value || '') syncOrderIdsTaskStatus.value = normalizeAsyncTaskStatus(progress.status) syncOrderIdsProgressPercent.value = Number(progress.progress ?? progress.progress_percent ?? syncOrderIdsProgressPercent.value ?? 0) || 0 - syncOrderIdsTotalCount.value = Number(progress.total_count ?? progress.result?.total_count ?? syncOrderIdsTotalCount.value ?? 0) || 0 - syncOrderIdsProcessedCount.value = Number(progress.processed_count ?? progress.result?.processed_count ?? syncOrderIdsProcessedCount.value ?? 0) || 0 - syncOrderIdsSuccessCount.value = Number(progress.success_count ?? progress.result?.success_count ?? syncOrderIdsSuccessCount.value ?? 0) || 0 - syncOrderIdsFailedCount.value = Number(progress.failed_count ?? progress.result?.failed_count ?? syncOrderIdsFailedCount.value ?? 0) || 0 + + // 以下字段在 syncOrderIdsProgress 中均为可选:仅在接口实际返回时更新,未返回则保持隐藏。 + const totalCount = toOptionalNumber(progress.total_count, progress.result?.total_count) + if (totalCount !== undefined) syncOrderIdsTotalCount.value = totalCount + const processedCount = toOptionalNumber(progress.processed_count, progress.result?.processed_count) + if (processedCount !== undefined) syncOrderIdsProcessedCount.value = processedCount + const successCount = toOptionalNumber(progress.success_count, progress.result?.success_count) + if (successCount !== undefined) syncOrderIdsSuccessCount.value = successCount + const failedCount = toOptionalNumber(progress.failed_count, progress.result?.failed_count) + if (failedCount !== undefined) syncOrderIdsFailedCount.value = failedCount + syncOrderIdsMessage.value = String(progress.error || progress.message || '') } @@ -1264,10 +1301,10 @@ export function createPendingToolbarController(params: { syncOrderIdsRequestId.value = '' syncOrderIdsTaskStatus.value = '' syncOrderIdsProgressPercent.value = 0 - syncOrderIdsTotalCount.value = 0 - syncOrderIdsProcessedCount.value = 0 - syncOrderIdsSuccessCount.value = 0 - syncOrderIdsFailedCount.value = 0 + syncOrderIdsTotalCount.value = undefined + syncOrderIdsProcessedCount.value = undefined + syncOrderIdsSuccessCount.value = undefined + syncOrderIdsFailedCount.value = undefined syncOrderIdsMessage.value = '' } @@ -1408,8 +1445,16 @@ export function createPendingToolbarController(params: { batchAsyncTaskProgress.totalOrderCount = order_ids.length if (!taskId) { + applyBatchAsyncTaskProgress(batchAsyncTaskProgress, { + state: 'success', + progress_percent: 100, + total_order_count: order_ids.length, + processed_order_count: order_ids.length, + [config.progressCountKey]: order_ids.length, + [config.progressIdsKey]: order_ids, + message: batchAsyncTaskProgress.acceptMessage + }, config) ElMessage.success(batchAsyncTaskProgress.acceptMessage || '任务已提交') - batchAsyncTaskDialogVisible.value = false params.clearSelection() await params.loadData() return @@ -1430,6 +1475,8 @@ export function createPendingToolbarController(params: { const progressPayload = await pollBatchAsyncTaskProgress(taskId, config) const resultCount = Number(progressPayload[config.progressCountKey] ?? order_ids.length) || order_ids.length + batchAsyncTaskProgress.progressPercent = 100 + batchAsyncTaskProgress.acceptMessage = `${config.title}完成 ${resultCount} 条` ElMessage.success(`${config.title}完成 ${resultCount} 条`) await params.loadData() } catch (error: any) { diff --git a/src/views/order/waveOrder/FallbackOrderListPanel.vue b/src/views/order/waveOrder/FallbackOrderListPanel.vue index 3ad60b1a..2041190e 100644 --- a/src/views/order/waveOrder/FallbackOrderListPanel.vue +++ b/src/views/order/waveOrder/FallbackOrderListPanel.vue @@ -556,7 +556,14 @@ function resetWaveStrategyQuickScanResult() { function handleWaveStrategyQuickScanDialogVisibleChange(visible: boolean) { waveStrategyQuickScanDialogVisible.value = visible - if (!visible) { + if (visible) return + + // 扫描中关闭弹窗仅表示“后台运行”,保留任务 ID 继续轮询;结束后再清理状态。 + const status = normalizeAsyncTaskStatus(waveStrategyQuickScanResult.state) + const finished = isAsyncTaskSuccessStatus(status) + || isAsyncTaskFailureStatus(status) + || Number(waveStrategyQuickScanResult.progressPercent || 0) >= 100 + if (finished || !waveStrategyQuickScanResult.taskId) { resetWaveStrategyQuickScanResult() } } @@ -626,6 +633,7 @@ async function pollWaveStrategyQuickScanTaskProgress() { async function submitWaveStrategyQuickScan() { stopWaveStrategyQuickScanTaskPolling() + resetWaveStrategyQuickScanResult() waveStrategyQuickScanSubmitting.value = true waveStrategyQuickScanDialogVisible.value = true try { diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 7c62d81d..a3df23ad 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -328,7 +328,7 @@
可抓取订单 @@ -358,81 +358,45 @@ 返回订单 ID 列表
-
- + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - -
- -
-
- 已选 {{ groupOrderSelectionRows.length }} 个结构 -
- +
diff --git a/src/views/store/stores/index.vue b/src/views/store/stores/index.vue index 489864c7..fd60a550 100644 --- a/src/views/store/stores/index.vue +++ b/src/views/store/stores/index.vue @@ -996,6 +996,7 @@ :task-id="exportTaskProgress.taskId" :message="exportTaskProgress.message" :error="exportTaskProgress.error" + :meta="exportTaskProgress" :update-time="exportTaskProgress.updateTime" @update:visible="exportDialogVisible = $event" /> @@ -1003,7 +1004,7 @@ diff --git a/src/views/system/setting/basicManagement/newview/pages/ExportReportDialog.vue b/src/views/system/setting/basicManagement/newview/pages/ExportReportDialog.vue index 06e8df52..6f37b336 100644 --- a/src/views/system/setting/basicManagement/newview/pages/ExportReportDialog.vue +++ b/src/views/system/setting/basicManagement/newview/pages/ExportReportDialog.vue @@ -80,7 +80,7 @@ diff --git a/src/views/test/index.vue b/src/views/test/index.vue index 5195628f..ef1f0b4a 100644 --- a/src/views/test/index.vue +++ b/src/views/test/index.vue @@ -243,7 +243,7 @@