1
This commit is contained in:
parent
dfea0c3164
commit
3b7f21dc7d
@ -31,7 +31,7 @@
|
||||
</div>
|
||||
|
||||
<div class="split-stack" ref="splitStackRef">
|
||||
<div class="upper-wrapper" :style="upperPaneFullStyle">
|
||||
<div class="upper-wrapper" :style="detailVisible ? upperPaneStyle : upperPaneFullStyle">
|
||||
<div class="upper-table-container small">
|
||||
<div class="table-container">
|
||||
<el-table
|
||||
@ -40,6 +40,7 @@
|
||||
style="width: 100%"
|
||||
size="small"
|
||||
@selection-change="handleSelectionChange"
|
||||
@row-click="handleRowClick"
|
||||
border
|
||||
stripe
|
||||
height="100%"
|
||||
@ -47,7 +48,14 @@
|
||||
<el-table-column type="selection" width="52" align="center" fixed="left" />
|
||||
<el-table-column prop="task_id" label="任务ID" width="90" align="center" />
|
||||
<el-table-column prop="task_no" label="任务编号" min-width="220" show-overflow-tooltip />
|
||||
<el-table-column prop="batch_no" label="波次号" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column label="波次号" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<template v-if="Array.isArray(row.wave_list) && row.wave_list.length">
|
||||
{{ row.wave_list.map((w: any) => w.wave_no).join('、') }}
|
||||
</template>
|
||||
<span v-else class="wave-no-empty">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务状态" width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="getPickTaskStatusTagType(row.status)">
|
||||
@ -136,7 +144,6 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="220" fixed="right" align="center">
|
||||
<template #default="{ row }">
|
||||
<!-- <el-button type="primary" link :disabled="!getTaskId(row)" @click="openTaskDetail(row)">详情</el-button> -->
|
||||
<!-- <el-button
|
||||
v-if="isSelfCreatedTask(row)"
|
||||
type="warning"
|
||||
@ -183,110 +190,62 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-dialog
|
||||
v-model="taskDetailDialogVisible"
|
||||
:title="pickTaskWaveDetailDialogDefaults.title"
|
||||
:width="pickTaskWaveDetailDialogDefaults.width"
|
||||
destroy-on-close
|
||||
align-center
|
||||
class="pick-task-detail-dialog"
|
||||
@closed="resetTaskDetailState"
|
||||
>
|
||||
<div v-if="taskDetailDialogMode === 'query'" class="pick-task-detail-query">
|
||||
<el-form :model="taskDetailQueryForm" label-width="100px" @submit.prevent>
|
||||
<el-form-item label="任务ID" required>
|
||||
<el-input-number
|
||||
v-model="taskDetailQueryForm.task_id"
|
||||
:min="1"
|
||||
:step="1"
|
||||
controls-position="right"
|
||||
placeholder="必填,对应 wms_wave_pick_task 主键"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="taskDetailLoading" @click="submitTaskDetailQuery">查询详情</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
<div v-loading="taskDetailLoading" class="pick-task-detail-body">
|
||||
<el-alert
|
||||
v-if="taskDetailPermissionHint"
|
||||
:title="taskDetailPermissionHint"
|
||||
type="info"
|
||||
show-icon
|
||||
:closable="false"
|
||||
class="pick-task-detail-alert"
|
||||
/>
|
||||
<template v-if="taskDetailPayload && !taskDetailLoading">
|
||||
<div v-if="taskDetailIsCompleted !== null" class="pick-task-detail-status">
|
||||
<el-tag :type="taskDetailIsCompleted ? 'success' : 'warning'" size="small">
|
||||
{{ taskDetailIsCompleted ? '任务已完成' : '任务进行中' }}
|
||||
</el-tag>
|
||||
<template v-if="detailVisible">
|
||||
<div
|
||||
class="pane-resizer"
|
||||
title="拖动调整列表与详情区域高度"
|
||||
@mousedown="beginSplitDrag"
|
||||
/>
|
||||
<div v-if="selectedTaskId" class="lower-level" :style="lowerPaneStyle">
|
||||
<div class="detail-header">
|
||||
<span class="detail-header-title">
|
||||
波次列表({{ selectedTaskWaveList.length }})
|
||||
<template v-if="selectedTaskRow">
|
||||
— 任务 {{ selectedTaskRow.task_no }}
|
||||
</template>
|
||||
</span>
|
||||
</div>
|
||||
<div class="detail-container">
|
||||
<el-table
|
||||
v-if="selectedTaskWaveList.length"
|
||||
:data="selectedTaskWaveList"
|
||||
border
|
||||
size="small"
|
||||
height="100%"
|
||||
>
|
||||
<el-table-column prop="wave_no" label="波次号" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="wave_id" label="波次ID" width="100" align="center" />
|
||||
<el-table-column prop="box_no" label="箱号" width="80" align="center" />
|
||||
<el-table-column label="状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="getWaveStatusTagType(row.status)">
|
||||
{{ getWaveStatusText(row.status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="绑定时间" min-width="168" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
{{ formatWaveTime(row.bind_time) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="拣货时间" min-width="168" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
{{ formatWaveTime(row.pick_time) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-empty v-else description="该任务暂无关联波次" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="no-selection" :style="lowerPaneStyle">
|
||||
<div class="empty-tip">
|
||||
<p>请从上方列表中选择一项查看详情</p>
|
||||
</div>
|
||||
</div>
|
||||
<el-tabs v-model="taskDetailActiveTab" type="border-card">
|
||||
<el-tab-pane label="任务 task" name="task">
|
||||
<el-descriptions v-if="taskDetailTaskEntries.length" :column="2" border size="small">
|
||||
<el-descriptions-item
|
||||
v-for="(pair, idx) in taskDetailTaskEntries"
|
||||
:key="'t-' + idx"
|
||||
:label="String(pair[0])"
|
||||
>
|
||||
<span class="pick-task-detail-value">{{ formatDetailScalar(pair[1]) }}</span>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-empty v-else description="无 task 数据" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="箱列表 boxes" name="boxes">
|
||||
<el-table v-if="taskDetailBoxes.length" :data="taskDetailBoxes" border size="small" max-height="360">
|
||||
<el-table-column
|
||||
v-for="col in taskDetailBoxesColumns"
|
||||
:key="col"
|
||||
:prop="col"
|
||||
:label="col"
|
||||
min-width="120"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
</el-table>
|
||||
<el-empty v-else description="无箱数据" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="拣货明细 picking_details" name="details">
|
||||
<el-table v-if="taskDetailPickingDetails.length" :data="taskDetailPickingDetails" border size="small" max-height="360">
|
||||
<el-table-column
|
||||
v-for="col in taskDetailDetailColumns"
|
||||
:key="col"
|
||||
:prop="col"
|
||||
:label="col"
|
||||
min-width="120"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
</el-table>
|
||||
<el-empty v-else description="无明细数据" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="汇总 picking_summary" name="summary">
|
||||
<el-descriptions v-if="taskDetailSummaryEntries.length" :column="1" border size="small">
|
||||
<el-descriptions-item
|
||||
v-for="(pair, idx) in taskDetailSummaryEntries"
|
||||
:key="'s-' + idx"
|
||||
:label="String(pair[0])"
|
||||
>
|
||||
<span class="pick-task-detail-value">{{ formatDetailScalar(pair[1]) }}</span>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-empty v-else description="无汇总数据" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="视图 picking_view" name="view">
|
||||
<pre v-if="taskDetailViewJson" class="pick-task-detail-json">{{ taskDetailViewJson }}</pre>
|
||||
<el-empty v-else description="无 picking_view 数据" />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</template>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -298,6 +257,7 @@ import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/Ord
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { safeInvoke } from '@/utils/safe-invoke'
|
||||
import { useUserStore } from '@/stores/modules/user'
|
||||
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
|
||||
import {
|
||||
orderWaveWavePickTaskCancel,
|
||||
orderWaveWavePickTaskCancelSelf,
|
||||
@ -305,14 +265,12 @@ import {
|
||||
unwrapWavePickTaskListResponse,
|
||||
type WavePickTaskListItem
|
||||
} from '@/api/order.wave/orderwave'
|
||||
import { pickWavePickTaskDetail } from '@/api/pick/pick'
|
||||
import {
|
||||
waveScanBoxConfig,
|
||||
pickTaskWaveAvailableFields,
|
||||
pickTaskWaveListDefaults,
|
||||
pickTaskWavePaginationDefaults,
|
||||
pickTaskWavePaginationPageSizes,
|
||||
pickTaskWaveDetailDialogDefaults,
|
||||
pickTaskWaveToolbarButtons,
|
||||
formatPickTaskStatus,
|
||||
formatPickTaskReviewStatus,
|
||||
@ -339,12 +297,24 @@ const list = ref<Array<Record<string, any>>>([])
|
||||
const emptyText = ref(pickTaskWaveListDefaults.emptyText)
|
||||
const scanBox = ref<any>(null)
|
||||
const presetTree = ref<unknown[]>([])
|
||||
const splitStackRef = ref<HTMLElement | null>(null)
|
||||
const queryTime = ref(0)
|
||||
const cancelingTaskId = ref<number | string | null>(null)
|
||||
const batchCancelLoading = ref(false)
|
||||
const selectedTaskRows = ref<Array<Record<string, any>>>([])
|
||||
|
||||
const detailVisible = ref(true)
|
||||
const selectedTaskId = ref<number | string | null>(null)
|
||||
|
||||
const { splitStackRef, beginSplitDrag, lowerPaneStyle, upperPaneStyle } = useVerticalSplitPane({
|
||||
defaultLowerPercent: 38
|
||||
})
|
||||
|
||||
const upperPaneFullStyle = computed(() => ({
|
||||
flex: '1 1 auto',
|
||||
minHeight: '0',
|
||||
overflow: 'hidden' as const
|
||||
}))
|
||||
|
||||
const pagination = reactive({
|
||||
currentPage: 1,
|
||||
pageSize: pickTaskWavePaginationDefaults.initialPageSize,
|
||||
@ -353,84 +323,11 @@ const pagination = reactive({
|
||||
|
||||
const warehouseId = computed(() => Number(userStore.user?.warehouse_id ?? userStore.user?.store_id ?? 0))
|
||||
|
||||
const upperPaneFullStyle = computed(() => ({
|
||||
flex: '1 1 auto',
|
||||
minHeight: '0',
|
||||
overflow: 'hidden' as const
|
||||
}))
|
||||
|
||||
/** 与接口文档中 operator_id / pick_user_id(employees)对齐 */
|
||||
const currentEmployeeId = computed(() => Number(userStore.user?.employees_id ?? userStore.roleId ?? 0))
|
||||
|
||||
const taskDetailDialogVisible = ref(false)
|
||||
const taskDetailDialogMode = ref<'query' | 'row'>('query')
|
||||
const taskDetailLoading = ref(false)
|
||||
const taskDetailPayload = ref<Record<string, any> | null>(null)
|
||||
const taskDetailPermissionHint = ref('')
|
||||
const taskDetailActiveTab = ref('task')
|
||||
const taskDetailQueryForm = reactive<{ task_id: number | undefined }>({ task_id: undefined })
|
||||
|
||||
const taskDetailIsCompleted = computed<boolean | null>(() => {
|
||||
const payload = taskDetailPayload.value
|
||||
if (!payload) return null
|
||||
if (typeof payload.is_completed === 'boolean') return payload.is_completed
|
||||
const task = payload.task
|
||||
if (task && typeof task === 'object' && typeof (task as Record<string, unknown>).is_completed === 'boolean') {
|
||||
return (task as Record<string, unknown>).is_completed as boolean
|
||||
}
|
||||
return null
|
||||
})
|
||||
|
||||
const cancelSelfTaskId = ref<number | string | null>(null)
|
||||
|
||||
const taskDetailTaskEntries = computed(() => {
|
||||
const t = taskDetailPayload.value?.task
|
||||
if (!t || typeof t !== 'object') return [] as Array<[string, unknown]>
|
||||
return Object.entries(t as Record<string, unknown>)
|
||||
})
|
||||
|
||||
const taskDetailBoxes = computed(() => {
|
||||
const b = taskDetailPayload.value?.boxes
|
||||
return Array.isArray(b) ? b : []
|
||||
})
|
||||
|
||||
function collectObjectKeys(rows: Array<Record<string, unknown>>): string[] {
|
||||
const keys = new Set<string>()
|
||||
for (const r of rows) {
|
||||
if (r && typeof r === 'object') Object.keys(r).forEach((k) => keys.add(k))
|
||||
}
|
||||
return [...keys].sort((a, b) => a.localeCompare(b, 'zh-CN'))
|
||||
}
|
||||
|
||||
const taskDetailBoxesColumns = computed(() =>
|
||||
collectObjectKeys(taskDetailBoxes.value as Array<Record<string, unknown>>)
|
||||
)
|
||||
|
||||
const taskDetailPickingDetails = computed(() => {
|
||||
const d = taskDetailPayload.value?.picking_details
|
||||
return Array.isArray(d) ? d : []
|
||||
})
|
||||
|
||||
const taskDetailDetailColumns = computed(() =>
|
||||
collectObjectKeys(taskDetailPickingDetails.value as Array<Record<string, unknown>>)
|
||||
)
|
||||
|
||||
const taskDetailSummaryEntries = computed(() => {
|
||||
const s = taskDetailPayload.value?.picking_summary
|
||||
if (!s || typeof s !== 'object') return [] as Array<[string, unknown]>
|
||||
return Object.entries(s as Record<string, unknown>)
|
||||
})
|
||||
|
||||
const taskDetailViewJson = computed(() => {
|
||||
const v = taskDetailPayload.value?.picking_view
|
||||
if (v === undefined || v === null) return ''
|
||||
try {
|
||||
return JSON.stringify(v, null, 2)
|
||||
} catch {
|
||||
return String(v)
|
||||
}
|
||||
})
|
||||
|
||||
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
|
||||
|
||||
const buttonLoadingMap = computed(() => ({
|
||||
@ -438,7 +335,10 @@ const buttonLoadingMap = computed(() => ({
|
||||
}))
|
||||
|
||||
const buttonDisabledMap = computed(() => ({
|
||||
noSelection: selectedTaskRows.value.length === 0
|
||||
noSelection: selectedTaskRows.value.length === 0,
|
||||
batchCancelDisabled:
|
||||
selectedTaskRows.value.length === 0 ||
|
||||
selectedTaskRows.value.some((row) => isPickTaskCancelled(row) || isPickTaskPickFinished(row))
|
||||
}))
|
||||
|
||||
const buttonLabelMap = computed(() => ({
|
||||
@ -473,7 +373,6 @@ const toolbarActionMap: Record<string, () => void> = {
|
||||
void loadData()
|
||||
},
|
||||
handleSearch: () => handleSearch(),
|
||||
openDetailQueryDialog: () => openDetailQueryDialog(),
|
||||
handleBatchCancelTasks: () => {
|
||||
void handleBatchCancelTasks()
|
||||
}
|
||||
@ -648,18 +547,6 @@ function getValidTaskIds(rows: Array<Record<string, any>>): Array<number | strin
|
||||
.filter((taskId): taskId is number | string => taskId !== null)
|
||||
}
|
||||
|
||||
function formatDetailScalar(v: unknown): string {
|
||||
if (v === null || v === undefined) return '—'
|
||||
if (typeof v === 'object') {
|
||||
try {
|
||||
return JSON.stringify(v)
|
||||
} catch {
|
||||
return String(v)
|
||||
}
|
||||
}
|
||||
return String(v)
|
||||
}
|
||||
|
||||
/** order.wave.wavePickTaskCancelSelf:仅允许取消本人创建的任务(按 operator_id / creator 与当前登录 employees_id 对齐) */
|
||||
function isSelfCreatedTask(row: Record<string, any>): boolean {
|
||||
const cur = currentEmployeeId.value
|
||||
@ -673,73 +560,54 @@ function isPickTaskCancelled(row: Record<string, any>): boolean {
|
||||
return Number(row.status) === 9
|
||||
}
|
||||
|
||||
/** 后端 status=2 表示拣货完成(待复核),不再展示取消任务 */
|
||||
/** 已完成的拣货任务不再展示取消按钮 */
|
||||
function isPickTaskPickFinished(row: Record<string, any>): boolean {
|
||||
return Number(row.status) === 2
|
||||
const s = Number(row.status)
|
||||
// 2=拣货完成, 3=已完成
|
||||
return s === 2 || s === 3
|
||||
}
|
||||
|
||||
function resetTaskDetailState() {
|
||||
taskDetailPayload.value = null
|
||||
taskDetailLoading.value = false
|
||||
taskDetailActiveTab.value = 'task'
|
||||
taskDetailPermissionHint.value = ''
|
||||
taskDetailQueryForm.task_id = undefined
|
||||
}
|
||||
/** 当前选中的任务行(从 list 中取,使用列表已返回的数据) */
|
||||
const selectedTaskRow = computed(() =>
|
||||
selectedTaskId.value
|
||||
? list.value.find((row) => getTaskId(row) === selectedTaskId.value) ?? null
|
||||
: null
|
||||
)
|
||||
|
||||
function openDetailQueryDialog() {
|
||||
taskDetailDialogMode.value = 'query'
|
||||
taskDetailPayload.value = null
|
||||
taskDetailQueryForm.task_id = undefined
|
||||
taskDetailPermissionHint.value =
|
||||
'pick.wavePickTaskDetail:仅当拣货任务的 pick_user_id 与当前登录用户一致时可查看详情(否则接口 403)。'
|
||||
taskDetailDialogVisible.value = true
|
||||
}
|
||||
/** 当前选中任务的波次列表 */
|
||||
const selectedTaskWaveList = computed(() => {
|
||||
const row = selectedTaskRow.value
|
||||
if (!row) return []
|
||||
const waves = row.wave_list
|
||||
return Array.isArray(waves) ? waves : []
|
||||
})
|
||||
|
||||
function openTaskDetail(row: Record<string, any>) {
|
||||
function handleRowClick(row: Record<string, any>) {
|
||||
const id = getTaskId(row)
|
||||
if (!id) {
|
||||
ElMessage.warning('未获取到任务ID')
|
||||
return
|
||||
}
|
||||
taskDetailDialogMode.value = 'row'
|
||||
taskDetailQueryForm.task_id = Number(id)
|
||||
taskDetailPayload.value = null
|
||||
taskDetailPermissionHint.value =
|
||||
'pick.wavePickTaskDetail:仅拣货员本人可查看完整详情(pick_user_id 需与当前账号一致)。'
|
||||
taskDetailDialogVisible.value = true
|
||||
void fetchTaskDetailById(Number(id))
|
||||
if (!id) return
|
||||
selectedTaskId.value = id
|
||||
}
|
||||
|
||||
function submitTaskDetailQuery() {
|
||||
const tid = taskDetailQueryForm.task_id
|
||||
if (tid === undefined || tid === null || !Number.isFinite(Number(tid)) || Number(tid) <= 0) {
|
||||
ElMessage.warning('请输入有效的任务ID(正整数)')
|
||||
return
|
||||
}
|
||||
void fetchTaskDetailById(Number(tid))
|
||||
/** 波次中的波次状态展示(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 ?? '—')
|
||||
}
|
||||
|
||||
async function fetchTaskDetailById(taskId: number) {
|
||||
taskDetailLoading.value = true
|
||||
taskDetailPayload.value = null
|
||||
try {
|
||||
const res = await pickWavePickTaskDetail({ task_id: taskId })
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error((res as any)?.message || '获取拣货任务详情失败')
|
||||
}
|
||||
const inner =
|
||||
res && typeof (res as any).data === 'object' && (res as any).data !== null && !Array.isArray((res as any).data)
|
||||
? (res as any).data
|
||||
: res
|
||||
taskDetailPayload.value = inner as Record<string, any>
|
||||
taskDetailActiveTab.value = 'task'
|
||||
} catch (error: any) {
|
||||
console.error('pickWavePickTaskDetail failed:', error)
|
||||
ElMessage.error(error?.message || '获取拣货任务详情失败')
|
||||
taskDetailPayload.value = null
|
||||
} finally {
|
||||
taskDetailLoading.value = false
|
||||
}
|
||||
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 handleCancelSelfTask(row: Record<string, any>) {
|
||||
@ -915,22 +783,27 @@ async function handleCancelTask(row: Record<string, any>) {
|
||||
}
|
||||
|
||||
async function handleBatchCancelTasks() {
|
||||
const taskIds = getValidTaskIds(selectedTaskRows.value)
|
||||
const validRows = selectedTaskRows.value.filter(
|
||||
(row) => !isPickTaskCancelled(row) && !isPickTaskPickFinished(row)
|
||||
)
|
||||
const taskIds = getValidTaskIds(validRows)
|
||||
if (taskIds.length === 0) {
|
||||
ElMessage.warning('请先选择要取消的任务')
|
||||
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(
|
||||
`确认批量取消 ${taskIds.length} 个任务吗?取消后会释放关联波次并回池订单。`,
|
||||
'批量取消拣货任务',
|
||||
{
|
||||
type: 'warning',
|
||||
confirmButtonText: '确认取消',
|
||||
cancelButtonText: '返回'
|
||||
}
|
||||
)
|
||||
await ElMessageBox.confirm(confirmMsg, '批量取消拣货任务', {
|
||||
type: 'warning',
|
||||
confirmButtonText: '确认取消',
|
||||
cancelButtonText: '返回'
|
||||
})
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
@ -996,6 +869,17 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
/* 与 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);
|
||||
}
|
||||
|
||||
.upper-wrapper :deep(.upper-table-container) {
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@ -749,7 +749,6 @@ export const pickTaskWaveDetailDialogDefaults = {
|
||||
export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [
|
||||
{ key: 'refresh', label: '刷新', size: 'small', action: 'loadData' },
|
||||
{ key: 'search', label: '查询', type: 'primary', size: 'small', action: 'handleSearch' },
|
||||
{ key: 'detailQuery', label: '按任务ID查详情', size: 'small', action: 'openDetailQueryDialog' },
|
||||
{
|
||||
key: 'batchCancel',
|
||||
label: '批量取消任务',
|
||||
@ -757,7 +756,7 @@ export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [
|
||||
type: 'danger',
|
||||
size: 'small',
|
||||
loadingKey: 'batchCancelLoading',
|
||||
disabledKey: 'noSelection',
|
||||
disabledKey: 'batchCancelDisabled',
|
||||
action: 'handleBatchCancelTasks'
|
||||
}
|
||||
]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user