diff --git a/src/views/erp/mold/detail/index.vue b/src/views/erp/mold/detail/index.vue index 5a85b323..01fd7ae2 100644 --- a/src/views/erp/mold/detail/index.vue +++ b/src/views/erp/mold/detail/index.vue @@ -400,7 +400,7 @@ const buildStepGroups = ( const groups = new Map() for (const row of rows ?? []) { - const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime) + const time = formatHistoryTime(row?.taskTime ?? row?.[options.timeField] ?? row?.createTime) const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-') const groupKey = `${row?.managementId ?? ''}__${time}__${operator}` diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue index 9bd27b22..2484a60f 100644 --- a/src/views/mes/deviceledger/index.vue +++ b/src/views/mes/deviceledger/index.vue @@ -265,7 +265,7 @@ v-else direction="vertical" class="device-ledger-history-steps"
保养时间 - {{ String(formatHistoryTime(item.taskTime)).split(' ')[0] }} + {{ String(formatHistoryTime(item.taskTime))}}
@@ -525,7 +525,7 @@ type HistoryStepItem = { criteria?: any images?: string[] remark?: any - inspectionTime?: any + taskTime?: any createTime?: any } type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] } @@ -534,7 +534,7 @@ const buildStepGroups = (rows: any[], options: { timeField: string; nameFieldCan const groups = new Map() for (const row of rows ?? []) { - const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime) + const time = formatHistoryTime(row?.taskTime ?? row?.[options.timeField] ?? row?.createTime) const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-') const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`