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 @@
-
-
-
-
-
- 状态:{{ statusLabel }}
- 进度:{{ progressPercent }}%
- 更新时间:{{ formatDateTime(updateTime) }}
-
-
- {{ error || message }}
-
-
- 导出任务在后台执行中,关闭本窗口可停止自动刷新;重新进入本页面或再次点击导出可恢复查看结果。
-
-
-
+
-
-
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 @@
-
-
-
-
-
- 状态:{{ statusLabel }}
- 进度:{{ progressPercent }}%
- 更新时间:{{ updateTime }}
-
-
- {{ errorText }}
-
-
- {{ resultText }}
-
-
-
{{ polling ? '处理中…' : '关闭' }}
+ >
+ {{ polling ? '处理中…' : '关闭' }}
+
-
+
-
-
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 @@
+{{ output }}
+
+
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 @@
-
-
-
-
-
- {{ orderCount }} 条
-
-
-
-
- {{ taskId || '—' }}
-
-
- {{ taskStateText }}
-
-
-
-
-
- 总订单:{{ totalOrderCount }}
- 已处理:{{ processedOrderCount }}
- {{ resultCountLabel }}:{{ resultOrderCount }}
-
-
{{ acceptMessage }}
-
{{ errorMessage }}
-
- {{ resultIdsLabel }}:
- {{ resultOrderIds.join(', ') }}
-
-
-
-
-
-
-
- {{ phase === 'progress' && !isFinished ? '后台处理' : '关闭' }}
-
-
- {{ submitButtonText }}
-
+
+
+ {{ progressState === 'running' ? '后台运行' : '关闭' }}
+
+
+
+ 取消
+
+ {{ submitButtonText }}
+
+
-
+
-
-
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 @@
-
-
-
- {{ orderCount }} 条
-
-
-
-
-
-
- {{ requestId }}
-
-
- {{ progressStatusText }}
-
-
-
-
-
- 总数:{{ totalCount }}
- 成功:{{ successCount }}
- 失败:{{ failedCount }}
-
-
{{ message }}
-
-
-
-
- 取消
-
- {{ submitButtonText }}
-
+
+
+ {{ progressState === 'running' ? '后台运行' : '关闭' }}
+
+
+
+ 取消
+
+ {{ submitButtonText }}
+
+
-
+
-
-
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 @@
-
-
-
- {{ orderCount }} 条
-
-
-
- {{ requestId }}
-
-
- {{ progressStatusText }}
-
-
-
-
-
- 总数:{{ totalCount }}
- 已处理:{{ processedCount }}
- 成功:{{ successCount }}
- 失败:{{ failedCount }}
-
-
{{ message }}
-
-
-
-
- 取消
-
- {{ requestId ? '处理中' : '确认同步' }}
-
+
+
+ {{ progressState === 'running' ? '后台运行' : '关闭' }}
+
+
+
+ 取消
+
+ 确认同步
+
+
-
+
-
-
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 列表
-
-
+
-
-
-
-
-
-
-
- {{ getGroupOrderStoreText(row) }}
-
-
-
-
- {{ getGroupOrderStatusSummary(row) }}
-
-
-
-
- {{ getGroupOrderItemSnapshotText(row) }}
-
-
-
-
-
- {{ formatDateTime(row.first_order_time) }}
-
-
-
-
- {{ formatDateTime(row.last_order_time) }}
-
-
-
+
+ {{ getGroupOrderStoreText(row) }}
+
+
+ {{ getGroupOrderStatusSummary(row) }}
+
+
+ {{ getGroupOrderItemSnapshotText(row) }}
+
+
+ {{ formatDateTime(row.first_order_time) }}
+
+
+ {{ formatDateTime(row.last_order_time) }}
+
+
+
+
暂无可抓取的团购单结构
-
-
-
-
@@ -685,34 +649,39 @@
handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateExpressTaskProgress)"
/>
handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateStorageTaskProgress)"
/>
handleBatchTaskProgressVisibleChange(visible, resetBatchRemoveExceptionOrdersTaskProgress)"
/>
handleBatchTaskProgressVisibleChange(visible, resetBatchCancelTaskProgress)"
/>
import { KeepAlive, computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
-import { useResizeObserver } from '@vueuse/core'
import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
@@ -938,6 +906,7 @@ import {
waveAvailableFields,
fallbackOrderAvailableFields,
waveBatchColumns,
+ waveGroupOrderColumns,
waveWhereAllowedFields,
waveWhereTextOperatorFields,
getWaveToolbarButtons,
@@ -1060,17 +1029,13 @@ const router = useRouter()
const scanBox = ref(null)
const upperTable = ref(null)
+/** 「抓取团购单」弹窗表格(UpperTable) */
const groupOrderTableRef = ref(null)
-const groupOrderTableHostRef = ref(null)
-const groupOrderTableHeight = ref(320)
-/** 表格高度跟随宿主容器(弹窗剩余高度),不要给 el-table 写 height="100%" */
-useResizeObserver(groupOrderTableHostRef, (entries) => {
- const h = entries[0]?.contentRect.height ?? 0
- if (h >= 120) {
- groupOrderTableHeight.value = Math.floor(h)
- }
-})
+/** 行唯一键:商品结构机器码 */
+function groupOrderRowKey(row: any) {
+ return String(row?.item_detail_machine ?? '')
+}
const loading = ref(false)
const showInternalSourceWaves = ref(false)
@@ -1108,22 +1073,20 @@ const selectionRows = ref([])
const hasSelection = ref(false)
const groupOrderDialogVisible = ref(false)
-/** 打开弹窗后兜底取一次高度(ResizeObserver 首帧未回调时不留空白) */
-watch(groupOrderDialogVisible, async (visible) => {
- if (!visible) return
- await nextTick()
- requestAnimationFrame(() => {
- const h = groupOrderTableHostRef.value?.clientHeight ?? 0
- if (h >= 120) {
- groupOrderTableHeight.value = Math.floor(h)
- }
- })
-})
-
const groupOrderListLoading = ref(false)
const groupOrderSubmitting = ref(false)
const groupOrderList = ref([])
const groupOrderSelectionRows = ref([])
+/** 「抓取团购单」列表查询耗时(UpperTable 分页条展示) */
+const groupOrderQueryTime = ref(0)
+/**
+ * 跨页选择缓存(key = item_detail_machine):
+ * UpperTable 在 data 变更(翻页/重查)时会清空内部选择,这里自行缓存已勾选结构,
+ * 保证与原先 el-table 的 reserve-selection 行为一致。
+ */
+const groupOrderSelectionMap = new Map()
+/** 数据重载期间置 true:忽略 UpperTable 被动清空选择时发来的 selection-change */
+let groupOrderSelectionReloading = false
const groupOrderStoreOptions = ref>([])
const waveMaxOrderLimit = ref(null)
const fetchTaskPollTimer = ref | null>(null)
@@ -1316,11 +1279,7 @@ const buttonDisabledMap = computed(() => ({
}))
const buttonLabelMap = computed(() => ({
- batchPrintTotal: `批量打印(${selectedWaveOrderTotal.value})`,
- batchOutboundPrintTotal: `批量打印出库单(${selectedWaveOrderTotal.value})`,
- batchPlatformPrintTotal: `批量打印(平台)(${selectedWaveOrderTotal.value})`,
- batchPickingPrintTotal: `批量打印拣货单(${selectionRows.value.length})`,
- batchQuickRecheckByWaveTotal: `批量发货(${selectionRows.value.length})`,
+ // 工具栏按钮标签不再显示选中数量统计(仅保留动态文案类标签)
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
@@ -2360,6 +2319,7 @@ function applyFetchTaskProgress(progress: Partial
fetchTaskProgress.stopReason = String(progress.stop_reason || '')
}
+
function resetFetchTaskProgress() {
fetchTaskProgress.taskId = ''
fetchTaskProgress.status = 'submitted'
@@ -2378,6 +2338,10 @@ function resetFetchTaskProgress() {
fetchTaskProgress.stopReason = ''
}
+function handleFetchTaskProgressVisibleChange(visible: boolean) {
+ if (!visible) resetFetchTaskProgress()
+}
+
async function pollFetchTaskProgress() {
if (!fetchTaskProgress.taskId) return
try {
@@ -2391,14 +2355,14 @@ async function pollFetchTaskProgress() {
if (fetchTaskProgress.status === 'failed' || fetchTaskProgress.status === 'not_found') {
stopFetchTaskPolling()
await loadData()
- resetFetchTaskProgress()
+ // 保留任务状态,弹窗停留在结束态,由用户手动关闭
return
}
if (fetchTaskProgress.status === 'success' || Number(fetchTaskProgress.progressPercent || 0) >= 100) {
stopFetchTaskPolling()
await loadData()
- resetFetchTaskProgress()
+ // 保留任务状态,弹窗停留在完成态,由用户手动关闭
return
}
@@ -2657,6 +2621,10 @@ function resetBatchCancelTaskProgress() {
batchCancelTaskProgress.message = ''
}
+function handleBatchTaskProgressVisibleChange(visible: boolean, resetFn: () => void) {
+ if (!visible) resetFn()
+}
+
async function pollBatchCancelTaskProgress() {
if (!batchCancelTaskProgress.taskId) return
try {
@@ -2671,14 +2639,12 @@ async function pollBatchCancelTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchCancelTaskPolling()
await loadData()
- resetBatchCancelTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchCancelTaskProgress.progressPercent || 0) >= 100) {
stopBatchCancelTaskPolling()
await loadData()
- resetBatchCancelTaskProgress()
return
}
@@ -2703,14 +2669,12 @@ async function pollBatchRemoveExceptionOrdersTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchRemoveExceptionOrdersTaskPolling()
await loadData()
- resetBatchRemoveExceptionOrdersTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchRemoveExceptionOrdersTaskProgress.progressPercent || 0) >= 100) {
stopBatchRemoveExceptionOrdersTaskPolling()
await loadData()
- resetBatchRemoveExceptionOrdersTaskProgress()
return
}
@@ -2735,14 +2699,12 @@ async function pollBatchAllocateStorageTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchAllocateStorageTaskPolling()
await loadData()
- resetBatchAllocateStorageTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchAllocateStorageTaskProgress.progressPercent || 0) >= 100) {
stopBatchAllocateStorageTaskPolling()
await loadData()
- resetBatchAllocateStorageTaskProgress()
return
}
@@ -2767,14 +2729,12 @@ async function pollBatchAllocateExpressTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchAllocateExpressTaskPolling()
await loadData()
- resetBatchAllocateExpressTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchAllocateExpressTaskProgress.progressPercent || 0) >= 100) {
stopBatchAllocateExpressTaskPolling()
await loadData()
- resetBatchAllocateExpressTaskProgress()
return
}
@@ -3126,6 +3086,7 @@ async function handleToggleWavePrintStatus(row: any) {
function openGroupOrderDialog() {
groupOrderDialogVisible.value = true
groupOrderFilters.distinguishExpress = true
+ groupOrderSelectionMap.clear()
groupOrderSelectionRows.value = []
loadGroupOrderStoreOptions()
searchGroupOrders()
@@ -3665,7 +3626,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()
}
}
@@ -3735,6 +3703,7 @@ async function pollWaveStrategyQuickScanTaskProgress() {
async function submitWaveStrategyQuickScan() {
stopWaveStrategyQuickScanTaskPolling()
+ resetWaveStrategyQuickScanResult()
waveStrategyQuickScanSubmitting.value = true
waveStrategyQuickScanDialogVisible.value = true
try {
@@ -3871,6 +3840,8 @@ function searchGroupOrders() {
async function fetchGroupOrderList() {
groupOrderListLoading.value = true
+ const startedAt = Date.now()
+ groupOrderSelectionReloading = true
try {
const res = await orderWaveGroupOrderFetchList(buildGroupOrderListPayload()) as
WaveGroupOrderFetchListResponse & { code?: number; message?: string; data?: Partial }
@@ -3887,18 +3858,45 @@ async function fetchGroupOrderList() {
groupOrderPagination.currentPage = responsePagination.page || groupOrderPagination.currentPage
groupOrderPagination.pageSize = responsePagination.pageSize || groupOrderPagination.pageSize
groupOrderPagination.total = responsePagination.total || 0
+ groupOrderQueryTime.value = Date.now() - startedAt
+ await restoreGroupOrderSelection()
} catch (error: any) {
console.error('fetch group order list failed:', error)
groupOrderList.value = []
groupOrderPagination.total = 0
+ groupOrderSelectionMap.clear()
+ groupOrderSelectionRows.value = []
ElMessage.error(error?.message || '获取可抓取团购单列表失败')
} finally {
+ groupOrderSelectionReloading = false
groupOrderListLoading.value = false
}
}
+/** 数据重载后回填跨页选择(UpperTable 内部已清空,按缓存的 key 重新勾选) */
+async function restoreGroupOrderSelection() {
+ await nextTick()
+ const table = groupOrderTableRef.value
+ groupOrderList.value.forEach((row: any) => {
+ const key = groupOrderRowKey(row)
+ if (!key || !groupOrderSelectionMap.has(key)) return
+ groupOrderSelectionMap.set(key, row)
+ table?.toggleRowSelection?.(row, true)
+ })
+ groupOrderSelectionRows.value = Array.from(groupOrderSelectionMap.values())
+}
+
function handleGroupOrderSelectionChange(rows: any[]) {
- groupOrderSelectionRows.value = rows || []
+ // 数据重载导致的内部清空不算用户操作,保留跨页选择
+ if (groupOrderSelectionReloading) return
+ const selectedKeys = new Set((Array.isArray(rows) ? rows : []).map(groupOrderRowKey))
+ groupOrderList.value.forEach((row: any) => {
+ const key = groupOrderRowKey(row)
+ if (!key) return
+ if (selectedKeys.has(key)) groupOrderSelectionMap.set(key, row)
+ else groupOrderSelectionMap.delete(key)
+ })
+ groupOrderSelectionRows.value = Array.from(groupOrderSelectionMap.values())
}
function handleGroupOrderFilterChange() {
@@ -4059,7 +4057,9 @@ async function submitGroupOrderDialog() {
ElMessage.success(acceptedMessage)
groupOrderDialogVisible.value = false
+ groupOrderSelectionMap.clear()
groupOrderSelectionRows.value = []
+ groupOrderTableRef.value?.clearSelection?.()
} catch (error: any) {
console.error('fetch group order failed:', error)
ElMessage.error(error?.message || (isGroupWaveTab.value ? '抓取团购单失败' : '抓取散单失败'))
@@ -4198,12 +4198,21 @@ async function submitFallbackOrderFetchByIds() {
min-height: 0;
}
-/* 表格区填满弹窗剩余高度,避免分页器与底部按钮之间出现空白 */
+/* 表格区填满弹窗剩余高度,避免分页器与底部按钮之间出现空白(UpperTable 内部表格自适应 100% 高度) */
.group-order-table-host {
flex: 1;
min-height: 120px;
min-width: 0;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
+}
+
+/* 分页条右侧:跨页累计选中结构数 */
+.group-order-selected-count {
+ margin-left: 12px;
+ font-size: 12px;
+ color: var(--el-color-primary);
}
.toolbar-switch-label {
diff --git a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue
index 2171930b..0414737d 100644
--- a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue
+++ b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue
@@ -416,34 +416,39 @@
handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateExpressTaskProgress)"
/>
handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateStorageTaskProgress)"
/>
handleBatchTaskProgressVisibleChange(visible, resetBatchRemoveExceptionOrdersTaskProgress)"
/>
handleBatchTaskProgressVisibleChange(visible, resetBatchCancelTaskProgress)"
/>
({
}))
const buttonLabelMap = computed(() => ({
- batchPrintTotal: `批量打印(${selectedWaveOrderTotal.value})`,
- batchOutboundPrintTotal: `打印货单(${printableSelectionRows.value.length})`,
- batchPlatformPrintTotal: `批量打印(平台)(${selectedWaveOrderTotal.value})`,
- batchQuickRecheckByWaveTotal: `批量发货(${selectionRows.value.length})`,
+ // 工具栏按钮标签不再显示选中数量统计(仅保留动态文案类标签)
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
@@ -1807,6 +1809,10 @@ function resetFetchTaskProgress() {
fetchTaskProgress.stopReason = ''
}
+function handleFetchTaskProgressVisibleChange(visible: boolean) {
+ if (!visible) resetFetchTaskProgress()
+}
+
async function pollFetchTaskProgress() {
if (!fetchTaskProgress.taskId) return
try {
@@ -1820,14 +1826,14 @@ async function pollFetchTaskProgress() {
if (fetchTaskProgress.status === 'failed' || fetchTaskProgress.status === 'not_found') {
stopFetchTaskPolling()
await loadData()
- resetFetchTaskProgress()
+ // 保留任务状态,弹窗停留在结束态,由用户手动关闭
return
}
if (fetchTaskProgress.status === 'success' || Number(fetchTaskProgress.progressPercent || 0) >= 100) {
stopFetchTaskPolling()
await loadData()
- resetFetchTaskProgress()
+ // 保留任务状态,弹窗停留在完成态,由用户手动关闭
return
}
@@ -2086,6 +2092,10 @@ function resetBatchCancelTaskProgress() {
batchCancelTaskProgress.message = ''
}
+function handleBatchTaskProgressVisibleChange(visible: boolean, resetFn: () => void) {
+ if (!visible) resetFn()
+}
+
async function pollBatchCancelTaskProgress() {
if (!batchCancelTaskProgress.taskId) return
try {
@@ -2100,14 +2110,12 @@ async function pollBatchCancelTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchCancelTaskPolling()
await loadData()
- resetBatchCancelTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchCancelTaskProgress.progressPercent || 0) >= 100) {
stopBatchCancelTaskPolling()
await loadData()
- resetBatchCancelTaskProgress()
return
}
@@ -2132,14 +2140,12 @@ async function pollBatchRemoveExceptionOrdersTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchRemoveExceptionOrdersTaskPolling()
await loadData()
- resetBatchRemoveExceptionOrdersTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchRemoveExceptionOrdersTaskProgress.progressPercent || 0) >= 100) {
stopBatchRemoveExceptionOrdersTaskPolling()
await loadData()
- resetBatchRemoveExceptionOrdersTaskProgress()
return
}
@@ -2164,14 +2170,12 @@ async function pollBatchAllocateStorageTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchAllocateStorageTaskPolling()
await loadData()
- resetBatchAllocateStorageTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchAllocateStorageTaskProgress.progressPercent || 0) >= 100) {
stopBatchAllocateStorageTaskPolling()
await loadData()
- resetBatchAllocateStorageTaskProgress()
return
}
@@ -2196,14 +2200,12 @@ async function pollBatchAllocateExpressTaskProgress() {
if (isAsyncTaskFailureStatus(normalizedStatus)) {
stopBatchAllocateExpressTaskPolling()
await loadData()
- resetBatchAllocateExpressTaskProgress()
return
}
if (isAsyncTaskSuccessStatus(normalizedStatus) || Number(batchAllocateExpressTaskProgress.progressPercent || 0) >= 100) {
stopBatchAllocateExpressTaskPolling()
await loadData()
- resetBatchAllocateExpressTaskProgress()
return
}
diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue
index bd13988a..34d8fb15 100644
--- a/src/views/order/waveOrder/WavePickTaskListPanel.vue
+++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue
@@ -395,7 +395,7 @@ const buttonDisabledMap = computed(() => ({
}))
const buttonLabelMap = computed(() => ({
- batchCancelTotal: `批量取消任务(${selectedTaskRows.value.length})`,
+ // 工具栏按钮标签不再显示选中数量统计(仅保留动态文案类标签)
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
diff --git a/src/views/order/waveOrder/WaveStrategyListPanel.vue b/src/views/order/waveOrder/WaveStrategyListPanel.vue
index bb033735..a1e41a89 100644
--- a/src/views/order/waveOrder/WaveStrategyListPanel.vue
+++ b/src/views/order/waveOrder/WaveStrategyListPanel.vue
@@ -188,173 +188,201 @@
width="720px"
align-center
destroy-on-close
+ :close-on-click-modal="false"
append-to-body
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
取消
@@ -1108,14 +1136,26 @@ onMounted(() => {
line-height: 1.5;
}
-.wave-strategy-form-grid {
- display: grid;
- grid-template-columns: repeat(2, minmax(0, 1fr));
- gap: 2px 12px;
-}
+/* 新建/编辑波次策略表单:双列栅格布局(参考「新增投递计划」表单) */
+.form-body {
+ max-height: 64vh;
+ padding: 4px 8px 0 0;
+ overflow-y: auto;
-.wave-strategy-form-item--full {
- grid-column: 1 / -1;
+ .form-grid-2 {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ column-gap: 16px;
+ }
+
+ :deep(.el-form-item) {
+ margin-bottom: 16px;
+ }
+
+ :deep(.el-select),
+ :deep(.el-input-number) {
+ width: 100%;
+ }
}
.order-sub-container .main-content {
diff --git a/src/views/order/waveOrder/component/WaveBatchTaskProgressDialog.vue b/src/views/order/waveOrder/component/WaveBatchTaskProgressDialog.vue
index af6b0c80..bb15a985 100644
--- a/src/views/order/waveOrder/component/WaveBatchTaskProgressDialog.vue
+++ b/src/views/order/waveOrder/component/WaveBatchTaskProgressDialog.vue
@@ -1,37 +1,45 @@
-
-
-
-
-
- 状态:{{ statusText }}
- {{ successCountLabel }}:{{ progress.successCount }} / {{ progress.totalCount }}
- {{ failedCountLabel }}:{{ progress.failedCount }}
- 跳过锁定:{{ progress.skippedLockedCount }}
- 更新时间:{{ formattedUpdateTime }}
-
-
- {{ progress.error || progress.message }}
-
-
-
+
+
+ {{ progressState === 'running' ? '处理中…' : '关闭' }}
+
+
+
-
-
diff --git a/src/views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue b/src/views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue
index a566922b..32a8b557 100644
--- a/src/views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue
+++ b/src/views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue
@@ -1,41 +1,45 @@
-
-
-
-
-
- 状态:{{ statusText }}
- 已完成结构:{{ progress.finishedStructureCount }} / {{ progress.structureCount }}
- 已抓取件数:{{ progress.totalFetchedQuantity }}
- 模式:{{ progress.fetchMode }}
-
- 抓取上限:{{ progress.maxFetchQuantity }}
-
- 已达上限
- 停止原因:{{ progress.stopReason }}
- 更新时间:{{ formattedUpdateTime }}
-
-
- {{ progress.error || progress.message }}
-
-
-
+
+
+ {{ progressState === 'running' ? '处理中…' : '关闭' }}
+
+
+
-
-
diff --git a/src/views/order/waveOrder/component/WaveStrategyQuickScanProgressDialog.vue b/src/views/order/waveOrder/component/WaveStrategyQuickScanProgressDialog.vue
index b7e8b67f..ca441140 100644
--- a/src/views/order/waveOrder/component/WaveStrategyQuickScanProgressDialog.vue
+++ b/src/views/order/waveOrder/component/WaveStrategyQuickScanProgressDialog.vue
@@ -1,42 +1,33 @@
-
-
-
-
-
- 提交状态:{{ progress.status || '—' }}
- 任务状态:{{ progress.state || '—' }}
- 仓库ID:{{ progress.warehouseId || '—' }}
- 处理进度:{{ progress.processedOrderCount }} / {{ progress.totalOrderCount }}
- 匹配订单:{{ progress.matchedOrderCount }}
- 未匹配订单:{{ progress.unmatchedOrderCount }}
- 受理时间:{{ formatDateTime(progress.acceptedAt) }}
-
-
- {{ progress.message }}
-
-
-
-
- 关闭
-
-
+ :subtitle="subtitle"
+ :task-id="progress.taskId || ''"
+ mode="progress"
+ :state="progressState"
+ :progress="progressPercent"
+ :status-text="statusText"
+ :detail="detailText"
+ :summary="summaryItems"
+ :metrics="metricItems"
+ :message="progressState === 'running' ? (progress.message || '') : ''"
+ :error="progressState === 'failed' ? (progress.errorMessage || progress.message || '') : ''"
+ :tip="tipText"
+ :tip-type="progressState === 'success' ? 'primary' : 'default'"
+ :footer-hint="footerHint"
+ @update:visible="emit('update:modelValue', $event)"
+ />
-
-
diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts
index a0cf0758..26fda35e 100644
--- a/src/views/order/waveOrder/config/wave-config.ts
+++ b/src/views/order/waveOrder/config/wave-config.ts
@@ -328,7 +328,8 @@ 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' },
+ // 序号列不启用(:show-index 未在 UpperTable 实现,序号由后端 wave_index 字段提供)
+ // { 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 },
@@ -443,6 +444,22 @@ export const waveBatchColumns = applyWaveListCopyActions([
{ prop: 'operation', label: '操作', minWidth: 140, fixed: 'right' }
])
+/**
+ * 「抓取团购单」弹窗:可抓取结构列表列配置(UpperTable)
+ * 注:货主 / 状态汇总 / 商品快照 / 首末单时间由面板插槽渲染(column-)
+ */
+export const waveGroupOrderColumns = [
+ { prop: 'item_detail', label: '商品结构', minWidth: 260, showOverflowTooltip: true },
+ { prop: 'logistics_name', label: '快递', minWidth: 130, showOverflowTooltip: true },
+ { prop: 'group_count', label: '同组订单数', minWidth: 100, align: 'right' },
+ { prop: 'items_total', label: '商品总数', minWidth: 100, align: 'right' },
+ { prop: 'store_name', label: '货主', minWidth: 110 },
+ { prop: 'status_summary', label: '状态汇总', minWidth: 240 },
+ { prop: 'item_snapshot_text', label: '商品快照', minWidth: 280 },
+ { prop: 'first_order_time', label: '首单时间', minWidth: 168 },
+ { prop: 'last_order_time', label: '末单时间', minWidth: 168 }
+]
+
/** 列表查询 where 白名单(与 sanitizeWaveWhere 一致) */
export const waveWhereAllowedFieldList = [
'wave_id',
@@ -661,8 +678,7 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
},
{
key: 'batchPrint',
- label: '批量打印(0)',
- dynamicLabelKey: 'batchPrintTotal',
+ label: '批量打印',
category: 'action',
size: 'small',
disabledKey: 'batchPrintDisabled',
@@ -672,8 +688,7 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
},
{
key: 'batchOutboundPrint',
- label: '打印货单(0)',
- dynamicLabelKey: 'batchOutboundPrintTotal',
+ label: '打印货单',
category: 'action',
size: 'small',
disabledKey: 'batchOutboundPrintDisabled',
@@ -683,8 +698,7 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
},
{
key: 'batchPlatformPrint',
- label: '批量打印(平台)(0)',
- dynamicLabelKey: 'batchPlatformPrintTotal',
+ label: '批量打印(平台)',
category: 'action',
size: 'small',
disabledKey: 'batchPlatformPrintDisabled',
@@ -709,8 +723,7 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
// },
{
key: 'batchPrintPickingList',
- label: '批量打印拣货单(0)',
- dynamicLabelKey: 'batchPickingPrintTotal',
+ label: '批量打印拣货单',
category: 'action',
size: 'small',
disabledKey: 'noSelection',
@@ -747,8 +760,7 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
},
{
key: 'batchQuickRecheckByWave',
- label: '批量发货(0)',
- dynamicLabelKey: 'batchQuickRecheckByWaveTotal',
+ label: '批量发货',
category: 'action',
size: 'small',
disabledKey: 'noSelection',
@@ -1138,7 +1150,6 @@ export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [
{
key: 'batchCancel',
label: '批量取消任务',
- dynamicLabelKey: 'batchCancelTotal',
category: 'cancel',
size: 'small',
loadingKey: 'batchCancelLoading',
@@ -1149,7 +1160,7 @@ export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [
/** 不符合波次策略订单页工具栏按钮 */
export const fallbackOrderToolbarButtons: ToolbarButtonConfig[] = [
- { key: 'search', label: '查询', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' },
+ { key: 'search', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'quickScan',
diff --git a/src/views/order/waveOrder/index.vue b/src/views/order/waveOrder/index.vue
index 1ee8fa57..30d3dcff 100644
--- a/src/views/order/waveOrder/index.vue
+++ b/src/views/order/waveOrder/index.vue
@@ -40,7 +40,7 @@
diff --git a/src/views/stock/external_stock/index.vue b/src/views/stock/external_stock/index.vue
index 74bc1e1f..e182d7c8 100644
--- a/src/views/stock/external_stock/index.vue
+++ b/src/views/stock/external_stock/index.vue
@@ -268,7 +268,7 @@
diff --git a/src/views/stock/stock/index.vue b/src/views/stock/stock/index.vue
index 0d3cf227..16c670e8 100644
--- a/src/views/stock/stock/index.vue
+++ b/src/views/stock/stock/index.vue
@@ -222,7 +222,7 @@
diff --git a/src/views/storage/entry/index.vue b/src/views/storage/entry/index.vue
index a6d1b2e6..ea836652 100644
--- a/src/views/storage/entry/index.vue
+++ b/src/views/storage/entry/index.vue
@@ -339,7 +339,7 @@
diff --git a/src/views/storage/entry_owner/index.vue b/src/views/storage/entry_owner/index.vue
index ca95c5d5..dc2605e0 100644
--- a/src/views/storage/entry_owner/index.vue
+++ b/src/views/storage/entry_owner/index.vue
@@ -164,7 +164,7 @@
diff --git a/src/views/storage/generalreport/pages/ExportReportDialog.vue b/src/views/storage/generalreport/pages/ExportReportDialog.vue
index 8ef25a4c..550d6a1e 100644
--- a/src/views/storage/generalreport/pages/ExportReportDialog.vue
+++ b/src/views/storage/generalreport/pages/ExportReportDialog.vue
@@ -77,7 +77,7 @@
diff --git a/src/views/storage/inventory/index.vue b/src/views/storage/inventory/index.vue
index 43b6ef03..6d3eb788 100644
--- a/src/views/storage/inventory/index.vue
+++ b/src/views/storage/inventory/index.vue
@@ -162,7 +162,7 @@
diff --git a/src/views/storage/productflow/index.vue b/src/views/storage/productflow/index.vue
index 61be34c6..81cb1ba5 100644
--- a/src/views/storage/productflow/index.vue
+++ b/src/views/storage/productflow/index.vue
@@ -138,7 +138,7 @@
diff --git a/src/views/storage/productflow/store/index.vue b/src/views/storage/productflow/store/index.vue
index aff6b0dd..40a4408a 100644
--- a/src/views/storage/productflow/store/index.vue
+++ b/src/views/storage/productflow/store/index.vue
@@ -195,7 +195,7 @@
diff --git a/src/views/storage/receiving/index.vue b/src/views/storage/receiving/index.vue
index 884120aa..f3d3c279 100644
--- a/src/views/storage/receiving/index.vue
+++ b/src/views/storage/receiving/index.vue
@@ -155,7 +155,7 @@
diff --git a/src/views/storage/receiving_owner/index.vue b/src/views/storage/receiving_owner/index.vue
index d47e508f..7b526846 100644
--- a/src/views/storage/receiving_owner/index.vue
+++ b/src/views/storage/receiving_owner/index.vue
@@ -134,7 +134,7 @@
diff --git a/src/views/storage/report/index.vue b/src/views/storage/report/index.vue
index 5d0d2ca0..56f730be 100644
--- a/src/views/storage/report/index.vue
+++ b/src/views/storage/report/index.vue
@@ -104,7 +104,7 @@
diff --git a/src/views/storage/report/store.vue b/src/views/storage/report/store.vue
index eec0c22f..83aff4d4 100644
--- a/src/views/storage/report/store.vue
+++ b/src/views/storage/report/store.vue
@@ -106,7 +106,7 @@
diff --git a/src/views/storage/stockcheck/index.vue b/src/views/storage/stockcheck/index.vue
index a5fe78e7..7609d5d6 100644
--- a/src/views/storage/stockcheck/index.vue
+++ b/src/views/storage/stockcheck/index.vue
@@ -244,7 +244,7 @@
diff --git a/src/views/store/stores/component/ExportDialog.vue b/src/views/store/stores/component/ExportDialog.vue
index fef3e7a1..54c0189c 100644
--- a/src/views/store/stores/component/ExportDialog.vue
+++ b/src/views/store/stores/component/ExportDialog.vue
@@ -74,7 +74,7 @@
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 @@