From 3df2ae0404bfa81e115a60b4d294f4707d5bf0fd Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 8 Sep 2026 02:18:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B3=A2=E6=AC=A1=E6=8B=A3=E8=B4=A7):=20?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=8C=E6=8B=A3=E8=B4=A7=E7=94=A8=E6=97=B6=E3=80=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?= =?UTF-8?q?-=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=88=86=E9=92=9F=EF=BC=8C=E4=BF=9D=E7=95=992?= =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/waveOrder/WavePickTaskListPanel.vue | 33 ++++++++++++++++++- .../order/waveOrder/config/wave-config.ts | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index 97a280cf..8829f304 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -138,6 +138,10 @@ {{ formatDateTime(row.finish_at || row.finish_time) }} + + @@ -528,6 +532,31 @@ function toNumber(value: unknown, fallback = 0): number { 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 +} + +/** 拣货用时 = 完成时间 - 开始时间(分钟,保留 2 位小数);起止缺失或解析失败返回 null */ +function calcPickDurationMinutes(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)) return null + const minutes = ms / (60 * 1000) + return Number(minutes.toFixed(2)) +} + function normalizePickTaskRow(row: WavePickTaskListItem) { return { ...row, @@ -559,7 +588,9 @@ function normalizePickTaskRow(row: WavePickTaskListItem) { 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 || '' + update_time: row.update_time || '', + /** 拣货用时 = 完成时间 - 开始时间(分钟,保留 2 位小数);未完成/缺失时返回 null */ + pick_duration: calcPickDurationMinutes(row.start_at || row.start_time, row.finish_at || row.finish_time) } } diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 57bff751..4032673f 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -1120,6 +1120,7 @@ export const pickTaskWaveColumns = applyWaveListCopyActions([ { prop: 'device_id', label: '设备ID', minWidth: 140 }, { prop: 'start_at', label: '开始时间', minWidth: 168 }, { prop: 'finish_at', label: '完成时间', minWidth: 168 }, + { prop: 'pick_duration', label: '拣货用时(分)', width: 110, align: 'center' }, { prop: 'review_start_time', label: '复核开始', minWidth: 168 }, { prop: 'review_finish_time', label: '复核完成', minWidth: 168 }, { prop: 'created_at', label: '创建时间', minWidth: 168 },