This commit is contained in:
yin 2026-10-20 18:00:51 +08:00
parent 06cb62fad1
commit 52536bb9e3
64 changed files with 2153 additions and 1143 deletions

View File

@ -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"`,
避免时钟数字被补间。

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

View File

@ -1,37 +1,31 @@
<template>
<el-dialog
:model-value="visible"
:title="title"
width="min(520px, 92vw)"
append-to-body
align-center
:show-close="!loading || Boolean(taskId)"
:close-on-click-modal="false"
:close-on-press-escape="!loading || Boolean(taskId)"
@update:model-value="emit('update:visible', $event)"
>
<div class="export-progress-panel">
<div class="export-progress-panel__header">
<span class="export-progress-panel__meta">任务ID:{{ taskId || '—' }}</span>
</div>
<el-progress :percentage="progressPercent" :status="progressStatus" :stroke-width="16" />
<div class="export-progress-panel__info">
<span>状态:{{ statusLabel }}</span>
<span>进度:{{ progressPercent }}%</span>
<span v-if="updateTime">更新时间:{{ formatDateTime(updateTime) }}</span>
</div>
<div v-if="message || error" class="export-progress-panel__message">
{{ error || message }}
</div>
<div v-if="loading && taskId" class="export-progress-panel__tip">
导出任务在后台执行中,关闭本窗口可停止自动刷新;重新进入本页面或再次点击导出可恢复查看结果。
</div>
</div>
</el-dialog>
<UnifiedTaskProgressDialog
:visible="visible"
:title="title || '导出'"
:subtitle="subtitle"
:task-id="taskId || ''"
mode="progress"
:state="progressState"
:progress="normalizedPercent"
:status-text="statusLabel || statusTextFallback"
:summary="summaryItems"
:message="progressState === 'running' ? (message || '') : ''"
:error="progressState === 'failed' ? (error || message || '') : ''"
:tip="tipText"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="footerHint"
:closable="!loading || Boolean(taskId)"
@update:visible="emit('update:visible', $event)"
/>
</template>
<script setup lang="ts">
defineProps<{
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type { ProgressState, ProgressSummaryItem } from '@/components/task-progress/types'
import { formatExportMode, type ExportProgressMeta } from '@/utils/asyncExportHelpers'
const props = withDefaults(defineProps<{
visible: boolean
title?: string
loading: boolean
@ -42,12 +36,69 @@ defineProps<{
message: string
error: string
updateTime?: number | string
}>()
/** 提交导出时的参数摘要(导出范围/模式/文件格式/数据量) */
meta?: ExportProgressMeta
}>(), {
meta: () => ({})
})
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
}>()
const normalizedPercent = computed(() => {
const value = Number(props.progressPercent || 0)
if (!Number.isFinite(value)) return 0
return Math.min(100, Math.max(0, value))
})
const progressState = computed<ProgressState>(() => {
if (props.progressStatus === 'exception' || props.error) return 'failed'
if (props.progressStatus === 'success' || normalizedPercent.value >= 100) return 'success'
return 'running'
})
const subtitle = computed(() => {
if (progressState.value === 'success') return '导出完成'
if (progressState.value === 'failed') return '导出失败'
return '正在导出数据'
})
const statusTextFallback = computed(() => {
if (progressState.value === 'success') return '已完成'
if (progressState.value === 'failed') return '失败'
return '执行中'
})
const summaryItems = computed<ProgressSummaryItem[]>(() => {
const items: ProgressSummaryItem[] = []
if (props.meta.exportScope) {
items.push({ label: '导出范围', value: props.meta.exportScope })
}
const modeLabel = formatExportMode(props.meta.exportMode)
items.push({ label: '导出模式', value: modeLabel || '默认' })
items.push({ label: '文件格式', value: props.meta.fileFormat || 'Excel (.xlsx)' })
if (props.meta.dataCount !== '' && props.meta.dataCount !== undefined && props.meta.dataCount !== null) {
items.push({ label: '数据量', value: `${props.meta.dataCount} 条` })
}
if (props.updateTime) {
items.push({ label: '更新时间', value: formatDateTime(props.updateTime) })
}
return items
})
const tipText = computed(() => {
if (progressState.value === 'success') return props.message || '导出完成,可关闭窗口'
if (progressState.value === 'running') {
return '导出任务在后台执行中,关闭本窗口可停止自动刷新;重新进入本页面或再次点击导出可恢复查看结果。'
}
return ''
})
const footerHint = computed(() =>
progressState.value === 'running' ? '导出任务在后台执行' : '任务已结束,可关闭窗口'
)
function formatDateTime(value: string | number | null | undefined) {
if (!value) return '—'
let normalizedValue: string | number = value
@ -62,34 +113,3 @@ function formatDateTime(value: string | number | null | undefined) {
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
}
</script>
<style scoped lang="scss">
.export-progress-panel {
display: flex;
flex-direction: column;
gap: 12px;
}
.export-progress-panel__header,
.export-progress-panel__info {
display: flex;
flex-wrap: wrap;
gap: 12px;
color: #606266;
font-size: 13px;
}
.export-progress-panel__message {
color: #909399;
font-size: 13px;
line-height: 1.5;
word-break: break-all;
}
.export-progress-panel__tip {
margin-top: 4px;
color: #b1b3b8;
font-size: 12px;
line-height: 1.5;
}
</style>

View File

@ -1,52 +1,40 @@
<template>
<el-dialog
:model-value="visible"
:title="title"
width="480px"
append-to-body
align-center
:show-close="!polling"
:close-on-click-modal="false"
:close-on-press-escape="!polling"
@update:model-value="emit('update:visible', $event)"
<UnifiedTaskProgressDialog
:visible="visible"
:title="title || '任务'"
:subtitle="subtitle"
:task-id="taskId || ''"
mode="progress"
:state="progressState"
:progress="normalizedPercent"
:status-text="statusLabel || statusTextFallback"
:detail="updateTime ? `更新时间:${updateTime}` : ''"
:animate-detail="false"
:error="errorText || ''"
:tip="tipText"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="footerHint"
:closable="!polling"
@update:visible="emit('update:visible', $event)"
@close="emit('close')"
>
<div class="task-progress-panel">
<div class="task-progress-panel__header">
<span class="task-progress-panel__meta">任务ID:{{ taskId || '—' }}</span>
</div>
<el-progress
:percentage="progressPercent"
:status="progressStatus"
:stroke-width="16"
:striped="polling"
:striped-flow="polling"
/>
<div class="task-progress-panel__info">
<span>状态:{{ statusLabel }}</span>
<span>进度:{{ progressPercent }}%</span>
<span v-if="updateTime">更新时间:{{ updateTime }}</span>
</div>
<div v-if="errorText" class="task-progress-panel__error">
{{ errorText }}
</div>
<div v-if="resultText && !polling" class="task-progress-panel__result">
{{ resultText }}
</div>
</div>
<template #footer>
<el-button
size="small"
:type="polling ? 'default' : 'primary'"
:disabled="polling"
@click="emit('close')"
>{{ polling ? '处理中…' : '关闭' }}</el-button>
>
{{ polling ? '处理中…' : '关闭' }}
</el-button>
</template>
</el-dialog>
</UnifiedTaskProgressDialog>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type { ProgressState } from '@/components/task-progress/types'
const props = defineProps<{
visible: boolean
@ -65,44 +53,37 @@ const emit = defineEmits<{
(e: 'close'): void
}>()
const progressStatus = computed(() => {
if (props.errorText) return 'exception'
if (props.progressPercent >= 100) return 'success'
const normalizedPercent = computed(() => {
const value = Number(props.progressPercent || 0)
if (!Number.isFinite(value)) return 0
return Math.min(100, Math.max(0, value))
})
const progressState = computed<ProgressState>(() => {
if (props.errorText) return 'failed'
if (!props.polling || normalizedPercent.value >= 100 || props.resultText) return 'success'
return 'running'
})
const subtitle = computed(() => {
if (progressState.value === 'success') return '处理完成'
if (progressState.value === 'failed') return '处理失败'
return '任务处理中'
})
const statusTextFallback = computed(() => {
if (progressState.value === 'success') return '已完成'
if (progressState.value === 'failed') return '失败'
return '处理中'
})
const tipText = computed(() => {
if (progressState.value === 'success') return props.resultText || '任务已结束,可关闭窗口'
if (progressState.value === 'running') return '任务正在处理中,请稍候。'
return ''
})
const footerHint = computed(() =>
progressState.value === 'running' ? '任务处理中,请稍候' : '任务已结束,可关闭窗口'
)
</script>
<style scoped lang="scss">
.task-progress-panel {
display: flex;
flex-direction: column;
gap: 14px;
}
.task-progress-panel__header,
.task-progress-panel__info {
display: flex;
flex-wrap: wrap;
gap: 12px;
color: #606266;
font-size: 13px;
}
.task-progress-panel__error {
color: #f56c6c;
font-size: 13px;
line-height: 1.6;
padding: 8px 12px;
background: #fef0f0;
border-radius: 4px;
}
.task-progress-panel__result {
color: #67c23a;
font-size: 13px;
line-height: 1.6;
padding: 8px 12px;
background: #f0f9eb;
border-radius: 4px;
}
</style>

View File

@ -0,0 +1,23 @@
<template>{{ output }}</template>
<script setup lang="ts">
import { computed } from 'vue'
import { useSmoothNumericText } from './smoothing'
/**
* 指标数字的平滑展示。
* 传入纯数字或带数字的文本(如 "3 / 25"),数字部分会补间过渡;
* 非数字文本(如 "—"、日期)原样输出。
*/
const props = withDefaults(
defineProps<{
value?: string | number | null
}>(),
{
value: ''
}
)
const text = computed(() => (props.value === null || props.value === undefined ? '' : String(props.value)))
const { value: output } = useSmoothNumericText(() => text.value)
</script>

View File

@ -5,16 +5,18 @@
<div class="cheetah-progress__fill" :style="{ width: `${clamped}%` }"></div>
</div>
<!-- 猎豹中线对齐进度条右侧(填充末端),左右各留半个身躯避免溢出 -->
<div class="cheetah-progress__runner" :style="{ left: `${clamped}%` }">
<span class="cheetah-progress__crop">
<img
class="cheetah-progress__img"
src="/animation/animation.gif"
alt="猎豹奔跑"
draggable="false"
/>
</span>
</div>
<Transition name="runner">
<div v-if="showRunner" class="cheetah-progress__runner" :style="{ left: `${clamped}%` }">
<span class="cheetah-progress__crop">
<img
class="cheetah-progress__img"
src="/animation/animation.gif"
alt="猎豹奔跑"
draggable="false"
/>
</span>
</div>
</Transition>
</div>
</div>
</template>
@ -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)
</script>
<style scoped lang="scss">
@ -47,6 +52,13 @@ const clamped = computed(() => {
margin-top: 68px;
padding: 0 calc(var(--runner-w) / 2);
/* 完成/失败后 GIF 隐藏,上方预留的高度同步收起,避免留一大块空白 */
transition: margin-top 0.3s ease;
&.is-success,
&.is-failed {
margin-top: 16px;
}
&__rail {
position: relative;
@ -63,7 +75,9 @@ const clamped = computed(() => {
height: 100%;
border-radius: inherit;
background: #409eff;
transition: width 0.25s linear;
/* 宽度由父组件逐帧驱动(rAF),这里不再对 width 做 CSS 过渡,
否则两斤缓动叠加,进度条会先冲后拖,反而更顿 */
transition: background-color 0.3s ease;
}
&__runner {
@ -71,7 +85,6 @@ const clamped = computed(() => {
/* 轨道高 10px:GIF 底边贴在轨道上沿 */
bottom: 10px;
transform: translateX(-50%);
transition: left 0.25s linear;
pointer-events: none;
will-change: left;
}
@ -100,6 +113,8 @@ const clamped = computed(() => {
&.is-success &__fill {
background: #67c23a;
/* 完成时一圈很短的绿色扩散,作为到达 100% 的反馈 */
animation: fill-finish 0.5s ease-out;
}
&.is-failed &__fill {
@ -107,6 +122,27 @@ const clamped = computed(() => {
}
}
/* GIF 出现/消失都淡入淡出,避免瞬间闪过 */
.runner-enter-active,
.runner-leave-active {
transition: opacity 0.18s ease;
}
.runner-enter-from,
.runner-leave-to {
opacity: 0;
}
@keyframes fill-finish {
from {
box-shadow: 0 0 0 0 rgba(103, 194, 58, 0.45);
}
to {
box-shadow: 0 0 0 6px rgba(103, 194, 58, 0);
}
}
@media (max-width: 520px) {
.cheetah-progress {
--runner-w: 100px;

View File

@ -20,9 +20,16 @@
<div v-if="fields.length" class="task-panel__form">
<div v-for="field in fields" :key="field.label" class="task-panel__field">
<span class="task-panel__field-label">{{ field.label }}</span>
<span v-if="field.type === 'switch'" class="task-panel__switch" :class="{ 'is-on': field.active }">
<button
v-if="field.type === 'switch'"
type="button"
class="task-panel__switch"
:class="{ 'is-on': field.active, 'is-clickable': field.interactive }"
:disabled="!field.interactive"
@click="emit('toggle-field', field)"
>
<i></i>
</span>
</button>
<strong v-else class="task-panel__field-value">{{ field.value ?? '—' }}</strong>
</div>
</div>
@ -39,20 +46,20 @@
<div class="task-panel__progress">
<div class="task-panel__progress-head">
<div class="task-panel__percent">{{ roundedPercent }}<em>%</em></div>
<div class="task-panel__percent">{{ displayPercent }}<em>%</em></div>
<div class="task-panel__state">
<strong>{{ statusLabel }}</strong>
<span v-if="detail">{{ detail }}</span>
<span v-if="detail">{{ animateDetail ? smoothDetail : detail }}</span>
</div>
<span v-if="etaLabel" class="task-panel__eta">{{ etaLabel }}</span>
</div>
<CheetahProgressBar :progress="progress" :state="state" />
<CheetahProgressBar :progress="smoothPercent" :state="state" />
<div v-if="metrics && metrics.length" class="task-panel__metrics">
<div v-for="item in metrics" :key="item.label" class="task-panel__metric">
<span>{{ item.label }}</span>
<strong>{{ item.value }}<em v-if="item.unit">{{ item.unit }}</em></strong>
<strong><AnimatedNumber :value="item.value" /><em v-if="item.unit">{{ item.unit }}</em></strong>
</div>
</div>
@ -65,20 +72,22 @@
<p>{{ resultIds.join('、') }}</p>
</div>
<p v-if="tip" class="task-panel__tip">{{ tip }}</p>
<p v-if="tip" class="task-panel__tip" :class="{ 'is-primary': tipType === 'primary' }">{{ tip }}</p>
</template>
</div>
<footer v-if="$slots.footer" class="task-panel__foot">
<footer v-if="showFooter && $slots.footer" class="task-panel__foot">
<slot name="footer" />
</footer>
</div>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import { computed, watch } from 'vue'
import AnimatedNumber from './AnimatedNumber.vue'
import CheetahProgressBar from './CheetahProgressBar.vue'
import { estimateRemainingText } from './estimate'
import { useSmoothNumber, useSmoothNumericText } from './smoothing'
import type {
ProgressFormField,
ProgressMetricItem,
@ -117,15 +126,22 @@ const props = withDefaults(
resultIdsLabel?: string
/** 进度态底部提示 */
tip?: string
/** 提示文案样式:default 灰色 / primary 蓝色 */
tipType?: 'default' | 'primary'
message?: string
error?: string
closable?: boolean
/** 是否显示底部操作区;由任务状态自动控制的弹窗可关闭 */
showFooter?: boolean
/** 明细里的数字是否补间(明细含时间/日期时建议关闭) */
animateDetail?: boolean
}>(),
{
state: 'running',
mode: 'progress',
progress: 0,
closable: true,
showFooter: true,
subtitle: '',
taskId: '',
statusText: '',
@ -139,13 +155,17 @@ const props = withDefaults(
resultIds: () => [],
resultIdsLabel: '订单ID',
tip: '',
tipType: 'default',
message: '',
error: ''
error: '',
/** 进度明细里的数字是否补间(含时间/日期的明细建议关闭) */
animateDetail: true
}
)
const emit = defineEmits<{
(e: 'close'): void
(e: 'toggle-field', field: ProgressFormField): void
}>()
const roundedPercent = computed(() => {
@ -154,6 +174,30 @@ const roundedPercent = computed(() => {
return Math.min(100, Math.max(0, Math.round(value)))
})
/** 接口返回的目标进度(未取整),用于平滑动画 */
const targetPercent = computed(() => {
const value = Number(props.progress || 0)
if (!Number.isFinite(value)) return 0
return Math.min(100, Math.max(0, value))
})
const { value: smoothPercent, snapTo: snapPercent } = useSmoothNumber(() => targetPercent.value)
const displayPercent = computed(() => Math.round(smoothPercent.value))
const { value: smoothDetail, snapTo: snapDetail } = useSmoothNumericText(() =>
props.animateDetail ? props.detail : ''
)
/** 结束态直接对齐,避免进度条绿色后还缓慢爬行、数字继续追赶 */
watch(
() => props.state,
(state) => {
if (state === 'running') return
snapPercent()
snapDetail()
}
)
const statusLabel = computed(() => {
if (props.statusText) return props.statusText
if (props.state === 'success') return '处理完成'
@ -409,6 +453,10 @@ const etaLabel = computed(
font-size: 12px;
line-height: 18px;
color: #909399;
&.is-primary {
color: #409eff;
}
}
/* ---------- 表单态 ---------- */
@ -448,10 +496,21 @@ const etaLabel = computed(
width: 40px;
height: 20px;
flex: none;
padding: 0;
border: none;
border-radius: 10px;
background: #dcdfe6;
cursor: default;
transition: background 0.2s;
&.is-clickable {
cursor: pointer;
}
&:disabled {
opacity: 1;
}
i {
position: absolute;
top: 2px;

View File

@ -9,8 +9,9 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
@update:model-value="emit('update:visible', $event)"
@closed="emit('closed')"
>
<TaskProgressPanel v-bind="panelProps" @close="close">
<TaskProgressPanel v-bind="panelProps" @close="close" @toggle-field="emit('toggle-field', $event)">
<template #footer>
<span class="utp-hint">{{ footerHint }}</span>
<div class="utp-actions">
@ -61,12 +62,20 @@ const props = withDefaults(
resultIds?: Array<string | number>
resultIdsLabel?: string
tip?: string
/** 提示文案样式:default 灰色 / primary 蓝色 */
tipType?: 'default' | 'primary'
message?: string
error?: string
/** 底部左侧提示文案 */
footerHint?: string
/** 表单态主按钮文案 */
submitText?: string
/** 是否显示面板右上角关闭按钮 */
closable?: boolean
/** 是否显示底部操作区 */
showFooter?: boolean
/** 明细里的数字是否补间(含时间/日期时关闭) */
animateDetail?: boolean
}>(),
{
state: 'running',
@ -87,15 +96,21 @@ const props = withDefaults(
resultIds: () => [],
resultIdsLabel: '订单ID',
tip: '',
tipType: 'default',
message: '',
error: ''
error: '',
closable: true,
showFooter: true,
animateDetail: true
}
)
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
(e: 'close'): void
(e: 'closed'): void
(e: 'submit'): void
(e: 'toggle-field', field: ProgressFormField): void
}>()
const panelProps = computed(() => ({
@ -116,9 +131,12 @@ const panelProps = computed(() => ({
resultIds: props.resultIds,
resultIdsLabel: props.resultIdsLabel,
tip: props.tip,
tipType: props.tipType,
message: props.message,
error: props.error,
closable: true
closable: props.closable,
showFooter: props.showFooter,
animateDetail: props.animateDetail
}))
function close() {

View File

@ -0,0 +1,364 @@
/**
* 进度弹窗的数值平滑动画。
*
* 后端进度接口按轮询间隔返回阶梯式数据(常见 1.5s / 2s 一次),
* 如果直接把新值写进 DOM,就会出现「跳一下 → 停一段 → 再跳一下」。
* 这里用 requestAnimationFrame 把两次接口返回之间的差值补成连续动画:
*
* - 动画时长按「最近两次目标值变化的间隔」自适应(默认取其 85%),
* 轮询 1.5s 就动画 1.3s,轮询 2s 就动画 1.7s,避免中途长时间停顿。
* - 新值到来时从「当前显示值」继续补间,不会回跳。
* - 目标值变小(任务重置 / 新一轮任务)时直接吸附,不做倒放动画。
* - 尊重系统「减少动态效果」设置,开启时全部直接吸附。
*/
import { onBeforeUnmount, ref, watch, type Ref } from 'vue'
export interface SmoothNumberHandle {
/** 用于展示的平滑值(仍可能带小数,展示时自行取整) */
value: Ref<number>
/** 立即对齐到目标值(结束态 / 重置时使用) */
snapTo: (value?: number) => void
}
export interface SmoothTextHandle {
/** 用于展示的平滑文本 */
value: Ref<string>
/** 立即对齐到目标文本 */
snapTo: () => void
}
interface SmoothNumberOptions {
/** 首次更新(尚未测出轮询间隔)时的动画时长 */
duration?: number
/** 自适应时长下限 */
minDuration?: number
/** 自适应时长上限 */
maxDuration?: number
/** 差值小于该值时直接吸附 */
epsilon?: number
/** 目标值变小时是否直接吸附(默认开启,用于任务重置) */
snapOnDecrease?: boolean
}
const NUMBER_DEFAULTS = {
duration: 900,
minDuration: 320,
maxDuration: 1700,
epsilon: 0.01,
snapOnDecrease: true
}
/** 接口轮询间隔超过该值时不再参与自适应(例如用户切回标签页) */
const MAX_INTERVAL_SAMPLE = 15_000
function clamp(value: number, min: number, max: number) {
return Math.min(max, Math.max(min, value))
}
function easing(t: number) {
// easeOutCubic:起步快、收尾稳,读数不会一顿一顿
return 1 - Math.pow(1 - t, 3)
}
function now() {
return typeof performance !== 'undefined' ? performance.now() : Date.now()
}
function prefersReducedMotion() {
return (
typeof window !== 'undefined' &&
typeof window.matchMedia === 'function' &&
window.matchMedia('(prefers-reduced-motion: reduce)').matches
)
}
function toNumber(value: unknown) {
const parsed = Number(value)
return Number.isFinite(parsed) ? parsed : 0
}
/** 补间动画的公共时长计算:按最近一次接口更新间隔自适应 */
function resolveDuration(lastInterval: number, fallback: number, min: number, max: number) {
const base = lastInterval > 0 ? lastInterval * 0.85 : fallback
return clamp(base, min, max)
}
/**
* 单个数字的平滑动画。
* @param source 目标值(一般直接传接口字段的 computed)
*/
export function useSmoothNumber(
source: () => number,
options: SmoothNumberOptions = {}
): SmoothNumberHandle {
const config = { ...NUMBER_DEFAULTS, ...options }
const initial = toNumber(source())
const display = ref(initial)
let from = initial
let target = initial
let startedAt = 0
let span = config.duration
let rafId: number | null = null
let lastChangeAt = 0
let lastInterval = 0
function stop() {
if (rafId !== null) {
cancelAnimationFrame(rafId)
rafId = null
}
}
function frame(stamp: number) {
rafId = null
const progress = span <= 0 ? 1 : Math.min(1, (stamp - startedAt) / span)
display.value = from + (target - from) * easing(progress)
if (progress < 1) {
rafId = requestAnimationFrame(frame)
return
}
display.value = target
}
function snap(value: number) {
stop()
display.value = value
from = value
target = value
}
watch(source, (raw) => {
const value = toNumber(raw)
const stamp = now()
if (lastChangeAt > 0) {
const interval = stamp - lastChangeAt
if (interval > 0 && interval < MAX_INTERVAL_SAMPLE) lastInterval = interval
}
lastChangeAt = stamp
if (prefersReducedMotion() || Math.abs(value - display.value) <= config.epsilon) {
snap(value)
return
}
if (config.snapOnDecrease && value < display.value) {
snap(value)
return
}
from = display.value
target = value
startedAt = stamp
span = resolveDuration(
lastInterval,
config.duration,
config.minDuration,
config.maxDuration
)
stop()
rafId = requestAnimationFrame(frame)
})
onBeforeUnmount(stop)
return {
value: display,
snapTo: (value?: number) => snap(value === undefined ? toNumber(source()) : value)
}
}
interface TextToken {
/** 本帧展示值 */
display: number
/** 补间起点 */
from: number
/** 目标值 */
target: number
/** 小数位(保留原文本精度) */
decimals: number
/** 原文本是否带千分位 */
grouped: boolean
/** 是否参与动画(以 0 开头的编码/时间不参与,避免 "05" 变成 "5") */
animate: boolean
}
type TextPart = string | TextToken
/** 匹配 1,286 / 2040 / 12.5 这类计数,优先匹配带千分位的写法 */
const NUMBER_PATTERN = /\d{1,3}(?:,\d{3})+(?:\.\d+)?|\d+(?:\.\d+)?/g
function parseNumericText(text: string) {
const parts: TextPart[] = []
const tokens: TextToken[] = []
let lastIndex = 0
for (const match of text.matchAll(NUMBER_PATTERN)) {
const raw = match[0]
const index = match.index ?? 0
if (index > lastIndex) parts.push(text.slice(lastIndex, index))
const plain = raw.replace(/,/g, '')
const dotIndex = plain.indexOf('.')
const decimals = dotIndex >= 0 ? plain.length - dotIndex - 1 : 0
const value = Number(plain)
const token: TextToken = {
display: value,
from: value,
target: value,
decimals,
grouped: raw.includes(','),
animate: Number.isFinite(value) && !/^0\d+/.test(plain)
}
tokens.push(token)
parts.push(token)
lastIndex = index + raw.length
}
if (lastIndex < text.length) parts.push(text.slice(lastIndex))
return { parts, tokens }
}
function sameStructure(previous: TextPart[], next: TextPart[]) {
if (previous.length !== next.length) return false
for (let index = 0; index < previous.length; index += 1) {
const a = previous[index]
const b = next[index]
if (a === undefined || b === undefined) return false
if (typeof a === 'string' || typeof b === 'string') {
if (a !== b) return false
continue
}
if (a.decimals !== b.decimals || a.grouped !== b.grouped || a.animate !== b.animate) {
return false
}
}
return true
}
function formatToken(token: TextToken) {
const rounded =
token.decimals > 0 ? Number(token.display.toFixed(token.decimals)) : Math.round(token.display)
if (token.grouped) {
return rounded.toLocaleString('en-US', {
minimumFractionDigits: token.decimals,
maximumFractionDigits: token.decimals
})
}
return token.decimals > 0 ? rounded.toFixed(token.decimals) : String(rounded)
}
function buildText(parts: TextPart[]) {
return parts.map((part) => (typeof part === 'string' ? part : formatToken(part))).join('')
}
/**
* 文本里的数字平滑动画,例如「已完成 1,286 / 2,040」。
* 只有文本结构保持一致(文字、数字个数、千分位/小数位一致)时才补间,
* 结构变化(例如追加了页数)直接吸附,避免出现数字乱窜。
*/
export function useSmoothNumericText(source: () => string): SmoothTextHandle {
const initialText = String(source() ?? '')
let parts = parseNumericText(initialText).parts
const display = ref(buildText(parts))
let startedAt = 0
let span = NUMBER_DEFAULTS.duration
let rafId: number | null = null
let lastChangeAt = 0
let lastInterval = 0
function stop() {
if (rafId !== null) {
cancelAnimationFrame(rafId)
rafId = null
}
}
function tokensOf(target: TextPart[]) {
return target.filter((part): part is TextToken => typeof part !== 'string')
}
function snapToTargets() {
stop()
tokensOf(parts).forEach((token) => {
token.display = token.target
token.from = token.target
})
display.value = buildText(parts)
}
function frame(stamp: number) {
rafId = null
const progress = span <= 0 ? 1 : Math.min(1, (stamp - startedAt) / span)
const eased = easing(progress)
tokensOf(parts).forEach((token) => {
token.display = token.from + (token.target - token.from) * eased
})
display.value = buildText(parts)
if (progress < 1) {
rafId = requestAnimationFrame(frame)
return
}
snapToTargets()
}
watch(source, (raw) => {
const text = String(raw ?? '')
const next = parseNumericText(text)
const stamp = now()
if (lastChangeAt > 0) {
const interval = stamp - lastChangeAt
if (interval > 0 && interval < MAX_INTERVAL_SAMPLE) lastInterval = interval
}
lastChangeAt = stamp
if (prefersReducedMotion() || !sameStructure(parts, next.parts)) {
parts = next.parts
snapToTargets()
return
}
const previousTokens = tokensOf(parts)
const nextTokens = tokensOf(next.parts)
// 只对真正参与动画的数字补间;时间/编码按原样展示
let changed = false
let decreased = false
nextTokens.forEach((token, index) => {
const previous = previousTokens[index]
const start = previous && previous.animate ? previous.display : token.target
token.from = start
token.display = start
if (!token.animate) return
if (Math.abs(token.target - start) > 0.01) changed = true
if (token.target < start - 0.01) decreased = true
})
parts = next.parts
if (!changed || decreased) {
snapToTargets()
return
}
startedAt = stamp
span = resolveDuration(
lastInterval,
NUMBER_DEFAULTS.duration,
NUMBER_DEFAULTS.minDuration,
NUMBER_DEFAULTS.maxDuration
)
stop()
rafId = requestAnimationFrame(frame)
})
onBeforeUnmount(stop)
return {
value: display,
snapTo: snapToTargets
}
}

View File

@ -22,4 +22,6 @@ export interface ProgressFormField {
type?: 'text' | 'switch'
/** type=switch 时是否开启 */
active?: boolean
/** type=switch 时是否允许用户点击切换(默认仅展示) */
interactive?: boolean
}

View File

@ -2,6 +2,7 @@ import { computed, onBeforeUnmount, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import type { ExportMode } from '@/utils/asyncExportHelpers'
import {
buildExportProgressMeta,
downloadExportFile,
extractExportDownloadUrl,
isExportApiSuccess,
@ -30,7 +31,11 @@ export function useAsyncExportTask(options: {
message: '',
error: '',
downloadUrl: '',
updateTime: 0
updateTime: 0,
exportMode: '',
fileFormat: 'Excel (.xlsx)',
exportScope: '',
dataCount: '' as number | string
})
let exportPollingTimer: number | null = null
@ -69,6 +74,10 @@ export function useAsyncExportTask(options: {
exportTaskProgress.error = ''
exportTaskProgress.downloadUrl = ''
exportTaskProgress.updateTime = 0
exportTaskProgress.exportMode = ''
exportTaskProgress.fileFormat = 'Excel (.xlsx)'
exportTaskProgress.exportScope = ''
exportTaskProgress.dataCount = ''
}
function stopExportPolling() {
@ -145,19 +154,13 @@ export function useAsyncExportTask(options: {
stopExportPolling()
exportLoading.value = false
clearSavedExportTaskId()
try {
if (exportTaskProgress.downloadUrl) {
downloadExportFile(exportTaskProgress.downloadUrl)
ElMessage.success(exportTaskProgress.message || '导出完成,文件已开始下载')
} else {
ElMessage.warning(exportTaskProgress.message || '导出完成,但未返回下载地址')
}
} finally {
window.setTimeout(() => {
exportDialogVisible.value = false
resetExportProgress()
}, 1200)
if (exportTaskProgress.downloadUrl) {
downloadExportFile(exportTaskProgress.downloadUrl)
ElMessage.success(exportTaskProgress.message || '导出完成,文件已开始下载')
} else {
ElMessage.warning(exportTaskProgress.message || '导出完成,但未返回下载地址')
}
// 完成后保留弹窗,展示完成状态,由用户手动关闭
return
}
@ -212,6 +215,7 @@ export function useAsyncExportTask(options: {
if (exportLoading.value) return
exportLoading.value = true
resetExportProgress()
Object.assign(exportTaskProgress, buildExportProgressMeta(payload))
exportDialogVisible.value = true
try {
const res = await options.submitExport(payload)
@ -297,6 +301,10 @@ export function useAsyncExportTask(options: {
exportTaskProgress.error = ''
exportTaskProgress.downloadUrl = ''
exportTaskProgress.updateTime = 0
exportTaskProgress.exportMode = ''
exportTaskProgress.fileFormat = 'Excel (.xlsx)'
exportTaskProgress.exportScope = ''
exportTaskProgress.dataCount = ''
exportDialogVisible.value = true
exportLoading.value = true
scheduleExportPolling(200)

View File

@ -2,9 +2,11 @@ import { computed, onBeforeUnmount, reactive, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { orderExport, orderExportTaskProgress, type OrderExportMode } from '@/api/order.index/orderindex'
import {
buildExportProgressMeta,
downloadExportFile,
extractExportDownloadUrl,
isExportApiSuccess,
parseExportProgressMessage,
parseExportTaskPayload
} from '@/utils/asyncExportHelpers'
@ -32,7 +34,18 @@ export function useOrderAsyncExport(storageKey?: string) {
message: '',
error: '',
downloadUrl: '',
updateTime: 0
updateTime: 0,
exportMode: '',
fileFormat: 'Excel (.xlsx)',
exportScope: '',
dataCount: '' as number | string,
currentCount: 0,
totalCount: 0,
currentPage: 0,
totalPage: 0,
sheetCount: undefined as number | undefined,
elapsedMs: 0,
startedAt: 0
})
let exportPollingTimer: number | null = null
@ -45,6 +58,17 @@ export function useOrderAsyncExport(storageKey?: string) {
exportTaskProgress.error = ''
exportTaskProgress.downloadUrl = ''
exportTaskProgress.updateTime = 0
exportTaskProgress.exportMode = ''
exportTaskProgress.fileFormat = 'Excel (.xlsx)'
exportTaskProgress.exportScope = ''
exportTaskProgress.dataCount = ''
exportTaskProgress.currentCount = 0
exportTaskProgress.totalCount = 0
exportTaskProgress.currentPage = 0
exportTaskProgress.totalPage = 0
exportTaskProgress.sheetCount = undefined
exportTaskProgress.elapsedMs = 0
exportTaskProgress.startedAt = 0
}
function stopExportPolling() {
@ -92,28 +116,38 @@ export function useOrderAsyncExport(storageKey?: string) {
exportTaskProgress.progress = Number.isFinite(Number(payload.progress))
? Number(payload.progress)
: exportTaskProgress.progress
exportTaskProgress.message = String(payload.message || '')
const parsedMessage = parseExportProgressMessage(payload.message)
exportTaskProgress.message = parsedMessage.message
exportTaskProgress.error = String(payload.error || '')
exportTaskProgress.downloadUrl = extractExportDownloadUrl(payload)
exportTaskProgress.updateTime = Number(payload.update_time || payload.updateTime || 0)
exportTaskProgress.currentCount = Number(
payload.current_count ?? payload.currentCount ?? parsedMessage.currentCount ?? exportTaskProgress.currentCount ?? 0
) || 0
exportTaskProgress.totalCount = Number(
payload.total_count ?? payload.totalCount ?? parsedMessage.totalCount ?? exportTaskProgress.totalCount ?? 0
) || 0
if (parsedMessage.currentPage !== undefined) exportTaskProgress.currentPage = parsedMessage.currentPage
if (parsedMessage.totalPage !== undefined) exportTaskProgress.totalPage = parsedMessage.totalPage
const sheetCountRaw = payload.result?.sheet_count ?? payload.sheet_count ?? payload.sheetCount
if (sheetCountRaw !== undefined && sheetCountRaw !== null && sheetCountRaw !== '') {
exportTaskProgress.sheetCount = Number(sheetCountRaw) || 0
}
exportTaskProgress.elapsedMs = exportTaskProgress.startedAt
? Date.now() - exportTaskProgress.startedAt
: 0
if (exportTaskProgress.status === 'success') {
stopExportPolling()
exportLoading.value = false
clearSavedExportTaskId()
try {
if (exportTaskProgress.downloadUrl) {
downloadExportFile(exportTaskProgress.downloadUrl)
ElMessage.success(exportTaskProgress.message || '导出完成,文件已开始下载')
} else {
ElMessage.warning(exportTaskProgress.message || '导出完成,但未返回下载地址')
}
} finally {
window.setTimeout(() => {
exportDialogVisible.value = false
resetExportProgress()
}, 1200)
if (exportTaskProgress.downloadUrl) {
downloadExportFile(exportTaskProgress.downloadUrl)
ElMessage.success(exportTaskProgress.message || '导出完成,文件已开始下载')
} else {
ElMessage.warning(exportTaskProgress.message || '导出完成,但未返回下载地址')
}
// 完成后保留弹窗,展示完成状态,由用户手动关闭
return
}
@ -135,6 +169,9 @@ export function useOrderAsyncExport(storageKey?: string) {
if (exportLoading.value) return
exportLoading.value = true
resetExportProgress()
Object.assign(exportTaskProgress, buildExportProgressMeta(payload))
exportTaskProgress.startedAt = Date.now()
exportTaskProgress.elapsedMs = 0
exportDialogVisible.value = true
try {
const res: any = await orderExport(payload)
@ -149,7 +186,12 @@ export function useOrderAsyncExport(storageKey?: string) {
exportTaskProgress.taskId = taskId
exportTaskProgress.status = String(data.status || 'submitted')
exportTaskProgress.progress = Number.isFinite(Number(data.progress)) ? Number(data.progress) : 0
exportTaskProgress.message = String(data.message || '任务已受理')
const parsedMessage = parseExportProgressMessage(data.message || '任务已受理')
exportTaskProgress.message = parsedMessage.message
exportTaskProgress.currentCount = parsedMessage.currentCount ?? 0
exportTaskProgress.totalCount = parsedMessage.totalCount ?? 0
exportTaskProgress.currentPage = parsedMessage.currentPage ?? 0
exportTaskProgress.totalPage = parsedMessage.totalPage ?? 0
exportTaskProgress.error = String(data.error || '')
exportTaskProgress.updateTime = Number(data.update_time || data.updateTime || 0)
saveExportTaskId(taskId)

View File

@ -91,11 +91,7 @@ export function useTaskProgress(options: UseTaskProgressOptions) {
state.progress = 100
polling.value = false
onSuccess?.(state.result, taskId)
// 完成后延迟自动关闭
timer = setTimeout(() => {
visible.value = false
reset()
}, 1500)
// 完成后保留弹窗,展示完成状态,由用户手动关闭
return
}
if (status === 'failed' || status === 'error') {

View File

@ -1,11 +1,101 @@
/** 异步导出模式:waybill=不含明细(默认),item=含明细 */
export type ExportMode = 'waybill' | 'item'
/** 导出弹窗展示用的参数摘要 */
export interface ExportProgressMeta {
exportMode?: string
fileFormat?: string
exportScope?: string
dataCount?: number | string
/** 已处理记录数 */
currentCount?: number
/** 总记录数 */
totalCount?: number
/** 当前页 / 总页数(后端 message 中解析) */
currentPage?: number
totalPage?: number
/** 导出文件页数/Sheet 数(接口返回时展示) */
sheetCount?: number | null
/** 前端记录的已用时长(毫秒) */
elapsedMs?: number
}
/** 解析后端进度 message 中的「已完成 x/y 条 ... (a/b页)」,并把该段从展示文案中移除 */
export function parseExportProgressMessage(raw: unknown): {
message: string
currentCount?: number
totalCount?: number
currentPage?: number
totalPage?: number
} {
const text = String(raw ?? '').trim()
if (!text) return { message: '' }
const countMatch = text.match(/已完成\s*([\d,]+)\s*\/\s*([\d,]+)\s*条/)
const pageMatch = text.match(/[((]\s*([\d,]+)\s*\/\s*([\d,]+)\s*页\s*[))]/)
const toNumber = (value?: string) => (value ? Number(value.replace(/,/g, '')) : undefined)
const message = text
.replace(/已完成\s*[\d,]+\s*\/\s*[\d,]+\s*条[^()()]*[((]\s*[\d,]+\s*\/\s*[\d,]+\s*页\s*[))]/g, '')
.replace(/[((]\s*[\d,]+\s*\/\s*[\d,]+\s*页\s*[))]/g, '')
.trim()
return {
message,
currentCount: toNumber(countMatch?.[1]),
totalCount: toNumber(countMatch?.[2]),
currentPage: toNumber(pageMatch?.[1]),
totalPage: toNumber(pageMatch?.[2])
}
}
export const EXPORT_MODE_OPTIONS: Array<{ label: string; action: string; divided?: boolean }> = [
{ label: '不含明细', action: 'handleExportWaybill' },
{ label: '含明细', action: 'handleExportItem', divided: true }
]
/** 把提交导出的 payload 转成弹窗可展示的参数摘要(仅展示真实存在的值) */
export function buildExportProgressMeta(payload: Record<string, unknown>): ExportProgressMeta {
const rawMode = String(payload.export_mode ?? payload.exportMode ?? '').trim()
const rawScope = String(payload.export_scope ?? payload.exportScope ?? payload.scope ?? '').trim()
const where = payload.where && typeof payload.where === 'object' && !Array.isArray(payload.where)
? payload.where as Record<string, unknown>
: undefined
const hasIdFilter = Boolean(
where?.id
|| where?.ids
|| payload.ids
|| payload.order_ids
|| payload.stock_ids
)
const rawCount = payload.total_count
?? payload.totalCount
?? payload.data_count
?? payload.dataCount
?? payload.count
return {
exportMode: rawMode,
fileFormat: String(payload.file_format ?? payload.fileFormat ?? 'Excel (.xlsx)'),
exportScope: rawScope || (hasIdFilter ? '导出选中' : '导出全部'),
dataCount: rawCount === undefined || rawCount === null || rawCount === ''
? ''
: (rawCount as number | string)
}
}
/** 导出模式显示文案 */
export function formatExportMode(value?: string) {
const key = String(value || '').trim()
const map: Record<string, string> = {
waybill: '不含明细',
item: '含明细',
stock_location: '按库位汇总',
storage: '按库存明细'
}
return map[key] || key
}
const EXPORT_API_SUCCESS_CODES = new Set([0, 1, 200, 20000])
export function isExportApiSuccess(res: unknown): boolean {

View File

@ -195,6 +195,7 @@
<!-- 导出进度弹窗 -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="售后单导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -202,6 +203,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>

View File

@ -324,7 +324,7 @@
<!-- 打包任务导出进度(order.packing.export + order.packing.exportTaskProgress) -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="打包任务导出进度"
title="打包任务导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -332,6 +332,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -162,7 +162,7 @@
<!-- 退回收到导出进度(returnReceived.export + returnReceived.exportTaskProgress) -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="退回收到导出进度"
title="退回收到导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -170,6 +170,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -92,7 +92,7 @@
<!-- 导出任务进度(提交后接管,完成后自动下载) -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="退回拆包导出进度"
title="退回拆包导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -100,6 +100,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</template>

View File

@ -329,7 +329,7 @@
<!-- 退回拆包导出进度(returnUnpack.export + returnUnpack.exportTaskProgress) -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="退回拆包导出进度"
title="退回拆包导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -337,6 +337,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>

View File

@ -238,6 +238,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="运单导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -245,6 +246,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -131,6 +131,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -9,6 +9,20 @@
@update:model-value="(v: boolean) => emit('update:visible', v)"
>
<div class="export-columns-dialog">
<div class="export-columns-summary">
<div class="export-columns-summary__item">
<span>导出模式</span>
<strong>{{ exportModeLabel }}</strong>
</div>
<div class="export-columns-summary__item">
<span>文件格式</span>
<strong>Excel (.xlsx)</strong>
</div>
<div class="export-columns-summary__item">
<span>已选字段</span>
<strong>{{ selected.length }} / {{ totalColumnCount }}</strong>
</div>
</div>
<div class="export-columns-tip">
勾选需要导出的字段,未勾选的字段将不出现在导出文件中。{{ scope === 'selection' ? '导出范围:仅导出已勾选的订单。' : '导出范围:按当前筛选条件导出全部订单。' }}
</div>
@ -121,6 +135,13 @@ const dialogTitle = computed(() => {
return `${scopeLabel}(${modeLabel})字段设置`
})
/** 具体导出模式:导出全部/导出选中 + 含明细/不含明细 */
const exportModeLabel = computed(() => {
const scopeLabel = props.scope === 'selection' ? '导出选中' : '导出全部'
const modeLabel = props.mode === 'item' ? '含明细' : '不含明细'
return `${scopeLabel}(${modeLabel})`
})
/** 当前模式可导出的字段(按分组) */
const columnGroups = computed(() => getOrderExportColumnGroupsByMode(props.mode))
@ -249,6 +270,36 @@ function handleConfirm() {
<style scoped lang="scss">
.export-columns-dialog {
.export-columns-summary {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
gap: 8px;
margin-bottom: 10px;
}
.export-columns-summary__item {
padding: 6px 10px;
border: 1px solid #ebeef5;
border-radius: 4px;
background: #fafafa;
span {
display: block;
margin-bottom: 2px;
font-size: 12px;
line-height: 18px;
color: #909399;
}
strong {
display: block;
font-size: 13px;
line-height: 20px;
font-weight: 500;
color: #303133;
}
}
.export-columns-tip {
margin-bottom: 8px;
font-size: 12px;

View File

@ -1,37 +1,38 @@
<template>
<el-dialog
:model-value="visible"
title="订单导出进度"
width="520px"
align-center
:close-on-click-modal="false"
:show-close="!loading"
@update:model-value="emit('update:visible', $event)"
>
<div class="export-progress-panel">
<el-progress
:percentage="progressPercent"
:status="progressStatus"
:stroke-width="16"
striped
striped-flow
/>
<div class="export-progress-panel__meta">
<span>任务状态:{{ statusLabel }}</span>
<span>任务ID:{{ taskId || '—' }}</span>
</div>
<div v-if="message || error" class="export-progress-panel__message">
{{ error || message }}
</div>
</div>
<template #footer>
<el-button size="small" :disabled="loading" @click="emit('update:visible', false)">关闭</el-button>
</template>
</el-dialog>
<UnifiedTaskProgressDialog
:visible="visible"
title="订单导出"
:subtitle="subtitle"
:task-id="taskId || ''"
mode="progress"
:state="progressState"
:progress="normalizedPercent"
:status-text="statusLabel || statusTextFallback"
:detail="detailText"
:summary="summaryItems"
:metrics="metricItems"
:elapsed-ms="meta.elapsedMs || 0"
:message="progressState === 'running' ? (message || '') : ''"
:error="progressState === 'failed' ? (error || message || '') : ''"
:tip="tipText"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="footerHint"
:closable="!loading"
@update:visible="emit('update:visible', $event)"
/>
</template>
<script setup lang="ts">
defineProps<{
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type {
ProgressMetricItem,
ProgressState,
ProgressSummaryItem
} from '@/components/task-progress/types'
import { formatExportMode, type ExportProgressMeta } from '@/utils/asyncExportHelpers'
const props = withDefaults(defineProps<{
visible: boolean
loading: boolean
progressPercent: number
@ -40,32 +41,81 @@ defineProps<{
taskId: string
message: string
error: string
}>()
/** 提交导出时的参数摘要(导出范围/模式/文件格式/数据量) */
meta?: ExportProgressMeta
}>(), {
meta: () => ({})
})
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
}>()
const normalizedPercent = computed(() => {
const value = Number(props.progressPercent || 0)
if (!Number.isFinite(value)) return 0
return Math.min(100, Math.max(0, value))
})
const progressState = computed<ProgressState>(() => {
if (props.progressStatus === 'exception' || props.error) return 'failed'
if (props.progressStatus === 'success' || normalizedPercent.value >= 100) return 'success'
return 'running'
})
const subtitle = computed(() => {
if (progressState.value === 'success') return '导出完成'
if (progressState.value === 'failed') return '导出失败'
return '正在导出订单数据'
})
const statusTextFallback = computed(() => {
if (progressState.value === 'success') return '已完成'
if (progressState.value === 'failed') return '失败'
return '执行中'
})
const detailText = computed(() => {
const current = Number(props.meta.currentCount ?? 0)
const total = Number(props.meta.totalCount ?? 0)
if (total > 0) return `已完成 ${current} / ${total}`
if (current > 0) return `已完成 ${current}`
return ''
})
const summaryItems = computed<ProgressSummaryItem[]>(() => {
const items: ProgressSummaryItem[] = []
const modeLabel = formatExportMode(props.meta.exportMode) || '默认'
const modeText = props.meta.exportScope
? `${props.meta.exportScope}(${modeLabel})`
: modeLabel
items.push({ label: '导出模式', value: modeText })
items.push({ label: '文件格式', value: props.meta.fileFormat || 'Excel (.xlsx)' })
if (props.meta.dataCount !== '' && props.meta.dataCount !== undefined && props.meta.dataCount !== null) {
items.push({ label: '数据量', value: `${props.meta.dataCount} 条` })
}
return items
})
const metricItems = computed<ProgressMetricItem[]>(() => {
const elapsedSeconds = Number(props.meta.elapsedMs || 0) / 1000
const pageText = props.meta.currentPage && props.meta.totalPage
? `${props.meta.currentPage} / ${props.meta.totalPage}`
: (props.meta.sheetCount ?? '—')
return [
{ label: '已完成', value: Number(props.meta.currentCount ?? 0) },
{ label: '页数', value: pageText },
{ label: '耗时', value: elapsedSeconds.toFixed(1), unit: 's' }
]
})
const tipText = computed(() => {
if (progressState.value === 'success') return props.message || '导出完成,可关闭窗口'
if (progressState.value === 'running') return '导出任务在后台执行中,关闭窗口不会中断。'
return ''
})
const footerHint = computed(() =>
progressState.value === 'running' ? '导出任务在后台执行' : '任务已结束,可关闭窗口'
)
</script>
<style scoped lang="scss">
.export-progress-panel {
display: flex;
flex-direction: column;
gap: 12px;
}
.export-progress-panel__meta {
display: flex;
flex-direction: column;
gap: 4px;
color: #606266;
font-size: 13px;
}
.export-progress-panel__message {
color: #909399;
font-size: 13px;
line-height: 1.5;
word-break: break-all;
}
</style>

View File

@ -127,6 +127,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -299,6 +299,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -127,6 +127,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -202,7 +202,7 @@
/>
<task-progress-dialog
:visible="allocateExpressProgressVisible"
title="分配快递号进度"
title="分配快递号"
:polling="allocateExpressProgressPolling"
:task-id="allocateExpressProgressState.taskId"
:progress-percent="allocateExpressProgressState.progress"
@ -382,6 +382,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -1,77 +1,50 @@
<template>
<el-dialog
v-model="visible"
<UnifiedTaskProgressDialog
:visible="visible"
:title="title"
width="560px"
align-center
destroy-on-close
:close-on-click-modal="!loading"
:close-on-press-escape="!loading"
:show-close="!loading"
:subtitle="isProgress ? '任务执行中' : '提交后任务在后台执行'"
:task-id="taskId || ''"
:mode="isProgress ? 'progress' : 'form'"
:state="progressState"
:progress="normalizedProgressPercent"
:status-text="taskStateText"
:detail="progressDetail"
:metrics="progressMetrics"
:fields="formFields"
:form-tip="description"
:message="progressState === 'running' ? (acceptMessage || '') : ''"
:error="errorMessage || ''"
:result-ids="resultOrderIds"
:result-ids-label="resultIdsLabel"
:tip="progressState === 'success' ? (acceptMessage || '任务已结束,可关闭窗口') : (progressState === 'running' ? '任务在后台执行,关闭窗口不会中断。' : '')"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="isProgress ? (progressState === 'running' ? '任务在后台执行,关闭窗口不会中断' : '任务已结束,可关闭窗口') : '操作不可撤销,请确认后提交'"
:submit-text="submitButtonText"
:closable="!loading"
@update:visible="visible = $event"
@closed="emit('closed')"
@submit="emit('submit')"
>
<el-alert
type="info"
:closable="false"
show-icon
class="batch-async-task-alert"
:title="description"
/>
<el-form label-width="120px" class="batch-async-task-form">
<el-form-item label="已选订单数">
<span>{{ orderCount }} 条</span>
</el-form-item>
<template v-if="phase === 'progress'">
<el-form-item label="任务ID">
<span class="batch-async-task-id">{{ taskId || '—' }}</span>
</el-form-item>
<el-form-item label="任务状态">
<span>{{ taskStateText }}</span>
</el-form-item>
<el-form-item label="处理进度">
<div class="batch-async-task-progress">
<el-progress
:percentage="normalizedProgressPercent"
:status="progressBarStatus"
:stroke-width="16"
/>
<div class="batch-async-task-progress__meta">
<span>总订单:{{ totalOrderCount }}</span>
<span>已处理:{{ processedOrderCount }}</span>
<span>{{ resultCountLabel }}:{{ resultOrderCount }}</span>
</div>
<div v-if="acceptMessage" class="batch-async-task-progress__message">{{ acceptMessage }}</div>
<div v-if="errorMessage" class="batch-async-task-progress__error">{{ errorMessage }}</div>
<div v-if="resultOrderIds.length" class="batch-async-task-progress__ids">
<span>{{ resultIdsLabel }}:</span>
<span>{{ resultOrderIds.join(', ') }}</span>
</div>
</div>
</el-form-item>
</template>
</el-form>
<template #footer>
<el-button size="small" :disabled="loading && phase === 'progress'" @click="visible = false">
{{ phase === 'progress' && !isFinished ? '后台处理' : '关闭' }}
</el-button>
<el-button
size="small"
v-if="phase === 'confirm'"
type="primary"
:loading="loading"
@click="emit('submit')"
>
{{ submitButtonText }}
</el-button>
<template v-if="isProgress">
<el-button size="small" @click="visible = false">
{{ progressState === 'running' ? '后台运行' : '关闭' }}
</el-button>
</template>
<template v-else>
<el-button size="small" @click="visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="loading" @click="emit('submit')">
{{ submitButtonText }}
</el-button>
</template>
</template>
</el-dialog>
</UnifiedTaskProgressDialog>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type { ProgressFormField, ProgressMetricItem, ProgressState } from '@/components/task-progress/types'
const visible = defineModel<boolean>({ default: false })
@ -100,6 +73,11 @@ const emit = defineEmits<{
(e: 'closed'): void
}>()
const SUCCESS_TASK_STATUS = ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete']
const FAILURE_TASK_STATUS = ['failed', 'failure', 'error', 'exception', 'cancel', 'cancelled', 'canceled', 'timeout', 'not_found']
const isProgress = computed(() => props.phase === 'progress')
const normalizedProgressPercent = computed(() => {
const value = Number(props.progressPercent || 0)
if (!Number.isFinite(value)) return 0
@ -109,70 +87,50 @@ const normalizedProgressPercent = computed(() => {
const taskStateText = computed(() => {
const map: Record<string, string> = {
submitted: '已提交',
running: '执行中',
success: '已完成',
failed: '失败',
running: '处理中',
processing: '处理中',
pending: '等待处理',
success: '处理完成',
succeeded: '处理完成',
finished: '处理完成',
fin: '处理完成',
done: '处理完成',
completed: '处理完成',
complete: '处理完成',
failed: '处理失败',
failure: '处理失败',
error: '处理失败',
exception: '异常',
cancel: '已取消',
cancelled: '已取消',
canceled: '已取消',
timeout: '超时',
not_found: '未找到'
}
const key = String(props.taskState || '').trim().toLowerCase()
return map[key] || props.taskState || '—'
})
const progressBarStatus = computed(() => {
const progressState = computed<ProgressState>(() => {
const key = String(props.taskState || '').trim().toLowerCase()
if (['failed', 'not_found'].includes(key)) return 'exception'
if (key === 'success' || normalizedProgressPercent.value >= 100) return 'success'
return undefined
if (FAILURE_TASK_STATUS.includes(key)) return 'failed'
if (SUCCESS_TASK_STATUS.includes(key) || normalizedProgressPercent.value >= 100) return 'success'
return 'running'
})
const isFinished = computed(() => {
const key = String(props.taskState || '').trim().toLowerCase()
return ['success', 'failed', 'not_found'].includes(key)
})
const progressDetail = computed(() =>
props.totalOrderCount ? `已处理 ${props.processedOrderCount ?? 0} / ${props.totalOrderCount}` : ''
)
const formFields = computed<ProgressFormField[]>(() => [
{ label: '已选订单数', value: `${props.orderCount} 条` }
])
const progressMetrics = computed<ProgressMetricItem[]>(() => [
{ label: '总订单', value: props.totalOrderCount ?? 0 },
{ label: '已处理', value: props.processedOrderCount ?? 0 },
{ label: props.resultCountLabel, value: props.resultOrderCount ?? 0 }
])
const resultOrderIds = computed(() => props.resultOrderIds || [])
</script>
<style scoped lang="scss">
.batch-async-task-alert {
margin-bottom: 12px;
}
.batch-async-task-id {
word-break: break-all;
}
.batch-async-task-progress {
width: 100%;
}
.batch-async-task-progress__meta {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 8px;
color: #606266;
font-size: 12px;
}
.batch-async-task-progress__message,
.batch-async-task-progress__error,
.batch-async-task-progress__ids {
margin-top: 6px;
font-size: 12px;
line-height: 1.5;
word-break: break-all;
}
.batch-async-task-progress__message {
color: #606266;
}
.batch-async-task-progress__error {
color: #f56c6c;
}
.batch-async-task-progress__ids {
color: #909399;
}
</style>

View File

@ -1,50 +1,48 @@
<template>
<el-dialog
v-model="visible"
:title="mode === 'cancel' ? '按订单批量取消分配储位' : '按订单批量分配储位'"
width="520px"
align-center
destroy-on-close
<UnifiedTaskProgressDialog
:visible="visible"
:title="dialogTitle"
:subtitle="isProgress ? '任务执行中' : '提交后任务在后台执行'"
:task-id="requestId || ''"
:mode="isProgress ? 'progress' : 'form'"
:state="progressState"
:progress="normalizedProgressPercent"
:status-text="progressStatusText"
:detail="progressDetail"
:metrics="progressMetrics"
:fields="formFields"
:form-tip="formTip"
:message="progressState === 'running' ? (message || '') : ''"
:error="progressState === 'failed' ? (message || '') : ''"
:tip="progressState === 'success' ? (message || '任务已结束,可关闭窗口') : (progressState === 'running' ? '任务在后台执行,关闭窗口不会中断。' : '')"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="isProgress ? (progressState === 'running' ? '任务在后台执行,关闭窗口不会中断' : '任务已结束,可关闭窗口') : '提交前请确认已选订单'"
:submit-text="submitButtonText"
@toggle-field="handleToggleField"
@update:visible="visible = $event"
@closed="emit('closed')"
@submit="emit('submit')"
>
<el-form label-width="140px" class="storage-allocate-form">
<el-form-item label="已选订单数">
<span>{{ orderCount }} 条</span>
</el-form-item>
<el-form-item v-if="mode !== 'cancel'" label="允许存储储位">
<el-switch v-model="allowStorageLocationProxy" active-text="是" inactive-text="否" />
</el-form-item>
<template v-if="mode !== 'cancel' && requestId">
<el-form-item label="任务ID">
<span>{{ requestId }}</span>
</el-form-item>
<el-form-item label="任务状态">
<span>{{ progressStatusText }}</span>
</el-form-item>
<el-form-item label="处理进度">
<div class="storage-allocate-progress">
<el-progress :percentage="normalizedProgressPercent" :status="progressBarStatus" :stroke-width="16" />
<div class="storage-allocate-progress__meta">
<span>总数:{{ totalCount }}</span>
<span>成功:{{ successCount }}</span>
<span>失败:{{ failedCount }}</span>
</div>
<div v-if="message" class="storage-allocate-progress__message">{{ message }}</div>
</div>
</el-form-item>
</template>
</el-form>
<template #footer>
<el-button size="small" :disabled="loading && !!requestId" @click="visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="loading" @click="emit('submit')">
{{ submitButtonText }}
</el-button>
<template v-if="isProgress">
<el-button size="small" @click="visible = false">
{{ progressState === 'running' ? '后台运行' : '关闭' }}
</el-button>
</template>
<template v-else>
<el-button size="small" @click="visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="loading" @click="emit('submit')">
{{ submitButtonText }}
</el-button>
</template>
</template>
</el-dialog>
</UnifiedTaskProgressDialog>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type { ProgressFormField, ProgressMetricItem, ProgressState } from '@/components/task-progress/types'
const visible = defineModel<boolean>({ default: false })
const allowStorageLocation = defineModel<boolean>('allowStorageLocation', { default: false })
@ -67,12 +65,27 @@ const emit = defineEmits<{
(e: 'closed'): void
}>()
const allowStorageLocationProxy = computed({
get: () => allowStorageLocation.value,
set: (value: boolean) => {
allowStorageLocation.value = value
}
})
const SUCCESS_TASK_STATUS = ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete']
const FAILURE_TASK_STATUS = ['failed', 'failure', 'error', 'exception', 'cancel', 'cancelled', 'canceled', 'timeout', 'not_found']
const isProgress = computed(
() => !!props.requestId || isFinishedTaskStatus(props.taskStatus)
)
function isFinishedTaskStatus(status?: string) {
const key = String(status || '').trim().toLowerCase()
return SUCCESS_TASK_STATUS.includes(key) || FAILURE_TASK_STATUS.includes(key)
}
const dialogTitle = computed(() =>
props.mode === 'cancel' ? '按订单批量取消分配储位' : '按订单批量分配储位'
)
const formTip = computed(() =>
props.mode === 'cancel'
? '将取消选中订单已分配的储位,任务在后台执行。'
: '系统会按商品与储位规则自动分配,冲突订单会记录失败原因。'
)
const normalizedProgressPercent = computed(() => {
const value = Number(props.progressPercent || 0)
@ -81,17 +94,28 @@ const normalizedProgressPercent = computed(() => {
})
const progressStatusText = computed(() => {
const runningText = props.mode === 'cancel' ? '取消中' : '分配中'
const doneText = props.mode === 'cancel' ? '取消完成' : '分配完成'
const failedText = props.mode === 'cancel' ? '取消失败' : '分配失败'
const map: Record<string, string> = {
submitted: '已受理',
running: '进行中',
processing: '进行中',
running: runningText,
processing: runningText,
pending: '等待处理',
success: '已完成',
finished: '已完成',
fin: '已完成',
failed: '失败',
error: '失败',
success: doneText,
succeeded: doneText,
finished: doneText,
fin: doneText,
done: doneText,
completed: doneText,
complete: doneText,
failed: failedText,
failure: failedText,
error: failedText,
exception: '异常',
cancel: '已取消',
cancelled: '已取消',
canceled: '已取消',
timeout: '超时',
not_found: '未找到'
}
@ -99,38 +123,45 @@ const progressStatusText = computed(() => {
return map[key] || props.taskStatus || '—'
})
const progressBarStatus = computed(() => {
const progressState = computed<ProgressState>(() => {
const key = String(props.taskStatus || '').trim().toLowerCase()
if (['failed', 'error', 'exception', 'timeout', 'not_found'].includes(key)) return 'exception'
if (['success', 'finished', 'fin'].includes(key) || normalizedProgressPercent.value >= 100) return 'success'
return undefined
if (FAILURE_TASK_STATUS.includes(key)) return 'failed'
if (SUCCESS_TASK_STATUS.includes(key) || normalizedProgressPercent.value >= 100) return 'success'
return 'running'
})
const progressDetail = computed(() =>
props.totalCount ? `已处理 ${(props.successCount ?? 0) + (props.failedCount ?? 0)} / ${props.totalCount}` : ''
)
const formFields = computed<ProgressFormField[]>(() => {
const fields: ProgressFormField[] = [{ label: '已选订单数', value: `${props.orderCount} 条` }]
if (props.mode !== 'cancel') {
fields.push({
label: '允许存储储位',
type: 'switch',
active: allowStorageLocation.value,
interactive: true
})
}
return fields
})
const progressMetrics = computed<ProgressMetricItem[]>(() => [
{ label: '成功', value: props.successCount ?? 0 },
{ label: '失败', value: props.failedCount ?? 0 },
{ label: '总数', value: props.totalCount ?? 0 }
])
const submitButtonText = computed(() => {
if (props.mode === 'cancel') return '确认取消'
if (props.requestId) return '处理中'
return '开始分配'
return '确认分配'
})
function handleToggleField(field: ProgressFormField) {
if (field.type === 'switch' && props.mode !== 'cancel') {
allowStorageLocation.value = !allowStorageLocation.value
}
}
</script>
<style scoped lang="scss">
.storage-allocate-progress {
width: 100%;
}
.storage-allocate-progress__meta {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 8px;
color: #606266;
font-size: 12px;
}
.storage-allocate-progress__message {
margin-top: 6px;
color: #606266;
font-size: 12px;
line-height: 1.5;
}
</style>

View File

@ -1,48 +1,47 @@
<template>
<el-dialog
v-model="visible"
title="同步订单ID"
width="560px"
align-center
destroy-on-close
<UnifiedTaskProgressDialog
:visible="visible"
title="同步订单 ID"
:subtitle="isProgress ? '任务执行中' : '提交后任务在后台执行'"
:task-id="requestId || ''"
:mode="isProgress ? 'progress' : 'form'"
:state="progressState"
:progress="normalizedProgressPercent"
:status-text="progressStatusText"
:detail="progressDetail"
:metrics="progressMetrics"
:fields="formFields"
form-tip="将逐条同步订单 ID,任务完成后可在列表中查看最新数据。"
:message="progressState === 'running' ? (message || '') : ''"
:error="progressState === 'failed' ? (message || '') : ''"
:tip="progressState === 'success' ? (message || '任务已结束,可关闭窗口') : (progressState === 'running' ? '任务在后台执行,可关闭窗口稍后查看。' : '')"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="isProgress ? (progressState === 'running' ? '任务在后台执行,关闭窗口不会中断' : '任务已结束,可关闭窗口') : '任务提交后可在后台运行'"
submit-text="确认同步"
@update:visible="visible = $event"
@closed="emit('closed')"
@submit="emit('submit')"
>
<el-form label-width="120px" class="sync-order-ids-form">
<el-form-item label="当前勾选订单">
<span>{{ orderCount }} 条</span>
</el-form-item>
<template v-if="requestId">
<el-form-item label="任务ID">
<span>{{ requestId }}</span>
</el-form-item>
<el-form-item label="任务状态">
<span>{{ progressStatusText }}</span>
</el-form-item>
<el-form-item label="处理进度">
<div class="sync-order-ids-progress">
<el-progress :percentage="normalizedProgressPercent" :status="progressBarStatus" :stroke-width="16" />
<div class="sync-order-ids-progress__meta">
<span>总数:{{ totalCount }}</span>
<span>已处理:{{ processedCount }}</span>
<span>成功:{{ successCount }}</span>
<span>失败:{{ failedCount }}</span>
</div>
<div v-if="message" class="sync-order-ids-progress__message">{{ message }}</div>
</div>
</el-form-item>
</template>
</el-form>
<template #footer>
<el-button size="small" :disabled="loading && !!requestId" @click="visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="loading" @click="emit('submit')">
{{ requestId ? '处理中' : '确认同步' }}
</el-button>
<template v-if="isProgress">
<el-button size="small" @click="visible = false">
{{ progressState === 'running' ? '后台运行' : '关闭' }}
</el-button>
</template>
<template v-else>
<el-button size="small" @click="visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="loading" @click="emit('submit')">
确认同步
</el-button>
</template>
</template>
</el-dialog>
</UnifiedTaskProgressDialog>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type { ProgressFormField, ProgressMetricItem, ProgressState } from '@/components/task-progress/types'
const visible = defineModel<boolean>({ default: false })
@ -64,6 +63,18 @@ const emit = defineEmits<{
(e: 'closed'): void
}>()
const SUCCESS_TASK_STATUS = ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete']
const FAILURE_TASK_STATUS = ['failed', 'failure', 'error', 'exception', 'cancel', 'cancelled', 'canceled', 'timeout', 'not_found']
const isProgress = computed(
() => !!props.requestId || isFinishedTaskStatus(props.taskStatus)
)
function isFinishedTaskStatus(status?: string) {
const key = String(status || '').trim().toLowerCase()
return SUCCESS_TASK_STATUS.includes(key) || FAILURE_TASK_STATUS.includes(key)
}
const normalizedProgressPercent = computed(() => {
const value = Number(props.progressPercent || 0)
if (!Number.isFinite(value)) return 0
@ -73,15 +84,23 @@ const normalizedProgressPercent = computed(() => {
const progressStatusText = computed(() => {
const map: Record<string, string> = {
submitted: '已受理',
running: '进行中',
processing: '进行中',
running: '同步中',
processing: '同步中',
pending: '等待处理',
success: '已完成',
finished: '已完成',
fin: '已完成',
failed: '失败',
error: '失败',
success: '同步完成',
succeeded: '同步完成',
finished: '同步完成',
fin: '同步完成',
done: '同步完成',
completed: '同步完成',
complete: '同步完成',
failed: '同步失败',
failure: '同步失败',
error: '同步失败',
exception: '异常',
cancel: '已取消',
cancelled: '已取消',
canceled: '已取消',
timeout: '超时',
not_found: '未找到'
}
@ -89,32 +108,32 @@ const progressStatusText = computed(() => {
return map[key] || props.taskStatus || '—'
})
const progressBarStatus = computed(() => {
const progressState = computed<ProgressState>(() => {
const key = String(props.taskStatus || '').trim().toLowerCase()
if (['failed', 'error', 'exception', 'timeout', 'not_found'].includes(key)) return 'exception'
if (['success', 'finished', 'fin'].includes(key) || normalizedProgressPercent.value >= 100) return 'success'
return undefined
if (FAILURE_TASK_STATUS.includes(key)) return 'failed'
if (SUCCESS_TASK_STATUS.includes(key) || normalizedProgressPercent.value >= 100) return 'success'
return 'running'
})
const progressDetail = computed(() => {
const total = props.totalCount
const processed = props.processedCount
if (total == null && processed == null) return ''
if (total == null) return `已处理 ${processed} 条`
if (processed == null) return `共 ${total} 条`
return `已处理 ${processed} / ${total}`
})
const formFields = computed<ProgressFormField[]>(() => [
{ label: '当前勾选订单', value: `${props.orderCount} 条` }
])
const progressMetrics = computed<ProgressMetricItem[]>(() => {
const metrics: ProgressMetricItem[] = []
if (props.totalCount != null) metrics.push({ label: '总数', value: props.totalCount })
if (props.processedCount != null) metrics.push({ label: '已处理', value: props.processedCount })
if (props.successCount != null) metrics.push({ label: '成功', value: props.successCount })
if (props.failedCount != null) metrics.push({ label: '失败', value: props.failedCount })
return metrics
})
</script>
<style scoped lang="scss">
.sync-order-ids-progress {
width: 100%;
}
.sync-order-ids-progress__meta {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 8px;
color: #606266;
font-size: 12px;
}
.sync-order-ids-progress__message {
margin-top: 6px;
color: #606266;
font-size: 12px;
line-height: 1.5;
}
</style>

View File

@ -194,6 +194,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -198,7 +198,7 @@
/>
<task-progress-dialog
:visible="allocateExpressProgressVisible"
title="分配快递号进度"
title="分配快递号"
:polling="allocateExpressProgressPolling"
:task-id="allocateExpressProgressState.taskId"
:progress-percent="allocateExpressProgressState.progress"
@ -386,6 +386,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -175,6 +175,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
/>
</div>
</template>

View File

@ -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<number | undefined>(undefined)
const syncOrderIdsProcessedCount = ref<number | undefined>(undefined)
const syncOrderIdsSuccessCount = ref<number | undefined>(undefined)
const syncOrderIdsFailedCount = ref<number | undefined>(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) {

View File

@ -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 {

View File

@ -328,7 +328,7 @@
<div class="fetchable-order-summary">
<el-tooltip
placement="top"
content="统计口径与下方列表一致(同一候选条件 + 结构分组 + 团购阈值过滤),但只统计达到团购阈值的分组;不含「包含 SKU」的分组过滤"
content="统计口径与下方列表一致,但只统计达到团购阈值的分组;不含「包含 SKU」的分组过滤"
>
<span class="fetchable-order-summary__title">
<span class="label">可抓取订单</span>
@ -358,81 +358,45 @@
<el-checkbox v-model="groupOrderFilters.returnOrderIds">返回订单 ID 列表</el-checkbox>
</div>
<div ref="groupOrderTableHostRef" class="group-order-table-host">
<el-table
<div class="group-order-table-host">
<upper-table
ref="groupOrderTableRef"
:data="groupOrderList"
v-loading="groupOrderListLoading"
border
size="small"
row-key="item_detail_machine"
:height="groupOrderTableHeight"
:loading="groupOrderListLoading"
:columns="waveGroupOrderColumns"
:row-key="groupOrderRowKey"
show-selection
table-size="small"
:pagination="groupOrderPagination"
:page-sizes="[10, 20, 50, 100]"
:query-time="groupOrderQueryTime"
empty-text="暂无可抓取的团购单结构"
@selection-change="handleGroupOrderSelectionChange"
@page-change="handleGroupOrderPageChange"
@page-size-change="handleGroupOrderPageSizeChange"
>
<el-table-column type="selection" width="48" reserve-selection />
<el-table-column prop="item_detail" label="商品结构" min-width="260" show-overflow-tooltip />
<el-table-column prop="logistics_name" label="快递" min-width="130" show-overflow-tooltip />
<el-table-column prop="group_count" label="同组订单数" min-width="100" align="right" />
<el-table-column prop="items_total" label="商品总数" min-width="100" align="right" />
<el-table-column label="货主" min-width="110">
<template #default="{ row }">
{{ getGroupOrderStoreText(row) }}
</template>
</el-table-column>
<el-table-column label="状态汇总" min-width="240">
<template #default="{ row }">
<span class="status-summary-text">{{ getGroupOrderStatusSummary(row) }}</span>
</template>
</el-table-column>
<el-table-column label="商品快照" min-width="280">
<template #default="{ row }">
<span class="order-info-text">{{ getGroupOrderItemSnapshotText(row) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="抓取数量" width="120" align="center">
<template #default="{ row }">
<el-input-number
:model-value="groupOrderQuantityMap[row.item_detail_machine]"
:min="1"
:controls="false"
placeholder="默认"
style="width: 92px"
@change="(value: number | undefined) => updateGroupOrderQuantity(row, value)"
/>
</template>
</el-table-column> -->
<el-table-column label="首单时间" min-width="168">
<template #default="{ row }">
{{ formatDateTime(row.first_order_time) }}
</template>
</el-table-column>
<el-table-column label="末单时间" min-width="168">
<template #default="{ row }">
{{ formatDateTime(row.last_order_time) }}
</template>
</el-table-column>
<template #column-store_name="{ row }">
{{ getGroupOrderStoreText(row) }}
</template>
<template #column-status_summary="{ row }">
<span class="status-summary-text">{{ getGroupOrderStatusSummary(row) }}</span>
</template>
<template #column-item_snapshot_text="{ row }">
<span class="order-info-text">{{ getGroupOrderItemSnapshotText(row) }}</span>
</template>
<template #column-first_order_time="{ row }">
{{ formatDateTime(row.first_order_time) }}
</template>
<template #column-last_order_time="{ row }">
{{ formatDateTime(row.last_order_time) }}
</template>
<template #pagination-info-extra>
<!-- <span class="group-order-selected-count">累计选中 {{ groupOrderSelectionRows.length }} 个结构</span> -->
</template>
<template #empty>
<div class="empty-tip">暂无可抓取的团购单结构</div>
</template>
</el-table>
</div>
<div class="group-order-pagination">
<div class="group-order-pagination__info">
<span>已选 {{ groupOrderSelectionRows.length }} 个结构</span>
</div>
<el-pagination
v-model:current-page="groupOrderPagination.currentPage"
v-model:page-size="groupOrderPagination.pageSize"
:page-sizes="[10, 20, 50, 100]"
:total="groupOrderPagination.total"
layout="total, sizes, prev, pager, next, jumper"
background
size="small"
@size-change="handleGroupOrderPageSizeChange"
@current-change="handleGroupOrderPageChange"
/>
</upper-table>
</div>
</div>
<template #footer>
@ -685,34 +649,39 @@
<wave-fetch-task-progress-dialog
:model-value="Boolean(fetchTaskProgress.taskId)"
:progress="fetchTaskProgress"
@update:model-value="handleFetchTaskProgressVisibleChange"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchAllocateExpressTaskProgress.taskId)"
title="快递号分配任务进度"
title="快递号分配任务"
:progress="batchAllocateExpressTaskProgress"
success-count-label="已完成订单"
failed-count-label="失败订单"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateExpressTaskProgress)"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchAllocateStorageTaskProgress.taskId)"
title="储位分配任务进度"
title="储位分配任务"
:progress="batchAllocateStorageTaskProgress"
success-count-label="已完成订单"
failed-count-label="失败订单"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateStorageTaskProgress)"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchRemoveExceptionOrdersTaskProgress.taskId)"
title="移除异常订单任务进度"
title="移除异常订单任务"
:progress="batchRemoveExceptionOrdersTaskProgress"
success-count-label="已移除订单"
failed-count-label="失败订单"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchRemoveExceptionOrdersTaskProgress)"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchCancelTaskProgress.taskId)"
title="批量取消波次任务进度"
title="批量取消波次任务"
:progress="batchCancelTaskProgress"
success-count-label="已处理波次"
failed-count-label="失败波次"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchCancelTaskProgress)"
/>
<wave-strategy-quick-scan-progress-dialog
v-model="waveStrategyQuickScanDialogVisible"
@ -925,7 +894,6 @@
<script setup lang="ts">
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<any>(null)
const upperTable = ref<any>(null)
/** 「抓取团购单」弹窗表格(UpperTable) */
const groupOrderTableRef = ref<any>(null)
const groupOrderTableHostRef = ref<HTMLElement | null>(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<any[]>([])
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<any[]>([])
const groupOrderSelectionRows = ref<any[]>([])
/** 「抓取团购单」列表查询耗时(UpperTable 分页条展示) */
const groupOrderQueryTime = ref(0)
/**
* 跨页选择缓存(key = item_detail_machine):
* UpperTable 在 data 变更(翻页/重查)时会清空内部选择,这里自行缓存已勾选结构,
* 保证与原先 el-table 的 reserve-selection 行为一致。
*/
const groupOrderSelectionMap = new Map<string, any>()
/** 数据重载期间置 true:忽略 UpperTable 被动清空选择时发来的 selection-change */
let groupOrderSelectionReloading = false
const groupOrderStoreOptions = ref<Array<{ label: string; value: number | string }>>([])
const waveMaxOrderLimit = ref<number | null>(null)
const fetchTaskPollTimer = ref<ReturnType<typeof setTimeout> | 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<WaveFetchTaskProgressResponse>
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<WaveGroupOrderFetchListResponse> }
@ -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 {

View File

@ -416,34 +416,39 @@
<wave-fetch-task-progress-dialog
:model-value="Boolean(fetchTaskProgress.taskId)"
:progress="fetchTaskProgress"
@update:model-value="handleFetchTaskProgressVisibleChange"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchAllocateExpressTaskProgress.taskId)"
title="快递号分配任务进度"
title="快递号分配任务"
:progress="batchAllocateExpressTaskProgress"
success-count-label="已完成订单"
failed-count-label="失败订单"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateExpressTaskProgress)"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchAllocateStorageTaskProgress.taskId)"
title="储位分配任务进度"
title="储位分配任务"
:progress="batchAllocateStorageTaskProgress"
success-count-label="已完成订单"
failed-count-label="失败订单"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchAllocateStorageTaskProgress)"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchRemoveExceptionOrdersTaskProgress.taskId)"
title="移除异常订单任务进度"
title="移除异常订单任务"
:progress="batchRemoveExceptionOrdersTaskProgress"
success-count-label="已移除订单"
failed-count-label="失败订单"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchRemoveExceptionOrdersTaskProgress)"
/>
<wave-batch-task-progress-dialog
:model-value="Boolean(batchCancelTaskProgress.taskId)"
title="批量取消波次任务进度"
title="批量取消波次任务"
:progress="batchCancelTaskProgress"
success-count-label="已处理波次"
failed-count-label="失败波次"
@update:model-value="(visible) => handleBatchTaskProgressVisibleChange(visible, resetBatchCancelTaskProgress)"
/>
<batch-receiving-print-dialog
@ -765,10 +770,7 @@ const buttonDisabledMap = computed(() => ({
}))
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
}

View File

@ -395,7 +395,7 @@ const buttonDisabledMap = computed(() => ({
}))
const buttonLabelMap = computed(() => ({
batchCancelTotal: `批量取消任务(${selectedTaskRows.value.length})`,
// 工具栏按钮标签不再显示选中数量统计(仅保留动态文案类标签)
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))

View File

@ -188,173 +188,201 @@
width="720px"
align-center
destroy-on-close
:close-on-click-modal="false"
append-to-body
>
<el-form
ref="waveStrategyFormRef"
:model="waveStrategyFormModel"
:rules="waveStrategyActiveFormRules"
label-width="130px"
class="wave-strategy-form-grid"
size="small"
>
<el-form-item label="策略名称" prop="strategy_name">
<el-input v-model="waveStrategyFormModel.strategy_name" clearable placeholder="请输入策略名称" maxlength="80" />
</el-form-item>
<el-form-item label="波次前缀" prop="wave_prefix">
<el-input
v-model="waveStrategyFormModel.wave_prefix"
clearable
placeholder="如 D、B、A(最多5字符)"
maxlength="5"
/>
</el-form-item>
<el-form-item label="策略类型" prop="strategy_type">
<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 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 :value="1" label="启用" />
<el-option :value="0" label="停用" />
</el-select>
</el-form-item>
<div class="form-body">
<el-form
ref="waveStrategyFormRef"
:model="waveStrategyFormModel"
:rules="waveStrategyActiveFormRules"
label-width="110px"
size="small"
@submit.prevent
>
<el-form-item label="策略名称" prop="strategy_name">
<el-input
v-model="waveStrategyFormModel.strategy_name"
clearable
placeholder="请输入策略名称"
maxlength="80"
show-word-limit
/>
</el-form-item>
<el-form-item label="最小SKU数" prop="order_min_sku">
<el-input-number v-model="waveStrategyFormModel.order_min_sku" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="最大SKU数" prop="order_max_sku">
<el-input-number v-model="waveStrategyFormModel.order_max_sku" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="最小件数" prop="order_min_qty">
<el-input-number v-model="waveStrategyFormModel.order_min_qty" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="最大件数" prop="order_max_qty">
<el-input-number v-model="waveStrategyFormModel.order_max_qty" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="同结构最小数" prop="min_same_structure">
<el-input-number v-model="waveStrategyFormModel.min_same_structure" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<el-form-item label="同结构最大数" prop="max_same_structure">
<el-input-number v-model="waveStrategyFormModel.max_same_structure" :min="0" :precision="0" controls-position="right" />
</el-form-item>
<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 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 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">
<el-select v-model="waveStrategyFormModel.require_same_express" clearable placeholder="请选择">
<el-option
v-for="option in waveBooleanOptions"
:key="String(option.value)"
:label="option.label"
:value="option.value"
<div class="form-grid-2">
<el-form-item label="波次前缀" prop="wave_prefix">
<el-input
v-model="waveStrategyFormModel.wave_prefix"
clearable
placeholder="如 D、B、A"
maxlength="5"
/>
</el-form-item>
<el-form-item label="策略类型" prop="strategy_type">
<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 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 :value="1" label="启用" />
<el-option :value="0" label="停用" />
</el-select>
</el-form-item>
</div>
<div class="form-grid-2">
<el-form-item label="最小SKU数" prop="order_min_sku">
<el-input-number v-model="waveStrategyFormModel.order_min_sku" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
<el-form-item label="最大SKU数" prop="order_max_sku">
<el-input-number v-model="waveStrategyFormModel.order_max_sku" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
<el-form-item label="最小件数" prop="order_min_qty">
<el-input-number v-model="waveStrategyFormModel.order_min_qty" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
<el-form-item label="最大件数" prop="order_max_qty">
<el-input-number v-model="waveStrategyFormModel.order_max_qty" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
<el-form-item label="同结构最小数" prop="min_same_structure">
<el-input-number v-model="waveStrategyFormModel.min_same_structure" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
<el-form-item label="同结构最大数" prop="max_same_structure">
<el-input-number v-model="waveStrategyFormModel.max_same_structure" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
</div>
<div class="form-grid-2">
<el-form-item label="单波最大订单" prop="batch_max_orders">
<el-input-number v-model="waveStrategyFormModel.batch_max_orders" :min="0" :precision="0" controls-position="right" placeholder="不限" />
</el-form-item>
<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 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" placeholder="不限" />
</el-form-item>
<el-form-item label="要求同快递" prop="require_same_express">
<el-select v-model="waveStrategyFormModel.require_same_express" clearable placeholder="请选择">
<el-option
v-for="option in waveBooleanOptions"
:key="String(option.value)"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许跨货主" prop="allow_cross_owner">
<el-select v-model="waveStrategyFormModel.allow_cross_owner" clearable placeholder="请选择">
<el-option
v-for="option in waveBooleanOptions"
:key="String(option.value)"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
</div>
<el-form-item label="允许货主">
<el-select
v-model="waveStrategyFormModel.allowed_owners"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许货主"
>
<el-option
v-for="option in waveStrategyOwnerOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许快递编码">
<el-select
v-model="waveStrategyFormModel.allowed_expresses"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许快递编码"
>
<el-option
v-for="option in waveStrategyExpressOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许省份">
<el-select
v-model="waveStrategyFormModel.allowed_provinces"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许省份"
>
<el-option
v-for="option in waveStrategyProvinceOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许平台">
<el-select
v-model="waveStrategyFormModel.allowed_platforms"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许平台"
>
<el-option
v-for="option in waveStrategyPlatformOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="说明" prop="description">
<el-input
v-model="waveStrategyFormModel.description"
type="textarea"
:rows="3"
clearable
maxlength="500"
show-word-limit
placeholder="策略说明(可选)"
/>
</el-select>
</el-form-item>
<el-form-item label="允许跨货主" prop="allow_cross_owner">
<el-select v-model="waveStrategyFormModel.allow_cross_owner" clearable placeholder="请选择">
<el-option
v-for="option in waveBooleanOptions"
:key="String(option.value)"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="说明" prop="description" class="wave-strategy-form-item--full">
<el-input v-model="waveStrategyFormModel.description" type="textarea" :rows="2" clearable placeholder="策略说明(可选)" />
</el-form-item>
<el-form-item label="允许货主" class="wave-strategy-form-item--full">
<el-select
v-model="waveStrategyFormModel.allowed_owners"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许货主"
>
<el-option
v-for="option in waveStrategyOwnerOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许快递编码" class="wave-strategy-form-item--full">
<el-select
v-model="waveStrategyFormModel.allowed_expresses"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许快递编码"
>
<el-option
v-for="option in waveStrategyExpressOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许省份" class="wave-strategy-form-item--full">
<el-select
v-model="waveStrategyFormModel.allowed_provinces"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许省份"
>
<el-option
v-for="option in waveStrategyProvinceOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="允许平台" class="wave-strategy-form-item--full">
<el-select
v-model="waveStrategyFormModel.allowed_platforms"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
placeholder="请选择允许平台"
>
<el-option
v-for="option in waveStrategyPlatformOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
</div>
<template #footer>
<el-button size="small" @click="waveStrategyFormDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="waveStrategyFormSubmitting" @click="submitWaveStrategyForm">
@ -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 {

View File

@ -1,37 +1,45 @@
<template>
<el-dialog
:model-value="modelValue"
<UnifiedTaskProgressDialog
:visible="modelValue"
:title="title"
width="min(520px, 92vw)"
append-to-body
align-center
:show-close="false"
:close-on-click-modal="false"
:close-on-press-escape="false"
class="wave-batch-task-progress-dialog"
: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.error || progress.message || '') : ''"
:tip="tipText"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="footerHint"
:closable="progressState !== 'running'"
@update:visible="emit('update:modelValue', $event)"
>
<div v-if="progress.taskId" class="task-progress-panel">
<div class="task-progress-panel__header">
<span class="task-progress-panel__meta">任务ID:{{ progress.taskId }}</span>
</div>
<el-progress :percentage="progressPercent" :status="progressBarStatus" :stroke-width="16" />
<div class="task-progress-panel__info">
<span>状态:{{ statusText }}</span>
<span>{{ successCountLabel }}:{{ progress.successCount }} / {{ progress.totalCount }}</span>
<span>{{ failedCountLabel }}:{{ progress.failedCount }}</span>
<span v-if="progress.skippedLockedCount">跳过锁定:{{ progress.skippedLockedCount }}</span>
<span v-if="progress.updateTime">更新时间:{{ formattedUpdateTime }}</span>
</div>
<div v-if="progress.message || progress.error" class="task-progress-panel__message">
{{ progress.error || progress.message }}
</div>
</div>
</el-dialog>
<template #footer>
<el-button
size="small"
:type="progressState === 'running' ? 'default' : 'primary'"
:disabled="progressState === 'running'"
@click="emit('update:modelValue', false)"
>
{{ progressState === 'running' ? '处理中…' : '关闭' }}
</el-button>
</template>
</UnifiedTaskProgressDialog>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import { waveFetchTaskStatusTextMap } from '../config/wave-config'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type {
ProgressMetricItem,
ProgressState,
ProgressSummaryItem
} from '@/components/task-progress/types'
export interface WaveBatchTaskProgressViewModel {
taskId: string
@ -58,22 +66,86 @@ const props = withDefaults(defineProps<{
failedCountLabel: '失败'
})
const emit = defineEmits<{
(e: 'update:modelValue', value: boolean): void
}>()
const SUCCESS_STATUS = ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete']
const FAILURE_STATUS = ['failed', 'failure', 'error', 'exception', 'timeout', 'not_found']
const progressPercent = computed(() => {
const value = Number(props.progress.progressPercent || 0)
if (!Number.isFinite(value)) return 0
return Math.min(100, Math.max(0, value))
})
const progressBarStatus = computed(() => {
const status = props.progress.status
if (status === 'failed' || status === 'not_found') return 'exception'
if (status === 'success' || progressPercent.value >= 100) return 'success'
return undefined
const progressState = computed<ProgressState>(() => {
const status = String(props.progress.status || '').trim().toLowerCase()
if (FAILURE_STATUS.includes(status)) return 'failed'
if (SUCCESS_STATUS.includes(status) || progressPercent.value >= 100) return 'success'
return 'running'
})
const statusText = computed(() => waveFetchTaskStatusTextMap[props.progress.status] || props.progress.status || '—')
const subtitle = computed(() => {
if (progressState.value === 'success') return '处理完成'
if (progressState.value === 'failed') return '处理失败'
return '正在批量处理订单'
})
const formattedUpdateTime = computed(() => formatDateTime(props.progress.updateTime))
const statusText = computed(() => {
if (progressState.value === 'success') return '处理完成'
if (progressState.value === 'failed') return '处理失败'
const status = String(props.progress.status || '').trim().toLowerCase()
const map: Record<string, string> = {
submitted: '已受理',
running: '处理中',
processing: '处理中',
pending: '等待处理',
queued: '排队中'
}
return map[status] || props.progress.status || '—'
})
const detailText = computed(() => {
const total = Number(props.progress.totalCount || 0)
const success = Number(props.progress.successCount || 0)
if (total > 0) return `${props.successCountLabel} ${success} / ${total}`
return ''
})
const summaryItems = computed<ProgressSummaryItem[]>(() => {
const items: ProgressSummaryItem[] = []
const skipped = Number(props.progress.skippedLockedCount || 0)
if (skipped > 0) items.push({ label: '跳过锁定', value: String(skipped) })
if (props.progress.updateTime) {
items.push({ label: '更新时间', value: formatDateTime(props.progress.updateTime) })
}
return items
})
const metricItems = computed<ProgressMetricItem[]>(() => {
const items: ProgressMetricItem[] = [
{ label: '总数', value: Number(props.progress.totalCount || 0) },
{ label: props.successCountLabel, value: Number(props.progress.successCount || 0) },
{ label: props.failedCountLabel, value: Number(props.progress.failedCount || 0) }
]
const durationMs = Number(props.progress.durationMs || 0)
if (durationMs > 0) {
items.push({ label: '耗时', value: (durationMs / 1000).toFixed(1), unit: 's' })
}
return items
})
const tipText = computed(() => {
if (progressState.value === 'success') return props.progress.message || '任务已结束,可关闭窗口'
if (progressState.value === 'running') return '任务在后台执行,完成后可关闭窗口。'
return ''
})
const footerHint = computed(() =>
progressState.value === 'running' ? '任务在后台执行' : '任务已结束'
)
function formatDateTime(value: string | number | null | undefined) {
if (!value) return '—'
@ -96,39 +168,3 @@ function formatDateTime(value: string | number | null | undefined) {
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
}
</script>
<style scoped lang="scss">
.task-progress-panel {
padding: 4px 0 0;
}
.task-progress-panel__header {
display: flex;
justify-content: flex-end;
align-items: center;
margin-bottom: 8px;
gap: 12px;
}
.task-progress-panel__meta {
font-size: 12px;
color: #909399;
word-break: break-all;
text-align: right;
}
.task-progress-panel__info {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 8px;
font-size: 12px;
color: #606266;
}
.task-progress-panel__message {
margin-top: 6px;
font-size: 12px;
color: #606266;
}
</style>

View File

@ -1,41 +1,45 @@
<template>
<el-dialog
:model-value="modelValue"
title="抓取任务进度"
width="min(520px, 92vw)"
append-to-body
align-center
:show-close="false"
:close-on-click-modal="false"
:close-on-press-escape="false"
class="wave-fetch-task-progress-dialog"
<UnifiedTaskProgressDialog
:visible="modelValue"
title="抓取任务"
: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.error || progress.message || '') : ''"
:tip="tipText"
:tip-type="progressState === 'success' ? 'primary' : 'default'"
:footer-hint="footerHint"
:closable="progressState !== 'running'"
@update:visible="emit('update:modelValue', $event)"
>
<div v-if="progress.taskId" class="task-progress-panel">
<div class="task-progress-panel__header">
<span class="task-progress-panel__meta">任务ID:{{ progress.taskId }}</span>
</div>
<el-progress :percentage="progressPercent" :status="progressBarStatus" :stroke-width="16" />
<div class="task-progress-panel__info">
<span>状态:{{ statusText }}</span>
<span>已完成结构:{{ progress.finishedStructureCount }} / {{ progress.structureCount }}</span>
<span>已抓取件数:{{ progress.totalFetchedQuantity }}</span>
<span v-if="progress.fetchMode">模式:{{ progress.fetchMode }}</span>
<span v-if="progress.maxFetchQuantity !== undefined && progress.maxFetchQuantity !== null">
抓取上限:{{ progress.maxFetchQuantity }}
</span>
<span v-if="progress.limitReached === true">已达上限</span>
<span v-if="progress.stopReason">停止原因:{{ progress.stopReason }}</span>
<span v-if="progress.updateTime">更新时间:{{ formattedUpdateTime }}</span>
</div>
<div v-if="progress.message || progress.error" class="task-progress-panel__message">
{{ progress.error || progress.message }}
</div>
</div>
</el-dialog>
<template #footer>
<el-button
size="small"
:type="progressState === 'running' ? 'default' : 'primary'"
:disabled="progressState === 'running'"
@click="emit('update:modelValue', false)"
>
{{ progressState === 'running' ? '处理中…' : '关闭' }}
</el-button>
</template>
</UnifiedTaskProgressDialog>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type {
ProgressMetricItem,
ProgressState,
ProgressSummaryItem
} from '@/components/task-progress/types'
export interface WaveFetchTaskProgressViewModel {
taskId: string
@ -60,32 +64,94 @@ const props = defineProps<{
progress: WaveFetchTaskProgressViewModel
}>()
const emit = defineEmits<{
(e: 'update:modelValue', value: boolean): void
}>()
const SUCCESS_STATUS = ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete']
const FAILURE_STATUS = ['failed', 'failure', 'error', 'exception', 'timeout', 'not_found']
const progressPercent = computed(() => {
const value = Number(props.progress.progressPercent || 0)
if (!Number.isFinite(value)) return 0
return Math.min(100, Math.max(0, value))
})
const progressBarStatus = computed(() => {
const st = props.progress.status
if (st === 'failed' || st === 'not_found') return 'exception'
if (st === 'success' || progressPercent.value >= 100) return 'success'
return undefined
const progressState = computed<ProgressState>(() => {
const status = String(props.progress.status || '').trim().toLowerCase()
if (FAILURE_STATUS.includes(status)) return 'failed'
if (SUCCESS_STATUS.includes(status) || progressPercent.value >= 100) return 'success'
return 'running'
})
const subtitle = computed(() => {
if (progressState.value === 'success') return '抓取完成'
if (progressState.value === 'failed') return '抓取失败'
return '正在抓取订单'
})
const statusText = computed(() => {
const status = props.progress.status
if (progressState.value === 'success') return '抓取完成'
if (progressState.value === 'failed') return '抓取失败'
const status = String(props.progress.status || '').trim().toLowerCase()
const map: Record<string, string> = {
submitted: '已受理',
running: '进行中',
success: '成功',
failed: '失败',
not_found: '未找到'
running: '抓取中',
processing: '抓取中',
pending: '等待处理'
}
return map[status] || status || '—'
return map[status] || props.progress.status || '—'
})
const formattedUpdateTime = computed(() => formatDateTime(props.progress.updateTime))
const detailText = computed(() => {
const total = Number(props.progress.structureCount || 0)
const finished = Number(props.progress.finishedStructureCount || 0)
if (total > 0) return `已完成结构 ${finished} / ${total}`
if (finished > 0) return `已完成结构 ${finished}`
return ''
})
const summaryItems = computed<ProgressSummaryItem[]>(() => {
const items: ProgressSummaryItem[] = []
const { fetchMode, maxFetchQuantity, warehouseId, updateTime } = props.progress
if (fetchMode) items.push({ label: '抓取模式', value: fetchMode })
if (maxFetchQuantity !== undefined && maxFetchQuantity !== null) {
items.push({ label: '抓取上限', value: String(maxFetchQuantity) })
}
if (warehouseId) items.push({ label: '仓库', value: String(warehouseId) })
if (updateTime) items.push({ label: '更新时间', value: formatDateTime(updateTime) })
return items
})
const metricItems = computed<ProgressMetricItem[]>(() => {
const items: ProgressMetricItem[] = [
{
label: '结构完成',
value: `${Number(props.progress.finishedStructureCount || 0)} / ${Number(props.progress.structureCount || 0)}`
},
{ label: '抓取件数', value: Number(props.progress.totalFetchedQuantity || 0) }
]
const durationMs = Number(props.progress.durationMs || 0)
if (durationMs > 0) {
items.push({ label: '耗时', value: (durationMs / 1000).toFixed(1), unit: 's' })
}
return items
})
const tipText = computed(() => {
if (progressState.value === 'success') return props.progress.message || '抓取完成,可关闭窗口'
if (progressState.value === 'running') {
if (props.progress.stopReason) return props.progress.stopReason
if (props.progress.limitReached) return '已达抓取上限,任务即将结束。'
return '抓取任务在后台执行,完成后可关闭窗口。'
}
return ''
})
const footerHint = computed(() =>
progressState.value === 'running' ? '抓取任务在后台执行' : '任务已结束'
)
function formatDateTime(value: string | number | null | undefined) {
if (!value) return '—'
@ -108,39 +174,3 @@ function formatDateTime(value: string | number | null | undefined) {
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
}
</script>
<style scoped lang="scss">
.task-progress-panel {
padding: 4px 0 0;
}
.task-progress-panel__header {
display: flex;
justify-content: flex-end;
align-items: center;
margin-bottom: 8px;
gap: 12px;
}
.task-progress-panel__meta {
font-size: 12px;
color: #909399;
word-break: break-all;
text-align: right;
}
.task-progress-panel__info {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 8px;
font-size: 12px;
color: #606266;
}
.task-progress-panel__message {
margin-top: 6px;
font-size: 12px;
color: #606266;
}
</style>

View File

@ -1,42 +1,33 @@
<template>
<el-dialog
:model-value="modelValue"
<UnifiedTaskProgressDialog
:visible="modelValue"
title="波次策略快速扫描"
width="min(560px, 92vw)"
append-to-body
align-center
:show-close="false"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<div v-if="progress.taskId" class="task-progress-panel">
<div class="task-progress-panel__header">
<span class="task-progress-panel__title">扫描任务进度</span>
<span class="task-progress-panel__meta">任务ID:{{ progress.taskId }}</span>
</div>
<el-progress :percentage="progressPercent" :status="progressBarStatus" :stroke-width="16" />
<div class="task-progress-panel__info">
<span>提交状态:{{ progress.status || '—' }}</span>
<span>任务状态:{{ progress.state || '—' }}</span>
<span>仓库ID:{{ progress.warehouseId || '—' }}</span>
<span>处理进度:{{ progress.processedOrderCount }} / {{ progress.totalOrderCount }}</span>
<span>匹配订单:{{ progress.matchedOrderCount }}</span>
<span>未匹配订单:{{ progress.unmatchedOrderCount }}</span>
<span>受理时间:{{ formatDateTime(progress.acceptedAt) }}</span>
</div>
<div v-if="progress.message" class="task-progress-panel__message">
{{ progress.message }}
</div>
</div>
<template #footer>
<el-button size="small" :disabled="!canClose" @click="handleClose">关闭</el-button>
</template>
</el-dialog>
: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)"
/>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
import type {
ProgressMetricItem,
ProgressState,
ProgressSummaryItem
} from '@/components/task-progress/types'
export interface WaveStrategyQuickScanProgressViewModel {
status: string
@ -50,6 +41,10 @@ export interface WaveStrategyQuickScanProgressViewModel {
matchedOrderCount: number
unmatchedOrderCount: number
progressPercent: number
startTime?: string
endTime?: string
durationMs?: number
errorMessage?: string
}
const props = defineProps<{
@ -61,6 +56,9 @@ const emit = defineEmits<{
(e: 'update:modelValue', value: boolean): void
}>()
const SUCCESS_STATUS = ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete']
const FAILURE_STATUS = ['failed', 'failure', 'error', 'exception', 'timeout', 'not_found']
function normalizeStatus(value: unknown) {
return String(value ?? '').trim().toLowerCase()
}
@ -71,22 +69,72 @@ const progressPercent = computed(() => {
return Math.min(100, Math.max(0, value))
})
const progressBarStatus = computed(() => {
const progressState = computed<ProgressState>(() => {
const status = normalizeStatus(props.progress.state)
if (['failed', 'failure', 'error', 'exception', 'not_found'].includes(status)) return 'exception'
if (['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete'].includes(status) || progressPercent.value >= 100) return 'success'
return undefined
if (FAILURE_STATUS.includes(status)) return 'failed'
if (SUCCESS_STATUS.includes(status) || progressPercent.value >= 100) return 'success'
return 'running'
})
const canClose = computed(() => {
const status = normalizeStatus(props.progress.state)
return ['success', 'succeeded', 'finished', 'fin', 'done', 'completed', 'complete', 'failed', 'failure', 'error', 'exception', 'not_found'].includes(status)
const subtitle = computed(() => {
if (progressState.value === 'success') return '扫描完成'
if (progressState.value === 'failed') return '扫描失败'
return '正在匹配波次策略'
})
function handleClose() {
if (!canClose.value) return
emit('update:modelValue', false)
}
const statusText = computed(() => {
if (progressState.value === 'success') return '扫描完成'
if (progressState.value === 'failed') return '扫描失败'
const status = normalizeStatus(props.progress.state)
const map: Record<string, string> = {
submitted: '已受理',
pending: '等待处理',
queued: '排队中',
running: '扫描中',
processing: '扫描中'
}
return map[status] || props.progress.state || '扫描中'
})
const detailText = computed(() => {
const total = Number(props.progress.totalOrderCount || 0)
const processed = Number(props.progress.processedOrderCount || 0)
if (total > 0) return `已处理 ${processed} / ${total}`
if (processed > 0) return `已处理 ${processed} 条`
return ''
})
const summaryItems = computed<ProgressSummaryItem[]>(() => {
const items: ProgressSummaryItem[] = []
const { warehouseId, status, acceptedAt } = props.progress
if (warehouseId) items.push({ label: '仓库', value: String(warehouseId) })
if (status) items.push({ label: '提交状态', value: status })
if (acceptedAt) items.push({ label: '受理时间', value: formatDateTime(acceptedAt) })
return items
})
const metricItems = computed<ProgressMetricItem[]>(() => {
const items: ProgressMetricItem[] = [
{ label: '匹配订单', value: Number(props.progress.matchedOrderCount || 0) },
{ label: '未匹配', value: Number(props.progress.unmatchedOrderCount || 0) }
]
const durationMs = Number(props.progress.durationMs || 0)
if (durationMs > 0) {
items.push({ label: '扫描耗时', value: (durationMs / 1000).toFixed(1), unit: 's' })
}
return items
})
const tipText = computed(() => {
if (progressState.value === 'success') return props.progress.message || '扫描完成,可关闭窗口'
if (progressState.value === 'running') return '扫描期间请勿关闭窗口,可最小化到后台。'
return ''
})
const footerHint = computed(() =>
progressState.value === 'running' ? '扫描任务在后台执行' : '任务已结束,可关闭窗口'
)
function formatDateTime(value: string | number | null | undefined) {
if (!value) return '—'
@ -109,46 +157,3 @@ function formatDateTime(value: string | number | null | undefined) {
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
}
</script>
<style scoped lang="scss">
.task-progress-panel {
border: 1px solid #e4e7ed;
border-radius: 6px;
padding: 10px 12px;
background: #fafcff;
}
.task-progress-panel__header {
display: flex;
flex-wrap: wrap;
align-items: baseline;
gap: 8px 16px;
margin-bottom: 8px;
}
.task-progress-panel__title {
font-weight: 600;
font-size: 13px;
color: #303133;
}
.task-progress-panel__meta {
font-size: 12px;
color: #606266;
}
.task-progress-panel__info {
display: flex;
flex-wrap: wrap;
gap: 8px 16px;
margin-top: 8px;
font-size: 12px;
color: #606266;
}
.task-progress-panel__message {
margin-top: 8px;
font-size: 12px;
color: #409eff;
}
</style>

View File

@ -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-<prop>)
*/
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',

View File

@ -40,7 +40,7 @@
</el-tooltip>
<!-- 已确认打印未领单波次数量(order.wave.confirmPrintUnclaimedWaveCount 长轮询实时刷新) -->
<el-tooltip
content="已确认打印(confirm_print_status=fin)但未领单(claim_status != fin)的波次数量,实时刷新"
content="已确认打印但未领单的波次数量,实时刷新"
placement="bottom"
>
<span class="unclaimed-print-chip" :class="{ 'is-active': confirmPrintUnclaimedWaveCount > 0 }">

View File

@ -268,7 +268,7 @@
<!-- 导出进度弹窗 -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="外仓商品导出进度"
title="外仓商品导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -276,6 +276,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -222,7 +222,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="商品导出进度"
title="商品导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -230,6 +230,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>

View File

@ -339,7 +339,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="入库单导出进度"
title="入库单导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -347,6 +347,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -164,7 +164,7 @@
<!-- 导出进度弹窗 -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="入库单导出进度"
title="入库单导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -172,6 +172,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -77,7 +77,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="报表导出进度"
title="报表导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -85,6 +85,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</template>

View File

@ -162,7 +162,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="库存导出进度"
title="库存导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -170,6 +170,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -138,7 +138,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="商品流水导出进度"
title="商品流水导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -146,6 +146,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -195,7 +195,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="商品流水导出进度"
title="商品流水导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -203,6 +203,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -155,7 +155,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="收货单导出进度"
title="收货单导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -163,6 +163,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>

View File

@ -134,7 +134,7 @@
<!-- 导出进度弹窗 -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="收货单导出进度"
title="收货单导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -142,6 +142,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -104,7 +104,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="库存报表导出进度"
title="库存报表导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -112,6 +112,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -106,7 +106,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="库存报表导出进度"
title="库存报表导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -114,6 +114,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</div>

View File

@ -244,7 +244,7 @@
<!-- ===== 导出进度(stock.check.export + exportTaskProgress) ===== -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="导出盘点单进度"
title="导出盘点单"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -252,13 +252,14 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
<!-- ===== 盘点明细导出进度(stock.check.exportDetail + exportTaskProgress) ===== -->
<AsyncExportProgressDialog
v-model:visible="detailExportDialogVisible"
title="导出盘点明细进度"
title="导出盘点明细"
:loading="detailExportLoading"
:progress-percent="detailExportProgressPercent"
:progress-status="detailExportProgressStatus"
@ -266,6 +267,7 @@
:task-id="detailExportTaskProgress.taskId"
:message="detailExportTaskProgress.message"
:error="detailExportTaskProgress.error"
:meta="detailExportTaskProgress"
:update-time="detailExportTaskProgress.updateTime"
/>
</div>

View File

@ -74,7 +74,7 @@
<!-- 导出任务进度(提交后接管,完成后自动下载) -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="导出签约货主列表进度"
title="导出签约货主列表"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -82,6 +82,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</template>

View File

@ -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 @@
<!-- 签约货主列表导出进度(storeWarehouse.store.export + exportTaskProgress) -->
<AsyncExportProgressDialog
:visible="listExportDialogVisible"
title="导出签约货主列表进度"
title="导出签约货主列表"
:loading="listExportLoading"
:progress-percent="listExportProgressPercent"
:progress-status="listExportProgressStatus"
@ -1011,6 +1012,7 @@
:task-id="listExportTaskProgress.taskId"
:message="listExportTaskProgress.message"
:error="listExportTaskProgress.error"
:meta="listExportTaskProgress"
:update-time="listExportTaskProgress.updateTime"
@update:visible="listExportDialogVisible = $event"
/>

View File

@ -80,7 +80,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="报表导出进度"
title="报表导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -88,6 +88,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>
</template>

View File

@ -243,7 +243,7 @@
<TaskProgressDialog
v-if="activeDialog === 'task'"
:visible="true"
title="分配快递号进度"
title="分配快递号"
:polling="true"
task-id="T202610190002"
:progress-percent="percent"
@ -286,7 +286,7 @@
<WaveBatchTaskProgressDialog
v-if="activeDialog === 'batch'"
:model-value="true"
title="快递号分配任务进度"
title="快递号分配任务"
:progress="batchProgress"
success-count-label="已完成订单"
failed-count-label="失败订单"
@ -749,7 +749,7 @@ function buildScenario(key: UnifiedScenarioKey): ScenarioProps {
case 'uTask':
return {
title: '分配快递号进度',
title: '分配快递号',
subtitle: '正在为订单分配快递号',
taskId: 'T202610190002',
state: isDone ? 'success' : 'running',
@ -772,7 +772,7 @@ function buildScenario(key: UnifiedScenarioKey): ScenarioProps {
case 'uOrderExport':
return {
title: '订单导出进度',
title: '订单导出',
subtitle: '正在导出订单数据',
taskId: 'O202610190003',
state: isDone ? 'success' : 'running',
@ -804,7 +804,7 @@ function buildScenario(key: UnifiedScenarioKey): ScenarioProps {
case 'uFetch':
return {
title: '抓取任务进度',
title: '抓取任务',
subtitle: '按结构抓取订单',
taskId: 'F202610190932',
state: isDone ? 'success' : 'running',
@ -826,7 +826,7 @@ function buildScenario(key: UnifiedScenarioKey): ScenarioProps {
case 'uBatch':
return {
title: '快递号分配任务进度',
title: '快递号分配任务',
subtitle: '批量处理已选波次订单',
taskId: 'B202610190933',
state: isDone ? 'success' : 'running',

View File

@ -432,7 +432,7 @@
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="面单日志导出进度"
title="面单日志导出"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
@ -440,6 +440,7 @@
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:meta="exportTaskProgress"
:update-time="exportTaskProgress.updateTime"
/>