diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts
index aef0ac75..53559a29 100644
--- a/src/api/mes/deviceledger/index.ts
+++ b/src/api/mes/deviceledger/index.ts
@@ -23,6 +23,8 @@ export interface DeviceLedgerVO {
   remark: string // 备注
   fileUrl?: string // 附件下载
   componentId?: string // 关键件，ids集合
+  inspectionList?: any[]
+  maintainList?: any[]
   creator?: string // 创建人
   createTime?: string | number | Date
   updateTime?: string | number | Date
diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue
index 8968bfa5..e23d3059 100644
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@@ -1,71 +1,41 @@
 <template>
   <div class="device-ledger-layout">
     <ContentWrap class="device-ledger-left">
-      <el-tree
-        v-loading="typeTreeLoading"
-        :data="typeTreeData"
-        node-key="id"
-        highlight-current
-        :props="typeTreeProps"
-        :default-expanded-keys="typeTreeExpandedKeys"
-        :expand-on-click-node="false"
-        @node-click="handleTypeNodeClick"
-      />
+      <el-tree v-loading="typeTreeLoading" :data="typeTreeData" node-key="id" highlight-current :props="typeTreeProps"
+        :default-expanded-keys="typeTreeExpandedKeys" :expand-on-click-node="false" @node-click="handleTypeNodeClick" />
     </ContentWrap>
 
     <div class="device-ledger-right">
       <ContentWrap>
-        <el-form
-          class="-mb-15px"
-          :model="queryParams"
-          ref="queryFormRef"
-          :inline="true"
-          label-width="60px"
-        >
+        <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="60px">
           <el-form-item label="编码" prop="deviceCode">
-            <el-input
-              v-model="queryParams.deviceCode"
-              placeholder="请输入编码"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-240px"
-            />
+            <el-input v-model="queryParams.deviceCode" placeholder="请输入编码" clearable @keyup.enter="handleQuery"
+              class="!w-240px" />
           </el-form-item>
           <el-form-item label="名称" prop="deviceName">
-            <el-input
-              v-model="queryParams.deviceName"
-              placeholder="请输入名称"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-240px"
-            />
+            <el-input v-model="queryParams.deviceName" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
+              class="!w-240px" />
           </el-form-item>
           <el-form-item label="状态" prop="deviceStatus">
             <el-select v-model="queryParams.deviceStatus" placeholder="请选择状态" clearable class="!w-240px">
-              <el-option
-                v-for="dict in tzStatusOptions"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+              <el-option v-for="dict in tzStatusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-            <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+            <el-button @click="handleQuery">
+              <Icon icon="ep:search" class="mr-5px" /> 搜索
+            </el-button>
+            <el-button @click="resetQuery">
+              <Icon icon="ep:refresh" class="mr-5px" /> 重置
+            </el-button>
             <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['mes:device-ledger:create']">
               <Icon icon="ep:plus" class="mr-5px" /> 新增
             </el-button>
             <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['mes:device-ledger:delete']">
               <Icon icon="ep:delete" class="mr-5px" /> 批量删除
             </el-button>
-            <el-button
-              type="success"
-              plain
-              @click="handleExport"
-              :loading="exportLoading"
-              v-hasPermi="['mes:device-ledger:export']"
-            >
+            <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+              v-hasPermi="['mes:device-ledger:export']">
               <Icon icon="ep:download" class="mr-5px" /> 导出
             </el-button>
           </el-form-item>
@@ -73,15 +43,8 @@
       </ContentWrap>
 
       <ContentWrap>
-        <el-table
-          ref="tableRef"
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :show-overflow-tooltip="true"
-          row-key="id"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+          row-key="id" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" fixed="left" reserve-selection />
           <el-table-column label="序号" align="center" width="80" fixed="left">
             <template #default="scope">
@@ -99,13 +62,9 @@
           </el-table-column>
           <el-table-column label="状态" align="center" prop="deviceStatus">
             <template #default="scope">
-              <el-tag
-                :type="getTzStatusTagType(scope.row.deviceStatus)"
+              <el-tag :type="getTzStatusTagType(scope.row.deviceStatus)"
                 :color="getTzStatusTagColor(scope.row.deviceStatus)"
-                :style="getTzStatusTagStyle(scope.row.deviceStatus)"
-                effect="light"
-                disable-transitions
-              >
+                :style="getTzStatusTagStyle(scope.row.deviceStatus)" effect="light" disable-transitions>
                 {{ getTzStatusLabel(scope.row.deviceStatus) }}
               </el-tag>
             </template>
@@ -113,40 +72,35 @@
           <el-table-column label="规格" align="center" prop="deviceSpec" />
           <el-table-column label="型号" align="center" prop="deviceModel" />
           <el-table-column label="品牌" align="center" prop="deviceBrand" />
-          <el-table-column label="生产日期" align="center" prop="productionDate" :formatter="dateFormatter2" width="140px" />
-          <el-table-column label="入厂日期" align="center" prop="factoryEntryDate" :formatter="dateFormatter2" width="140px" />
-          <el-table-column label="供应商" align="center" prop="supplier" width="110px"/>
-          <el-table-column label="所属车间" align="center" prop="workshop" width="110px"/>
+          <el-table-column label="生产日期" align="center" prop="productionDate" :formatter="dateFormatter2"
+            width="140px" />
+          <el-table-column label="入厂日期" align="center" prop="factoryEntryDate" :formatter="dateFormatter2"
+            width="140px" />
+          <el-table-column label="供应商" align="center" prop="supplier" width="110px" />
+          <el-table-column label="所属车间" align="center" prop="workshop" width="110px" />
           <el-table-column label="位置" align="center" prop="deviceLocation" />
-          <el-table-column label="使用部门" align="center" prop="systemOrg" width="110px"/>
-          <el-table-column label="责任人" align="center" prop="deviceManagerName" width="110px"/>
+          <el-table-column label="使用部门" align="center" prop="systemOrg" width="110px" />
+          <el-table-column label="责任人" align="center" prop="deviceManagerName" width="110px" />
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="创建人" align="center" prop="creatorName" width="120px"/>
+          <el-table-column label="创建人" align="center" prop="creatorName" width="120px" />
           <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
           <el-table-column label="更新时间" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
           <el-table-column label="操作" align="center" min-width="160px" fixed="right">
             <template #default="scope">
               <el-button link @click="handleDetail(scope.row.id)">详情</el-button>
-              <el-button
-                link
-                type="primary"
-                @click="openForm('update', scope.row.id)"
-                v-hasPermi="['mes:device-ledger:update']"
-              >
+              <el-button link type="primary" @click="openForm('update', scope.row.id)"
+                v-hasPermi="['mes:device-ledger:update']">
                 编辑
               </el-button>
-              <el-button
-                link
-                type="danger"
-                @click="handleDelete(scope.row.id)"
-                v-hasPermi="['mes:device-ledger:delete']"
-              >
+              <el-button link type="danger" @click="handleDelete(scope.row.id)"
+                v-hasPermi="['mes:device-ledger:delete']">
                 删除
               </el-button>
             </template>
           </el-table-column>
         </el-table>
-        <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+          @pagination="getList" />
       </ContentWrap>
 
       <ContentWrap v-if="detailVisible" v-loading="detailLoading">
@@ -166,7 +120,8 @@
           <el-descriptions-item label="设备型号">{{ detailData?.deviceModel ?? '' }}</el-descriptions-item>
           <el-descriptions-item label="设备规格">{{ detailData?.deviceSpec ?? '' }}</el-descriptions-item>
           <el-descriptions-item label="设备类型">
-            <el-tag effect="light">{{ getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) }}</el-tag>
+            <el-tag effect="light">{{ getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType)
+            }}</el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="供应商">{{ detailData?.supplier ?? '' }}</el-descriptions-item>
           <el-descriptions-item label="所属车间">{{ detailData?.workshop ?? '' }}</el-descriptions-item>
@@ -174,16 +129,54 @@
           <el-descriptions-item label="设备位置">{{ detailData?.deviceLocation ?? '' }}</el-descriptions-item>
           <el-descriptions-item label="设备负责人">{{ detailData?.deviceManager ?? '' }}</el-descriptions-item>
           <el-descriptions-item label="设备生产日期">{{ formatDetailDate(detailData?.productionDate) }}</el-descriptions-item>
-          <el-descriptions-item label="设备入厂日期">{{ formatDetailDate(detailData?.factoryEntryDate) }}</el-descriptions-item>
-          <el-descriptions-item label="备注">{{ detailData?.remark ?? detailData?.deviceRemark ?? '' }}</el-descriptions-item>
+          <el-descriptions-item label="设备入厂日期">{{ formatDetailDate(detailData?.factoryEntryDate)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="备注">{{ detailData?.remark ?? detailData?.deviceRemark ?? ''
+          }}</el-descriptions-item>
         </el-descriptions>
 
         <el-tabs v-model="detailActiveTab" class="mt-12px">
           <el-tab-pane label="点检履历" name="check">
-            <el-empty />
+            <el-empty v-if="!inspectionStepGroups.length" />
+            <el-steps v-else direction="vertical" :active="inspectionStepGroups.length" class="device-ledger-history-steps">
+              <el-step v-for="group in inspectionStepGroups" :key="group.key">
+                <template #title>
+                  <div class="device-ledger-history-title">
+                    <span class="device-ledger-history-time">[{{ group.time }}]</span>
+                    <span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
+                  </div>
+                </template>
+                <template #description>
+                  <div class="device-ledger-history-items">
+                    <div v-for="item in group.items" :key="item.key" class="device-ledger-history-item">
+                      <el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
+                      <span class="device-ledger-history-item-text">{{ item.name }}</span>
+                    </div>
+                  </div>
+                </template>
+              </el-step>
+            </el-steps>
           </el-tab-pane>
           <el-tab-pane label="保养履历" name="maintain">
-            <el-empty />
+            <el-empty v-if="!maintainStepGroups.length" />
+            <el-steps v-else direction="vertical" class="device-ledger-history-steps" :active="maintainStepGroups.length">
+              <el-step v-for="group in maintainStepGroups" :key="group.key">
+                <template #title>
+                  <div class="device-ledger-history-title">
+                    <span class="device-ledger-history-time">[{{ group.time }}]</span>
+                    <span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
+                  </div>
+                </template>
+                <template #description>
+                  <div class="device-ledger-history-items">
+                    <div v-for="item in group.items" :key="item.key" class="device-ledger-history-item">
+                      <el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
+                      <span class="device-ledger-history-item-text">{{ item.name }}</span>
+                    </div>
+                  </div>
+                </template>
+              </el-step>
+            </el-steps>
           </el-tab-pane>
           <el-tab-pane label="维修履历" name="repair">
             <el-empty />
@@ -236,6 +229,90 @@ const handleSelectionChange = (rows: any[]) => {
 const dictStore = useDictStoreWithOut()
 const dictReady = ref(false)
 
+const inspectionHistory = computed(() => {
+  return (detailData.value as any)?.inspectionList ?? []
+})
+
+const maintainHistory = computed(() => {
+  const list = (detailData.value as any)?.maintainList
+  return Array.isArray(list) ? list : []
+})
+
+const formatHistoryTime = (value: any) => {
+  const raw = value ?? '-'
+  if (Array.isArray(raw) && raw.length >= 3) {
+    const [y, m, d, hh, mm, ss] = raw
+    const pad = (n: any) => String(n).padStart(2, '0')
+    if (hh !== undefined) return `${y}-${pad(m)}-${pad(d)} ${pad(hh)}:${pad(mm)}:${pad(ss)}`
+    return `${y}-${pad(m)}-${pad(d)}`
+  }
+  return String(raw)
+}
+
+const getResultLabel = (value: any) => {
+  const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (v === '0') return '待检测'
+  if (v === '1') return 'OK'
+  if (v === '2') return 'NG'
+  return '-'
+}
+
+const getResultTagType = (value: any) => {
+  const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (v === '1') return 'success'
+  if (v === '2') return 'danger'
+  if (v === '0') return 'info'
+  return 'info'
+}
+
+type HistoryStepItem = { key: string; name: string; result: any }
+type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] }
+
+const buildStepGroups = (rows: any[], options: { timeField: string; nameFieldCandidates: string[]; resultFieldCandidates: string[] }) => {
+  const groups = new Map<string, HistoryStepGroup>()
+
+  for (const row of rows ?? []) {
+    const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime)
+    const operator = String(row?.creatorName ?? row?.creator ?? '-')
+    const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
+
+    const name =
+      options.nameFieldCandidates.map((k) => row?.[k]).find((v) => v !== undefined && v !== null && String(v).trim() !== '') ??
+      '-'
+    const result = options.resultFieldCandidates.map((k) => row?.[k]).find((v) => v !== undefined && v !== null) ?? undefined
+
+    const item: HistoryStepItem = {
+      key: String(row?.id ?? `${groupKey}__${String(name)}`),
+      name: String(name),
+      result
+    }
+
+    if (!groups.has(groupKey)) {
+      groups.set(groupKey, { key: groupKey, time, operator, items: [item] })
+    } else {
+      groups.get(groupKey)!.items.push(item)
+    }
+  }
+
+  return Array.from(groups.values()).sort((a, b) => String(b.time).localeCompare(String(a.time)))
+}
+
+const inspectionStepGroups = computed<HistoryStepGroup[]>(() => {
+  return buildStepGroups(inspectionHistory.value, {
+    timeField: 'inspectionTime',
+    nameFieldCandidates: ['inspectionItemName', 'name'],
+    resultFieldCandidates: ['inspectionResult']
+  })
+})
+
+const maintainStepGroups = computed<HistoryStepGroup[]>(() => {
+  return buildStepGroups(maintainHistory.value, {
+    timeField: 'maintainTime',
+    nameFieldCandidates: ['maintainItemName', 'inspectionItemName', 'name'],
+    resultFieldCandidates: ['maintainResult', 'inspectionResult']
+  })
+})
+
 const tzStatusOptions = computed(() => {
   if (!dictReady.value) return []
   const options = getIntDictOptions('mes_tz_status')
@@ -323,6 +400,19 @@ const formatDetailDate = (value: any) => {
   return formatDate(new Date(value), 'YYYY-MM-DD')
 }
 
+const parseImages = (value: any): string[] => {
+  if (!value) return []
+  if (Array.isArray(value)) return value.map(String).filter(Boolean)
+  return String(value)
+    .split(',')
+    .map((v) => v.trim())
+    .filter(Boolean)
+}
+
+const parseFirstImage = (value: any): string => {
+  return parseImages(value)[0] || ''
+}
+
 const handleDetail = async (id: number) => {
   if (detailVisible.value && selectedDetailId.value === id) {
     closeDetail()
@@ -399,7 +489,7 @@ const handleDelete = async (ids: number | number[]) => {
     tableRef.value?.clearSelection?.()
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 const handleBatchDelete = async () => {
@@ -465,4 +555,40 @@ onMounted(async () => {
   font-size: 14px;
   font-weight: 600;
 }
+
+.device-ledger-history-steps {
+  padding: 8px 8px 0;
+}
+
+.device-ledger-history-title {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 13px;
+}
+
+.device-ledger-history-time {
+  font-weight: 600;
+}
+
+.device-ledger-history-operator {
+  color: var(--el-text-color-secondary);
+}
+
+.device-ledger-history-items {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin-top: 8px;
+}
+
+.device-ledger-history-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.device-ledger-history-item-text {
+  color: var(--el-text-color-regular);
+}
 </style>
diff --git a/src/views/mes/workOrderManagement/index.vue b/src/views/mes/workOrderManagement/index.vue
index 61613708..7afbc538 100644
--- a/src/views/mes/workOrderManagement/index.vue
+++ b/src/views/mes/workOrderManagement/index.vue
@@ -2,7 +2,8 @@
   <ContentWrap>
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="单号" prop="planNo">
-        <el-input v-model="queryParams.planNo" placeholder="请输入单号" clearable @keyup.enter="handleQuery"
+        <el-input
+v-model="queryParams.planNo" placeholder="请输入单号" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="类型" prop="planType">
@@ -12,7 +13,8 @@
       </el-form-item>
       <el-form-item label="作业状态" prop="jobStatus">
         <el-select v-model="queryParams.jobStatus" placeholder="请选择作业状态" clearable class="!w-240px">
-          <el-option v-for="opt in getStrDictOptions('job_status')" :key="String(opt.value)" :label="opt.label"
+          <el-option
+v-for="opt in getStrDictOptions('job_status')" :key="String(opt.value)" :label="opt.label"
             :value="opt.value" />
         </el-select>
       </el-form-item>
@@ -34,13 +36,15 @@
 
   <ContentWrap>
     <div class="mb-10px">
-      <el-button type="warning" plain @click="handleBatchCancel" :disabled="!selectedIds.length"
+      <el-button
+type="warning" plain @click="handleBatchCancel" :disabled="!selectedIds.length"
         :loading="cancelLoading">
         取消任务
       </el-button>
     </div>
 
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+    <el-table
+v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
       @selection-change="handleSelectionChange" @row-click="handleRowClick">
       <el-table-column type="selection" width="55" />
       <el-table-column type="index" label="序号" align="center" width="70" />
@@ -73,7 +77,8 @@
       <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
     </el-table>
 
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+    <Pagination
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
   </ContentWrap>