WEB/src/views/order/waveOrder/WavePickTaskListPanel.vue
yin 2a37739b7d refactor(detail): 详情与日志列表统一迁移 UpperTable,任务进度支持收起为浮窗
- 新增 TaskProgressFloatWidget;TaskProgressDialog 增加 minimizable 与 minimize
  事件,运行中可「收起后台」,浮窗继续轮询并支持点击还原窗口,
  运单页「更新揽收状态」已接入
- UpperTable 新增 #pagination-info 插槽(支持「已选 N 项」等精简文案),
  运单号列对齐方式透传给 WaybillCodeActions
- 盘点、入库、出库、收货、波次、订单明细、库存详情、仓库与店铺等 20+ 处
  日志/明细列表由 el-table 迁移至 UpperTable,统一分页、行选择、
  虚拟滚动、状态文本样式与列插槽
- 拆包录像列表、出库单详情表单、运单称重弹窗等按 task-panel 结构统一;
  运单轨迹浮层支持拖动并复用 task-panel 标题与关闭样式
- 补充相关样式,修正内嵌表格高度与分页区布局,避免卡片阴影与高度塌陷
2026-11-12 18:01:25 +08:00

1446 lines
49 KiB
Vue
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
:available-fields="availableFieldsRef"
@condition-change="handleConditionChange"
@reset="handleConditionReset"
@condition-clear="handleConditionClear"
/>
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left">
<order-toolbar-button-group
:buttons="pickTaskWaveToolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<!-- 无需 toolbar-right,保持与 orderManagement 一致 -->
<!-- <div class="toolbar-right">
<span class="toolbar-switch-label">{{ pickTaskWaveListDefaults.toolbarHint }}</span>
</div> -->
</div>
<div class="split-stack" ref="splitStackRef">
<div class="upper-wrapper" :style="detailVisible ? upperPaneStyle : upperPaneFullStyle">
<upper-table
ref="upperTable"
:title="pickTaskWaveListDefaults.listTitle"
default-align="center"
:enable-column-config="true"
table-id="wave-pick-task-list"
:data="list"
:row-key="getTaskRowKey"
:columns="columns"
table-size="small"
:pagination="pagination"
:page-sizes="[...pickTaskWavePaginationPageSizes]"
:pagination-layout="pickTaskWavePaginationDefaults.layout"
:show-index="false"
:show-selection="true"
:loading="loading"
:queryTime="queryTime"
@current-change="handleRowClick"
@row-click="handleRowClick"
@page-change="handlePageChange"
@page-size-change="handlePageSizeChange"
@refresh="loadData"
@sort-change="handleSortChange"
@selection-change="handleSelectionChange"
>
<template #pagination-info-extra>
<span style="margin-left:16px;color:#606266;font-size:12px">
平均拣货时长:{{ avgPickDurationText }} 平均复核时长:{{ avgReviewDurationText }}
<span title="统计当前已加载任务:拣货/复核时间不超过1分钟或不完整(开始/完成时间缺失)的记录不计入平均">(不含≤1分钟与缺失)</span>
</span>
</template>
<template #column-status="{ row }">
<span :class="getStatusTextClass(getPickTaskStatusTagType(row.status))">
{{ formatPickTaskStatus(row.status) }}
</span>
</template>
<template #column-review_status="{ row }">
<span :class="getStatusTextClass(getPickTaskReviewStatusTagType(row.review_status))">
{{ formatPickTaskReviewStatus(row.review_status) }}
</span>
</template>
<template #column-pick_mode="{ row }">
<span :class="getStatusTextClass('info')">
{{ formatPickTaskPickMode(row.pick_mode) }}
</span>
</template>
<template #column-source="{ row }">
<span :class="getStatusTextClass(getPickTaskSourceTagType(row.source))">
{{ formatPickTaskSource(row.source) }}
</span>
</template>
<template #column-warehouse_id="{ row }">
<span>{{ row.warehouse_id ?? '—' }}</span>
</template>
<template #column-box_count="{ row }">
<el-tooltip v-if="row.box_count === 0" content="可能未统计" placement="top">
<span>{{ row.box_count }}</span>
</el-tooltip>
<span v-else>{{ row.box_count }}</span>
</template>
<template #column-operator_name="{ row }">
{{ row.operator_name || row.operator_id || '—' }}
</template>
<template #column-pick_user_name="{ row }">
{{ row.pick_user_name || row.pick_user_id || '—' }}
</template>
<template #column-review_user_name="{ row }">
{{ row.review_user_name || row.review_user_id || '—' }}
</template>
<template #column-claim_operator="{ row }">
{{ row.claim_operator || row.claim_operator_id || '—' }}
</template>
<template #column-cart_name="{ row }">
{{ row.cart_name || row.current_cart_code_snapshot || '—' }}
</template>
<template #column-start_at="{ row }">
{{ formatDateTime(row.start_at || row.start_time) }}
</template>
<template #column-finish_at="{ row }">
{{ formatDateTime(row.finish_at || row.finish_time) }}
</template>
<template #column-pick_duration="{ row }">
<span>{{ row.pick_duration === null || row.pick_duration === undefined ? '—' : row.pick_duration }}</span>
</template>
<template #column-review_start_time="{ row }">
{{ formatDateTime(row.review_start_time) }}
</template>
<template #column-review_finish_time="{ row }">
{{ formatDateTime(row.review_finish_time) }}
</template>
<template #column-review_duration="{ row }">
<span>{{ row.review_duration === null || row.review_duration === undefined ? '—' : row.review_duration }}</span>
</template>
<template #column-created_at="{ row }">
{{ formatDateTime(row.created_at || row.create_time) }}
</template>
<template #column-update_time="{ row }">
{{ formatDateTime(row.update_time) }}
</template>
<template #column-operation="{ row }">
<el-button
v-if="!isPickTaskCancelled(row) && !isPickTaskPickFinished(row)"
type="primary"
link
size="small"
:loading="completingTaskId === getTaskId(row)"
:disabled="!getTaskId(row)"
@click.stop="handleCompletePickTask(row)"
>
完成拣货
</el-button>
<el-button
v-if="!isPickTaskCancelled(row) && !isPickTaskPickFinished(row)"
type="danger"
link
size="small"
:loading="cancelingTaskId === getTaskId(row)"
:disabled="!getTaskId(row)"
@click.stop="handleCancelTask(row)"
>
取消任务
</el-button>
</template>
<template #empty>
<div class="empty-tip">{{ emptyText }}</div>
</template>
</upper-table>
</div>
<template v-if="detailVisible">
<div
class="pane-resizer"
title="拖动调整列表与详情区域高度"
@mousedown="beginSplitDrag"
/>
<div v-if="selectedTaskId" class="lower-level" :style="lowerPaneStyle">
<div class="detail-header">
<el-tabs v-model="detailActiveTab" class="detail-tab">
<el-tab-pane label="波次列表" name="waveList" />
</el-tabs>
</div>
<div class="detail-container">
<div v-if="detailActiveTab === 'waveList'" class="detail-page wave-list-panel">
<!-- 按钮行(对齐 storage/receiving 商品明细/操作日志:左侧刷新) -->
<div class="header-actions">
<div class="left-actions">
<el-button size="small" type="primary" :loading="loading" @click="loadData">刷新</el-button>
</div>
</div>
<!-- 波次列表:对齐 storage/receiving 商品明细/操作日志(UpperTable + 多选 + 分页) -->
<div class="table-host">
<upper-table
ref="waveTableRef"
table-id="wave-pick-task-wave-list"
:data="pagedTaskWaveList"
:columns="waveColumns"
default-align="center"
table-size="small"
:show-selection="true"
:pagination="wavePagination"
:page-sizes="[10, 20, 50, 100]"
:row-key="resolveWaveRowKey"
empty-text="该任务暂无关联波次"
@page-change="handleWavePageChange"
@page-size-change="handleWavePageSizeChange"
@selection-change="handleWaveSelectionChange"
>
<!-- 已选数量放左下角(UpperTable 分页区左侧) -->
<template #pagination-info="{ count }">已选 {{ count }} 项</template>
<template #column-wave_no="{ row: waveRow }">
<span
class="click-copy-link"
role="button"
tabindex="0"
title="点击复制波次号"
@click.stop="copyWaveNo(waveRow.wave_no)"
@keydown.enter.prevent="copyWaveNo(waveRow.wave_no)"
>
{{ waveRow.wave_no || '—' }}
</span>
</template>
<template #column-status="{ row: waveRow }">
<span :class="getStatusTextClass(getWaveStatusTagType(waveRow.status))">
{{ getWaveStatusText(waveRow.status) }}
</span>
</template>
<template #column-bind_time="{ row: waveRow }">
{{ formatWaveTime(waveRow.bind_time) }}
</template>
<template #column-pick_time="{ row: waveRow }">
{{ formatWaveTime(waveRow.pick_time) }}
</template>
</upper-table>
</div>
</div>
</div>
</div>
<div v-else class="no-selection" :style="lowerPaneStyle">
<div class="empty-tip">
<p>请从上方列表中选择一项查看详情</p>
</div>
</div>
</template>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
import type { ToolbarButtonConfig } from '@/components/ToolbarButtonGroup/types'
import { getStatusTextClass } from '@/utils/statusText'
import { safeInvoke } from '@/utils/safe-invoke'
import { useUserStore } from '@/stores/modules/user'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import {
orderWaveWavePickTaskCancel,
orderWaveWavePickTaskCancelSelf,
orderWaveWavePickTaskList,
unwrapWavePickTaskListResponse,
type WaveListRpcSort,
type WavePickTaskListItem,
type WavePickTaskTextOperator
} from '@/api/order.wave/orderwave'
import {
pickWavePickTaskComplete,
type PickWavePickTaskCompleteResponse
} from '@/api/pick/pick'
import {
pickTaskWaveAvailableFields,
pickTaskWaveListDefaults,
pickTaskWavePaginationDefaults,
pickTaskWavePaginationPageSizes,
pickTaskWaveToolbarButtons,
pickTaskWaveColumns,
formatPickTaskStatus,
formatPickTaskReviewStatus,
formatPickTaskPickMode,
formatPickTaskSource,
getPickTaskStatusTagType,
getPickTaskReviewStatusTagType,
getPickTaskSourceTagType
} from './config/wave-config'
const props = withDefaults(
defineProps<{
/** 与路由 path 组合,隔离 ScanBox 筛选缓存(波次各标签页须各不相同) */
scanBoxCacheKey?: string
}>(),
{
scanBoxCacheKey: 'wave-order-pick-task'
}
)
const userStore = useUserStore()
const upperTable = ref<any>(null)
const columns = ref([...pickTaskWaveColumns])
const loading = ref(false)
const list = ref<Array<Record<string, any>>>([])
const emptyText = ref(pickTaskWaveListDefaults.emptyText)
const scanBox = ref<any>(null)
const presetTree = ref<unknown[]>([])
const availableFieldsRef = reactive(JSON.parse(JSON.stringify(pickTaskWaveAvailableFields)))
const queryTime = ref(0)
const cancelingTaskId = ref<number | string | null>(null)
const completingTaskId = ref<number | string | null>(null)
const batchCancelLoading = ref(false)
const selectedTaskRows = ref<Array<Record<string, any>>>([])
/** 平均拣货时长文案(当前已加载行;剔除缺失与 <=1 分钟记录),无有效记录显示 — */
const avgPickDurationText = computed(() => {
const avg = calcAverageDurationSeconds(list.value.map((r) => r.pick_duration_sec as number | null | undefined))
return avg === null ? '—' : formatSecondsHMS(Math.round(avg))
})
/** 平均复核时长文案(同规则) */
const avgReviewDurationText = computed(() => {
const avg = calcAverageDurationSeconds(list.value.map((r) => r.review_duration_sec as number | null | undefined))
return avg === null ? '—' : formatSecondsHMS(Math.round(avg))
})
const detailVisible = ref(true)
const selectedTaskId = ref<number | string | null>(null)
const detailActiveTab = ref('waveList')
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
defaultLowerPercent: 38
})
const upperPaneFullStyle = computed(() => ({
flex: '1 1 auto',
minHeight: '0',
overflow: 'hidden' as const
}))
function toggleDetailVisible() {
detailVisible.value = !detailVisible.value
}
const pagination = reactive({
currentPage: 1,
pageSize: pickTaskWavePaginationDefaults.initialPageSize,
total: 0
})
const currentSort = reactive({ prop: '', order: '' })
const warehouseId = computed(() => Number(userStore.user?.warehouse_id ?? userStore.user?.store_id ?? 0))
/** 与接口文档中 operator_id / pick_user_id(employees)对齐 */
const currentEmployeeId = computed(() => Number(userStore.user?.employees_id ?? userStore.roleId ?? 0))
const cancelSelfTaskId = ref<number | string | null>(null)
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
const buttonLoadingMap = computed(() => ({
batchCancelLoading: batchCancelLoading.value
}))
const buttonDisabledMap = computed(() => ({
noSelection: selectedTaskRows.value.length === 0,
batchCancelDisabled:
selectedTaskRows.value.length === 0 ||
selectedTaskRows.value.some((row) => isPickTaskCancelled(row) || isPickTaskPickFinished(row))
}))
const buttonLabelMap = computed(() => ({
// 工具栏按钮标签不再显示选中数量统计(仅保留动态文案类标签)
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value,
labels: buttonLabelMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
}
function resolveButtonDisabled(disabledKey?: string) {
if (!disabledKey) return false
return Boolean((buttonDisabledMap.value as Record<string, boolean>)[disabledKey])
}
function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
if (!dynamicLabelKey) return defaultLabel
return (buttonLabelMap.value as Record<string, string>)[dynamicLabelKey] || defaultLabel
}
const toolbarActionMap: Record<string, () => void> = {
loadData: () => {
void loadData()
},
openColumnConfigPanel: () => openColumnConfigPanel(),
toggleDetailVisible: () => toggleDetailVisible(),
handleSearch: () => handleSearch(),
handleBatchCancelTasks: () => {
void handleBatchCancelTasks()
}
}
function openColumnConfigPanel() {
upperTable.value?.openColumnConfig?.()
}
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = toolbarActionMap[action]
if (!handler) return
safeInvoke(() => handler())
}
/**
* 展开 ScanBox 返回结构,兼容:
* - 扁平 { pick_user_id: { value, operator?, type? } }
* - 快照/合并后仅有 { value } 缺少 operator(原先误判为非条件对象,整对象传给 toPositiveId 导致 undefined)
* - { type: 'custom', conditions: { ... } } 包裹
*/
function unwrapScanBoxConditionMap(raw: Record<string, any> | null | undefined): Record<string, any> {
if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return {}
let root: Record<string, any> = raw
const type = root.type
const nested = root.conditions
if (type === 'custom' && nested && typeof nested === 'object' && !Array.isArray(nested)) {
root = nested as Record<string, any>
} else if (
nested
&& typeof nested === 'object'
&& !Array.isArray(nested)
&& Object.keys(root).length === 1
) {
root = nested as Record<string, any>
}
return root
}
/** 将 ScanBox getConditions() 压平为 wavePickTaskList 可用的顶层筛选字段 */
function buildPickTaskScanFilters(rawConditions: Record<string, any>) {
const root = unwrapScanBoxConditionMap(rawConditions)
const out: Record<string, any> = {}
const skipKeys = new Set(['type', 'preset', 'field'])
Object.keys(root).forEach((key) => {
if (skipKeys.has(key)) return
const condition = root[key]
if (condition === undefined || condition === null || condition === '') return
if (typeof condition === 'object' && !Array.isArray(condition)) {
if (Object.prototype.hasOwnProperty.call(condition, 'value')) {
const value = condition.value
if (value === undefined || value === null || value === '') return
if (Array.isArray(value) && value.length === 0) return
out[key] = value
return
}
}
out[key] = Array.isArray(condition) ? condition[0] ?? '' : condition
})
return out
}
/**
* 时间查询模式 → wavePickTaskList 顶层时间参数前缀。
* 模式值 = 页面 `pickTaskWaveAvailableFields` 中时间字段的 value;
* ScanBox 会把页面时间字段自动合并为「时间」控件,新增时间字段时在此登记映射即可。
*/
const PICK_TASK_TIME_FILTER_PREFIXES = ['start_time', 'finish_time', 'create_time'] as const
type PickTaskTimeFilterPrefix = (typeof PICK_TASK_TIME_FILTER_PREFIXES)[number]
/**
* 解析 ScanBox「时间」合并筛选(modetimerange)当前选中的模式与时间范围。
* 条件键 = 所选模式(start_time / finish_time / create_time)。
*/
function resolvePickTaskTimeRange(
flat: Record<string, any>
): { mode: PickTaskTimeFilterPrefix; range: [string, string] } | null {
for (const mode of PICK_TASK_TIME_FILTER_PREFIXES) {
const range = flat[mode]
if (Array.isArray(range) && range.length >= 2 && range[0] && range[1]) {
return { mode, range: [String(range[0]), String(range[1])] }
}
}
return null
}
/** 兼容 ScanBox 多种返回形态,按候选键提取首个有效值 */
function resolveScanFilterValue(
flat: Record<string, any>,
keys: string[],
rawConditions: Record<string, any>
): unknown {
for (const key of keys) {
const v = flat[key]
if (v !== undefined && v !== null && v !== '') return v
}
const root = unwrapScanBoxConditionMap(rawConditions)
const where = root.where && typeof root.where === 'object' ? root.where : {}
for (const key of keys) {
const fromWhere = (where as Record<string, any>)[key]
if (fromWhere && typeof fromWhere === 'object' && Object.prototype.hasOwnProperty.call(fromWhere, 'value')) {
const value = fromWhere.value
if (value !== undefined && value !== null && value !== '') return value
}
if (fromWhere !== undefined && fromWhere !== null && fromWhere !== '') return fromWhere
}
return undefined
}
/** 将 ScanBox 文本输入的 ID 转为正整数;非法/空值返回 undefined(避免向接口发送 NaN/0/字符串) */
function toPositiveId(value: unknown): number | undefined {
if (value === undefined || value === null || value === '') return undefined
const text = String(value).trim()
if (!text) return undefined
const num = Number(text)
if (!Number.isFinite(num) || num <= 0) return undefined
return Math.trunc(num)
}
/** 读取 ScanBox 条件中指定字段的操作符(如 eq/like);未选择时默认模糊(like) */
function resolveScanConditionOperator(
rawConditions: Record<string, any>,
key: string,
fallback = 'like'
): string {
const root = unwrapScanBoxConditionMap(rawConditions)
const condition = root[key]
if (condition && typeof condition === 'object' && !Array.isArray(condition)) {
const op = condition.operator
if (typeof op === 'string' && op) return op
}
return fallback
}
/** 顶层文本筛选参数支持的操作符(接口文档:like / notlike / eq,默认 like) */
const PICK_TASK_TEXT_FILTER_OPERATORS: WavePickTaskTextOperator[] = ['like', 'notlike', 'eq']
/** 读取顶层文本筛选字段的操作符;ScanBox 缓存中若残留 contains 等未支持操作符则回退 like */
function resolvePickTaskTextOperator(
rawConditions: Record<string, any>,
key: string,
fallback: WavePickTaskTextOperator = 'like'
): WavePickTaskTextOperator {
const op = resolveScanConditionOperator(rawConditions, key, fallback)
return (PICK_TASK_TEXT_FILTER_OPERATORS as string[]).includes(op) ? (op as WavePickTaskTextOperator) : fallback
}
/** ScanBox 文本值归一化为字符串(顶层文本筛选参数只接受字符串,不以数组下发) */
function toScanTextValue(raw: unknown): string | undefined {
if (raw === undefined || raw === null) return undefined
const text = (Array.isArray(raw) ? raw.join(',') : String(raw)).trim()
return text || undefined
}
/** 有输入即透传:纯数字转 number,其余按字符串传递(避免被过滤成空) */
function toIdFilterValue(value: unknown): number | string | undefined {
if (value === undefined || value === null) return undefined
const text = String(value).trim()
if (!text) return undefined
const numeric = toPositiveId(text)
return numeric !== undefined ? numeric : text
}
function toNumber(value: unknown, fallback = 0): number {
const num = Number(value)
return Number.isFinite(num) ? num : fallback
}
/** 解析时间值(支持 毫秒/秒级时间戳、ISO/日期字符串),失败返回 null */
function parseDateValue(value: unknown): Date | null {
if (value === null || value === undefined || value === '') return null
const text = String(value)
const ts = Number(text)
if (Number.isFinite(ts) && ts > 0) {
const date = new Date(ts)
if (!Number.isNaN(date.getTime())) return date
}
const date = new Date(text)
if (!Number.isNaN(date.getTime())) return date
return null
}
/** 时间差秒数;起止缺失/解析失败/结束早于开始时返回 null */
function calcDurationSeconds(start: unknown, finish: unknown): number | null {
const startDate = parseDateValue(start)
const finishDate = parseDateValue(finish)
if (!startDate || !finishDate) return null
const ms = finishDate.getTime() - startDate.getTime()
if (!Number.isFinite(ms) || ms < 0) return null
return Math.floor(ms / 1000)
}
/** 秒数格式化为「时:分:秒」(HH:MM:SS 补零) */
function formatSecondsHMS(totalSeconds: number): string {
const pad = (n: number) => String(n).padStart(2, '0')
const h = Math.floor(totalSeconds / 3600)
const m = Math.floor((totalSeconds % 3600) / 60)
const s = totalSeconds % 60
return `${pad(h)}:${pad(m)}:${pad(s)}`
}
/** 时间差格式化为「时:分:秒」(HH:MM:SS 补零);起止缺失/解析失败/结束早于开始时返回 null */
function calcDurationHMS(start: unknown, finish: unknown): string | null {
const sec = calcDurationSeconds(start, finish)
return sec === null ? null : formatSecondsHMS(sec)
}
/** 平均时长(秒):剔除缺失与不超过 1 分钟(<=60s) 的记录;无有效记录返回 null */
function calcAverageDurationSeconds(values: Array<number | null | undefined>): number | null {
let sum = 0
let count = 0
for (const sec of values) {
if (sec === null || sec === undefined) continue
if (sec <= 60) continue
sum += sec
count += 1
}
if (!count) return null
return sum / count
}
function normalizePickTaskRow(row: WavePickTaskListItem) {
return {
...row,
raw: row,
task_id: toNumber(row.task_id),
warehouse_id: toNumber(row.warehouse_id),
pick_mode: toNumber(row.pick_mode),
status: toNumber(row.status),
review_status: toNumber(row.review_status),
source: toNumber(row.source),
wave_count: toNumber(row.wave_count),
order_count: toNumber(row.order_count),
box_count: toNumber(row.box_count),
/** 任务创建/操作人(与 pick_user_id 区分;wavePickTaskCancelSelf 按创建人校验) */
operator_id: row.operator_id ?? row.creator_id ?? row.created_by,
operator_name: row.operator_name || row.creator_name || '',
pick_user_id: row.pick_user_id,
pick_user_name: row.pick_user_name || '',
review_user_id: row.review_user_id,
review_user_name: row.review_user_name || '',
claim_operator_id: row.claim_operator_id,
claim_operator: row.claim_operator || '',
current_cart_id: row.current_cart_id,
current_cart_code_snapshot: row.current_cart_code_snapshot || '',
cart_name: row.cart_name || '',
device_id: row.device_id || '',
start_at: row.start_at || row.start_time || '',
finish_at: row.finish_at || row.finish_time || '',
review_start_time: row.review_start_time || '',
review_finish_time: row.review_finish_time || '',
created_at: row.created_at || row.create_time || '',
update_time: row.update_time || '',
/** 拣货用时 = 完成时间 - 开始时间(HH:MM:SS 补零);未完成/缺失时返回 null */
pick_duration: calcDurationHMS(row.start_at || row.start_time, row.finish_at || row.finish_time),
/** 拣货用时秒数(供平均统计) */
pick_duration_sec: calcDurationSeconds(row.start_at || row.start_time, row.finish_at || row.finish_time),
/** 复核用时 = 复核完成 - 复核开始(HH:MM:SS 补零);缺失/未复核完成时返回 null */
review_duration: calcDurationHMS(row.review_start_time, row.review_finish_time),
/** 复核用时秒数(供平均统计) */
review_duration_sec: calcDurationSeconds(row.review_start_time, row.review_finish_time)
}
}
function formatDateTime(value: unknown): string {
if (value === null || value === undefined || value === '') return '-'
const text = String(value)
const ts = Number(text)
if (Number.isFinite(ts) && ts > 0) {
const date = new Date(ts)
if (!Number.isNaN(date.getTime())) {
return date.toLocaleString('zh-CN', { hour12: false })
}
}
const date = new Date(text)
if (!Number.isNaN(date.getTime())) {
return date.toLocaleString('zh-CN', { hour12: false })
}
return text
}
function getTaskId(row: Record<string, any>): number | string | null {
const taskId = row.task_id
if (taskId === null || taskId === undefined || taskId === '') return null
return taskId
}
function getTaskRowKey(row: Record<string, any>) {
return getTaskId(row) ?? row.task_id ?? row.id ?? ''
}
function getValidTaskIds(rows: Array<Record<string, any>>): Array<number | string> {
return rows
.map((row) => getTaskId(row))
.filter((taskId): taskId is number | string => taskId !== null)
}
/** order.wave.wavePickTaskCancelSelf:仅允许取消本人创建的任务(按 operator_id / creator 与当前登录 employees_id 对齐) */
function isSelfCreatedTask(row: Record<string, any>): boolean {
const cur = currentEmployeeId.value
if (!cur) return false
const oid = row.operator_id ?? row.raw?.operator_id ?? row.creator_id ?? row.created_by
const creatorId = Number(oid)
return Number.isFinite(creatorId) && creatorId > 0 && creatorId === cur
}
function isPickTaskCancelled(row: Record<string, any>): boolean {
return Number(row.status) === 9
}
/** 已完成的拣货任务不再展示取消按钮 */
function isPickTaskPickFinished(row: Record<string, any>): boolean {
const s = Number(row.status)
// 2=拣货完成, 3=已完成
return s === 2 || s === 3
}
/** 当前选中的任务行(从 list 中取,使用列表已返回的数据) */
const selectedTaskRow = computed(() =>
selectedTaskId.value
? list.value.find((row) => getTaskId(row) === selectedTaskId.value) ?? null
: null
)
/** 当前选中任务的波次列表 */
const selectedTaskWaveList = computed(() => {
const row = selectedTaskRow.value
if (!row) return []
const waves = row.wave_list
return Array.isArray(waves) ? waves : []
})
// ============================================================
// 波次列表分页(波次随任务行一次性返回,所以用前端分页;
// 交互与 stock/external_stock「外部绑定」erpStock.vue 一致)
// ============================================================
const waveTableRef = ref<any>(null)
/** 波次列表列配置(UpperTable) */
const waveColumns = [
{ prop: 'wave_no', label: '波次号', minWidth: '180', showOverflowTooltip: true },
{ prop: 'wave_id', label: '波次ID', width: '100' },
{ prop: 'box_no', label: '箱号', width: '80' },
{ prop: 'status', label: '状态', width: '100' },
{ prop: 'bind_time', label: '绑定时间', minWidth: '168', showOverflowTooltip: true },
{ prop: 'pick_time', label: '拣货时间', minWidth: '168', showOverflowTooltip: true }
]
const wavePagination = reactive({
currentPage: 1,
pageSize: 20,
total: 0
})
/** 波次勾选行(UpperTable selection-change) */
const waveSelectedRows = ref<Record<string, any>[]>([])
function handleWaveSelectionChange(rows: Record<string, any>[]) {
waveSelectedRows.value = rows
}
/** 波次行唯一键:波次ID + 波次号 + 箱号(同一波次可能拆多箱) */
function resolveWaveRowKey(row: Record<string, any>) {
return `${row?.wave_id ?? ''}-${row?.wave_no ?? ''}-${row?.box_no ?? ''}`
}
/** 当前页波次 */
const pagedTaskWaveList = computed(() => {
const start = (wavePagination.currentPage - 1) * wavePagination.pageSize
return selectedTaskWaveList.value.slice(start, start + wavePagination.pageSize)
})
/** 切任务/刷新后波次数量会变:同步总数并回到第 1 页、清空勾选 */
watch(
selectedTaskWaveList,
(rows) => {
wavePagination.total = rows.length
wavePagination.currentPage = 1
waveSelectedRows.value = []
nextTick(() => waveTableRef.value?.clearSelection?.())
resetWaveTableScroll()
},
{ immediate: true }
)
function handleWavePageChange(page: number) {
wavePagination.currentPage = page
resetWaveTableScroll()
}
function handleWavePageSizeChange(pageSize: number) {
wavePagination.pageSize = pageSize
wavePagination.currentPage = 1
resetWaveTableScroll()
}
/** 切页后把表格滚动位置归零 */
function resetWaveTableScroll() {
nextTick(() => {
waveTableRef.value?.getTableRef?.()?.setScrollTop?.(0)
})
}
function handleRowClick(row: Record<string, any>) {
const id = getTaskId(row)
if (!id) return
selectedTaskId.value = id
}
/** 波次中的波次状态展示(wms_wave_pick_task_wave.status) */
function getWaveStatusText(status: unknown): string {
const s = Number(status)
if (s === 0) return '待拣'
if (s === 1) return '已拣'
if (s === 2) return '异常'
return String(status ?? '—')
}
function getWaveStatusTagType(status: unknown): string {
const s = Number(status)
if (s === 0) return 'info'
if (s === 1) return 'success'
if (s === 2) return 'danger'
return 'info'
}
function formatWaveTime(value: unknown): string {
if (value === null || value === undefined || value === '') return '—'
return formatDateTime(value)
}
async function copyWaveNo(text: string) {
if (!text) return
try {
await navigator.clipboard.writeText(text)
ElMessage.success(`已复制:${text}`)
} catch {
// fallback for older browsers / non-HTTPS
const textarea = document.createElement('textarea')
textarea.value = text
textarea.style.position = 'fixed'
textarea.style.opacity = '0'
document.body.appendChild(textarea)
textarea.select()
try {
document.execCommand('copy')
ElMessage.success(`已复制:${text}`)
} catch {
ElMessage.error('复制失败,请手动复制')
} finally {
document.body.removeChild(textarea)
}
}
}
async function handleCancelSelfTask(row: Record<string, any>) {
const taskId = getTaskId(row)
if (!taskId) {
ElMessage.warning('未获取到任务ID')
return
}
if (!isSelfCreatedTask(row)) {
ElMessage.warning('仅可取消本人创建的任务')
return
}
try {
await ElMessageBox.confirm(
`确认取消本人创建的任务「${row.task_no || taskId}」吗?将调用 order.wave.wavePickTaskCancelSelf(仅单个 task_id)。`,
'取消本人拣货任务',
{
type: 'warning',
buttonSize: 'small',
confirmButtonText: '确认取消',
cancelButtonText: '返回'
}
)
} catch {
return
}
cancelSelfTaskId.value = taskId
try {
const res = await orderWaveWavePickTaskCancelSelf({ task_id: Number(taskId) })
if (!res || !okCode(res.code)) {
throw new Error((res as any)?.message || '取消本人任务失败')
}
const cancelled = Number(res.cancelled_count ?? (res as any).data?.cancelled_count ?? 0)
ElMessage.success(cancelled > 0 ? `已取消任务(${cancelled})` : '操作已提交')
await loadData()
} catch (error: any) {
console.error('wavePickTaskCancelSelf failed:', error)
ElMessage.error(error?.message || '取消本人任务失败')
} finally {
cancelSelfTaskId.value = null
}
}
async function loadData() {
const wid = warehouseId.value
if (!Number.isFinite(wid) || wid <= 0) {
emptyText.value = pickTaskWaveListDefaults.noWarehouseEmptyText
list.value = []
pagination.total = 0
queryTime.value = 0
return
}
if (loading.value) return
const start = Date.now()
loading.value = true
emptyText.value = pickTaskWaveListDefaults.loadingEmptyText
try {
const rawConditions = scanBox.value?.getConditions?.() || {}
const flat = buildPickTaskScanFilters(rawConditions)
const pickUserId = toIdFilterValue(resolveScanFilterValue(flat, ['pick_user_id', 'picker_id'], rawConditions))
const reviewUserId = toIdFilterValue(resolveScanFilterValue(flat, ['review_user_id', 'recheck_user_id'], rawConditions))
const cartId = toIdFilterValue(resolveScanFilterValue(flat, ['cart_id', 'pick_car_id'], rawConditions))
/** 时间合并筛选:按所选查询模式输出对应的顶层时间范围参数 */
const timeRange = resolvePickTaskTimeRange(flat)
const timeMode = timeRange?.mode
const timeStart = timeRange?.range[0]
const timeEnd = timeRange?.range[1]
/** 顶层文本筛选(波次号/车编码/拣货人/领料人/复核人):文档只支持 like/notlike/eq,脏缓存回退 like */
const pickUserNameOp = resolvePickTaskTextOperator(rawConditions, 'pick_user_name')
const claimOperatorNameOp = resolvePickTaskTextOperator(rawConditions, 'claim_operator')
const reviewUserNameOp = resolvePickTaskTextOperator(rawConditions, 'review_user_name')
const waveNoOp = resolvePickTaskTextOperator(rawConditions, 'wave_no')
const cartCodeOp = resolvePickTaskTextOperator(rawConditions, 'cart_code')
/** 顶层文本筛选值:文档只接受字符串,统一归一化为字符串 */
const pickUserName = toScanTextValue(resolveScanFilterValue(flat, ['pick_user_name', 'picker_name'], rawConditions))
const claimOperatorName = toScanTextValue(resolveScanFilterValue(flat, ['claim_operator', 'claim_operator_name'], rawConditions))
const reviewUserName = toScanTextValue(resolveScanFilterValue(flat, ['review_user_name', 'recheck_user_name'], rawConditions))
/** 波次号:匹配任务主表 batch_no_array(默认 like) */
const waveNo = toScanTextValue(resolveScanFilterValue(flat, ['wave_no'], rawConditions))
/** 车编码 cart_code:匹配当前车编码快照 current_cart_code_snapshot(默认 like) */
const cartCode = toScanTextValue(resolveScanFilterValue(flat, ['cart_code'], rawConditions))
const sort: WaveListRpcSort | undefined = currentSort.prop
? {
sortField: currentSort.prop,
sortOrder: currentSort.order === 'ascending' ? 'ASC' : 'DESC'
}
: undefined
// 顶层筛选参数:与最新接口文档一致(同名顶层参数优先于历史 where)
const res = await orderWaveWavePickTaskList({
warehouse_id: wid,
page_no: pagination.currentPage,
page_size: pagination.pageSize,
status: flat.status,
review_status: flat.review_status,
pick_mode: flat.pick_mode,
source:
flat.source === undefined || flat.source === null || flat.source === '' ? undefined : String(flat.source),
pick_user_id: pickUserId ? Number(pickUserId) : undefined,
pick_user_name: pickUserName ? { operator: pickUserNameOp, value: pickUserName } : undefined,
review_user_id: reviewUserId ? Number(reviewUserId) : undefined,
review_user_name: reviewUserName ? { operator: reviewUserNameOp, value: reviewUserName } : undefined,
claim_operator: claimOperatorName ? { operator: claimOperatorNameOp, value: claimOperatorName } : undefined,
task_no: String(flat.task_no || '').trim() || undefined,
wave_no: waveNo ? { operator: waveNoOp, value: waveNo } : undefined,
cart_id: cartId ? Number(cartId) : undefined,
cart_code: cartCode ? { operator: cartCodeOp, value: cartCode } : undefined,
keyword: String(flat.keyword || '').trim() || undefined,
start_time_start: timeMode === 'start_time' ? timeStart : undefined,
start_time_end: timeMode === 'start_time' ? timeEnd : undefined,
finish_time_start: timeMode === 'finish_time' ? timeStart : undefined,
finish_time_end: timeMode === 'finish_time' ? timeEnd : undefined,
create_time_start: timeMode === 'create_time' ? timeStart : undefined,
create_time_end: timeMode === 'create_time' ? timeEnd : undefined,
sort
})
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '获取拣货任务列表失败')
}
const { list: responseList, total, page, page_size: responsePageSize } = unwrapWavePickTaskListResponse(res, {
page: pagination.currentPage,
page_size: pagination.pageSize
})
list.value = responseList.map((item) => normalizePickTaskRow(item))
selectedTaskRows.value = []
pagination.total = total
pagination.currentPage = page
pagination.pageSize = responsePageSize
emptyText.value = pickTaskWaveListDefaults.emptyText
} catch (error: any) {
console.error('load wave pick task list failed:', error)
ElMessage.error(error?.message || '获取拣货任务列表失败')
list.value = []
pagination.total = 0
emptyText.value = pickTaskWaveListDefaults.loadFailedEmptyText
} finally {
loading.value = false
queryTime.value = Date.now() - start
}
}
function handleSearch() {
pagination.currentPage = 1
void loadData()
}
function handleConditionChange() {
pagination.currentPage = 1
void loadData()
}
function handleSelectionChange(rows: Array<Record<string, any>>) {
selectedTaskRows.value = rows
}
function handleConditionClear() {
pagination.currentPage = 1
void loadData()
}
function handleConditionReset() {
pagination.currentPage = 1
scanBox.value?.reset?.()
void loadData()
}
/** 兼容接口可能返回 null / 非数组 的 ID 列表 */
function toIdList(value: unknown): Array<number | string> {
if (!Array.isArray(value)) return []
return value.filter((item) => item !== null && item !== undefined && item !== '')
}
/**
* pick.wavePickTaskComplete:完成拣货(mode=1 全部确认)。
* 目标订单中已进入拦截流程的订单会被后端跳过,其中未打印面单的自动移出波次、
* 已打印面单的保持不动(需人工处理),此处按响应字段汇总提示给用户。
*/
async function handleCompletePickTask(row: Record<string, any>) {
const taskId = getTaskId(row)
if (!taskId) {
ElMessage.warning('未获取到任务ID')
return
}
if (completingTaskId.value === taskId) return
const numericTaskId = Number(taskId)
if (!Number.isFinite(numericTaskId) || numericTaskId <= 0) {
ElMessage.warning('任务ID非法,无法完成拣货')
return
}
try {
await ElMessageBox.confirm(
`确认对任务 ${row.task_no || taskId} 执行「完成拣货」(全部确认)吗?提交后按是否全部完成自动推进任务状态。`,
'完成拣货',
{
type: 'warning',
buttonSize: 'small',
confirmButtonText: '确认完成',
cancelButtonText: '返回'
}
)
} catch {
return
}
completingTaskId.value = taskId
try {
const res = await pickWavePickTaskComplete({ task_id: numericTaskId, mode: 1 }) as
PickWavePickTaskCompleteResponse & { code?: number; message?: string; data?: Partial<PickWavePickTaskCompleteResponse> }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '完成拣货失败')
}
const data = (
res.data && typeof res.data === 'object' && !Array.isArray(res.data) ? res.data : res
) as PickWavePickTaskCompleteResponse
const confirmedCount = toIdList(data?.confirmed_order_ids).length
const skippedCount = toIdList(data?.skipped_intercepted_order_ids).length
const removedCount = toIdList(data?.removed_from_wave_order_ids).length
const keptCount = toIdList(data?.kept_intercepted_order_ids).length
ElMessage.success(
`完成拣货:本次确认 ${confirmedCount} 单${data?.is_completed ? ',任务已全部完成' : ',任务尚未全部完成'}`
)
if (skippedCount || removedCount || keptCount) {
const parts = [
skippedCount ? `跳过拦截订单 ${skippedCount} 单` : '',
removedCount ? `其中 ${removedCount} 单未打印面单已自动移出波次` : '',
keptCount ? `其中 ${keptCount} 单已打印面单保持不动,需人工移除波次` : ''
].filter(Boolean)
ElMessage.warning(parts.join(';'))
}
await loadData()
} catch (error: any) {
console.error('complete wave pick task failed:', error)
ElMessage.error(error?.message || '完成拣货失败')
} finally {
completingTaskId.value = null
}
}
async function handleCancelTask(row: Record<string, any>) {
const taskId = getTaskId(row)
if (!taskId) {
ElMessage.warning('未获取到任务ID')
return
}
try {
await ElMessageBox.confirm(
`确认取消任务 ${row.task_no || taskId} 吗?取消后会释放关联波次并回池订单。`,
'取消拣货任务',
{
type: 'warning',
buttonSize: 'small',
confirmButtonText: '确认取消',
cancelButtonText: '返回'
}
)
} catch {
return
}
cancelingTaskId.value = taskId
try {
await cancelTasks([taskId])
} catch (error: any) {
console.error('cancel wave pick task failed:', error)
ElMessage.error(error?.message || '取消拣货任务失败')
} finally {
cancelingTaskId.value = null
}
}
async function handleBatchCancelTasks() {
const validRows = selectedTaskRows.value.filter(
(row) => !isPickTaskCancelled(row) && !isPickTaskPickFinished(row)
)
const taskIds = getValidTaskIds(validRows)
if (taskIds.length === 0) {
ElMessage.warning('选中的任务均为已完成或已取消状态,无可取消的任务')
return
}
const skippedCount = selectedTaskRows.value.length - taskIds.length
let confirmMsg = `确认批量取消 ${taskIds.length} 个任务吗?取消后会释放关联波次并回池订单。`
if (skippedCount > 0) {
confirmMsg = `选中 ${selectedTaskRows.value.length} 个任务,其中 ${skippedCount} 个已完成/已取消已跳过。\n${confirmMsg}`
}
try {
await ElMessageBox.confirm(confirmMsg, '批量取消拣货任务', {
type: 'warning',
buttonSize: 'small',
confirmButtonText: '确认取消',
cancelButtonText: '返回'
})
} catch {
return
}
batchCancelLoading.value = true
try {
await cancelTasks(taskIds)
} catch (error: any) {
console.error('batch cancel wave pick task failed:', error)
ElMessage.error(error?.message || '批量取消拣货任务失败')
} finally {
batchCancelLoading.value = false
}
}
async function cancelTasks(taskIds: Array<number | string>) {
const res = await orderWaveWavePickTaskCancel({ task_ids: taskIds })
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '取消拣货任务失败')
}
const cancelledCount = Number(res.cancelled_count ?? res.data?.cancelled_count ?? 0)
ElMessage.success(cancelledCount > 0 ? `已取消 ${cancelledCount} 个任务` : '取消任务成功')
if (list.value.length === taskIds.length && pagination.currentPage > 1) {
pagination.currentPage -= 1
}
await loadData()
}
function handlePageChange(page: number) {
pagination.currentPage = page
void loadData()
}
function handleSortChange({ prop, order }: any) {
currentSort.prop = prop
currentSort.order = order
pagination.currentPage = 1
void loadData()
}
function handlePageSizeChange(size: number) {
pagination.pageSize = size
pagination.currentPage = 1
void loadData()
}
watch(
warehouseId,
(next, prev) => {
if (next === prev) return
pagination.currentPage = 1
void loadData()
}
)
onMounted(() => {
void loadData()
})
</script>
<style scoped lang="scss">
@use "@/styles/list-page.scss";
@use "@/styles/status-text.scss";
.empty-tip {
text-align: center;
font-size: 13px;
line-height: 1.5;
}
/* 与 UpperTable 主表白卡片一致(散单页 upper-table 同款阴影与圆角) */
.detail-header-title {
font-size: 13px;
font-weight: 600;
color: var(--el-text-color-primary);
line-height: 1;
}
.wave-no-empty {
color: var(--el-text-color-placeholder);
}
.click-copy-link {
color: var(--el-color-primary);
cursor: pointer;
word-break: break-all;
line-height: 1.4;
max-width: 100%;
&:hover {
color: var(--el-color-primary-dark-2);
}
&:focus-visible {
outline: 2px solid var(--el-color-primary-light-3);
outline-offset: 2px;
border-radius: 2px;
}
}
.upper-wrapper :deep(.upper-table-container) {
border-radius: 4px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
position: relative;
}
/* 与 SandanWaveBatchListPanel.vue 工具栏块一致 */
.order-sub-container .main-content {
.toolbar {
display: flex;
align-items: center;
justify-content: space-between;
.toolbar-left {
align-items: center;
}
.toolbar-right {
display: flex;
align-items: center;
gap: 6px;
flex-shrink: 0;
padding-left: 8px;
}
.toolbar-switch-label {
font-size: 12px;
color: var(--el-text-color-regular);
white-space: nowrap;
}
}
}
/* 波次列表面板(对齐 storage/receiving 商品明细/操作日志:table-host + UpperTable 多选/分页) */
.wave-list-panel {
width: 100%;
height: 100%;
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
padding: 6px 10px 8px;
box-sizing: border-box;
background: #fff;
overflow: hidden;
}
/* 详情区外壳:不留上/下间距(面板自带 padding: 6px 10px 8px),只保留左右 10px
—— 与 external_stock/index.vue 的 .detail-container 一致(否则表格比「外部绑定」多贴边 10px) */
.order-sub-container .main-content .lower-level .detail-container {
padding: 0 10px;
overflow: hidden;
}
.wave-list-panel .header-actions {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 6px;
flex-shrink: 0;
gap: 4px;
flex-wrap: wrap;
}
.wave-list-panel .left-actions {
display: flex;
align-items: center;
gap: 6px;
/* 清除 Element Plus 默认按钮左边距,统一由 gap 控制等间距 */
:deep(.el-button) {
margin-left: 0;
margin-right: 0;
}
}
.wave-list-panel .table-host {
flex: 1;
min-height: 120px;
min-width: 0;
overflow: hidden;
display: flex;
flex-direction: column;
}
.wave-list-panel .table-host :deep(.upper-table-container) {
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
}
.wave-list-panel .table-host :deep(.table-container) {
flex: 1;
min-height: 0;
height: auto !important;
}
.wave-list-panel .table-host :deep(.pagination-container) {
flex-shrink: 0;
padding: 0;
border-top: none;
margin-top: 6px;
justify-content: space-between;
}
.wave-list-panel .table-host :deep(.pagination-info) {
font-size: 12px;
color: #606266;
}
.upper-table-container.small :deep(.el-table) {
font-size: 12px;
}
.upper-table-container.small :deep(.el-table td),
.upper-table-container.small :deep(.el-table th) {
padding: 6px 0;
}
.pick-task-detail-query {
margin-bottom: 12px;
}
.pick-task-detail-alert {
margin-bottom: 12px;
}
.pick-task-detail-status {
margin-bottom: 12px;
}
.pick-task-detail-body {
min-height: 120px;
}
.pick-task-detail-value {
word-break: break-all;
}
.pick-task-detail-json {
margin: 0;
padding: 12px;
max-height: 420px;
overflow: auto;
font-size: 12px;
line-height: 1.45;
background: #f5f7fa;
border-radius: 4px;
}
</style>