feat：模具管理-模具台账-详情对接接口

src/api/mold/moldrepair/index.ts

@@ -52,5 +52,13 @@ export const MoldRepairApi = {
 
   getMoldRepairLineListByRepairId: async (repairId) => {
     return await request.get({ url: `/mes/mold-repair/mold-repair-line/list-by-repair-id?repairId=` + repairId })
+  },
+
+  getRepairListByMoldId: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
+    return await request.get({ url: `/mes/mold-repair/getRepairListByMoldId`, params })
+  },
+
+  exportRepairExcel: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
+    return await request.download({ url: `/mes/mold-repair/export-repair-excel`, params })
   }
 }

src/api/mold/ticketManagement/index.ts

@@ -47,5 +47,21 @@ export const TicketManagementApi = {
 
   batchUpdateTicketResults: async (data: TicketResultVO[]) => {
     return await request.put({ url: `/mes/mold-ticket-results/batchUpdate`, data })
+  },
+
+  getInspectionByMoldId: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
+    return await request.get({ url: `/mes/mold-ticket-management/getInspectionByMoldId`, params })
+  },
+
+  exportInspection: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
+    return await request.download({ url: `/mes/mold-ticket-management/export-excel-inspection`, params })
+  },
+
+  getMaintenanceByMoldId: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
+    return await request.get({ url: `/mes/mold-ticket-management/getMaintenanceByMoldId`, params })
+  },
+
+  exportMaintenance: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
+    return await request.download({ url: `/mes/mold-ticket-management/export-excel-maintenance`, params })
   }
 }

src/views/erp/mold/detail/index.vue

@@ -26,6 +26,28 @@
       <div class="mold-detail-tabs">
         <el-tabs v-model="detailActiveTab" class="mt-12px">
           <el-tab-pane label="点检履历" name="check">
+            <div class="device-ledger-tab-toolbar">
+              <el-date-picker
+                v-model="inspectionDateRange"
+                type="daterange"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                range-separator="至"
+                :unlink-panels="true"
+                class="mr-10px"
+              />
+              <el-button type="primary" plain @click="handleQueryInspection">查询</el-button>
+              <el-button @click="handleResetInspection">重置</el-button>
+              <el-button
+                type="success"
+                plain
+                :loading="inspectionExportLoading"
+                @click="handleExportInspection"
+              >
+                <Icon icon="ep:download" class="mr-5px" /> 导出
+              </el-button>
+            </div>
             <el-empty v-if="!inspectionStepGroups.length" />
             <el-steps
 v-else direction="vertical" :active="inspectionStepGroups.length"
@@ -58,7 +80,7 @@ v-else direction="vertical" :active="inspectionStepGroups.length"
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">点检时间</span>
                           <span class="device-ledger-history-item-value">
-                            {{ formatHistoryTime(item.inspectionTime) }}
+                            {{ formatHistoryTime(item.taskTime) }}
                           </span>
                         </div>
                         <div class="device-ledger-history-item-row">
@@ -88,6 +110,28 @@ v-for="img in item.images" :key="img" :src="img" :preview-src-list="item.images"
             </el-steps>
           </el-tab-pane>
           <el-tab-pane label="保养履历" name="maintain">
+            <div class="device-ledger-tab-toolbar">
+              <el-date-picker
+                v-model="maintainDateRange"
+                type="daterange"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                range-separator="至"
+                :unlink-panels="true"
+                class="mr-10px"
+              />
+              <el-button type="primary" plain @click="handleQueryMaintain">查询</el-button>
+              <el-button @click="handleResetMaintain">重置</el-button>
+              <el-button
+                type="success"
+                plain
+                :loading="maintainExportLoading"
+                @click="handleExportMaintain"
+              >
+                <Icon icon="ep:download" class="mr-5px" /> 导出
+              </el-button>
+            </div>
             <el-empty v-if="!maintainStepGroups.length" />
             <el-steps
 v-else direction="vertical" class="device-ledger-history-steps"
@@ -120,7 +164,7 @@ v-else direction="vertical" class="device-ledger-history-steps"
                         <div class="device-ledger-history-item-row">
                           <span class="device-ledger-history-item-label">保养时间</span>
                           <span class="device-ledger-history-item-value">
-                            {{ formatHistoryTime(item.inspectionTime) }}
+                            {{ String(formatHistoryTime(item.taskTime)).split(' ')[0] }}
                           </span>
                         </div>
                         <div class="device-ledger-history-item-row">
@@ -150,24 +194,90 @@ v-for="img in item.images" :key="img" :src="img" :preview-src-list="item.images"
             </el-steps>
           </el-tab-pane>
           <el-tab-pane label="维修履历" name="repair">
-            <el-empty v-if="!repairHistoryView.length" />
-            <el-table
-v-else :data="repairHistoryView" :stripe="true" :show-overflow-tooltip="true"
-              class="mold-history-table">
-              <el-table-column label="维修单ID" prop="repairId" width="120" />
-              <el-table-column label="项目编码" prop="subjectCode" width="120" />
-              <el-table-column label="项目名称" prop="subjectName" min-width="160" />
-              <el-table-column label="项目内容" prop="subjectContent" min-width="200" />
-              <el-table-column label="判定标准" prop="subjectStandard" min-width="200" />
-              <el-table-column label="故障描述" prop="malfunction" min-width="200" />
-              <el-table-column label="维修描述" prop="repairDes" min-width="200" />
-              <el-table-column label="备注" prop="remark" min-width="200" />
-              <el-table-column label="创建时间" prop="createTime" width="180">
-                <template #default="scope">
-                  {{ formatHistoryTime(scope.row.createTime) }}
+            <div class="device-ledger-tab-toolbar">
+              <el-date-picker
+                v-model="repairDateRange"
+                type="daterange"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                range-separator="至"
+                :unlink-panels="true"
+                class="mr-10px"
+              />
+              <el-button type="primary" plain @click="handleQueryRepair">查询</el-button>
+              <el-button @click="handleResetRepair">重置</el-button>
+              <el-button
+                type="success"
+                plain
+                :loading="repairExportLoading"
+                @click="handleExportRepair"
+              >
+                <Icon icon="ep:download" class="mr-5px" /> 导出
+              </el-button>
+            </div>
+            <el-empty v-if="!repairGroups.length" />
+            <el-collapse v-else v-model="repairActiveNames" class="device-ledger-repair-collapse">
+              <el-collapse-item v-for="group in repairGroups" :key="group.key" :name="group.key">
+                <template #title>
+                  <div class="device-ledger-repair-title">
+                    <span class="device-ledger-repair-name">{{ group.name }}</span>
+                    <span class="device-ledger-repair-meta">共{{ group.items.length }}条</span>
+                  </div>
                 </template>
-              </el-table-column>
-            </el-table>
+                <div class="device-ledger-history-items">
+                  <div
+                    v-for="row in group.items"
+                    :key="String(row.id ?? row.subjectId ?? row.subjectCode)"
+                    class="device-ledger-history-item"
+                  >
+                    <div class="device-ledger-history-item-head">
+                      <el-tag type="info" effect="light">{{ row.subjectCode ?? '-' }}</el-tag>
+                      <span class="device-ledger-history-item-text">{{ row.subjectName ?? '-' }}</span>
+                    </div>
+                    <div class="device-ledger-history-item-body">
+                      <div class="device-ledger-history-item-row">
+                        <span class="device-ledger-history-item-label">项目内容</span>
+                        <span class="device-ledger-history-item-value">{{ row.subjectContent ?? '-' }}</span>
+                      </div>
+                      <div class="device-ledger-history-item-row">
+                        <span class="device-ledger-history-item-label">维修结果</span>
+                        <span class="device-ledger-history-item-value">
+                          <el-tag :type="getResultTagType(row.result ?? row.repairResult)">
+                            {{ getResultLabel(row.repairResult ?? row.result) }}
+                          </el-tag>
+                        </span>
+                      </div>
+                      <div class="device-ledger-history-item-row">
+                        <span class="device-ledger-history-item-label">备注</span>
+                        <span class="device-ledger-history-item-value">{{ row.remark ?? '-' }}</span>
+                      </div>
+                      <div class="device-ledger-history-item-row">
+                        <span class="device-ledger-history-item-label">完成日期</span>
+                        <span class="device-ledger-history-item-value">
+                          {{ String(formatHistoryTime(row.finishDate)).split(' ')[0] }}
+                        </span>
+                      </div>
+                      <div v-if="row.malfunctionImages?.length" class="device-ledger-history-item-images">
+                        <el-image
+                          v-for="img in row.malfunctionImages"
+                          :key="img"
+                          :src="img"
+                          :preview-src-list="row.malfunctionImages"
+                          preview-teleported
+                          fit="cover"
+                          class="device-ledger-history-item-image"
+                        >
+                          <template #error>
+                            <div class="device-ledger-history-image-error">图片加载失败</div>
+                          </template>
+                        </el-image>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </el-collapse-item>
+            </el-collapse>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -178,6 +288,9 @@ v-else :data="repairHistoryView" :stripe="true" :show-overflow-tooltip="true"
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import { MoldBrandApi, type MoldVO } from '@/api/erp/mold'
+import { TicketManagementApi } from '@/api/mold/ticketManagement'
+import { MoldRepairApi } from '@/api/mold/moldrepair'
+import download from '@/utils/download'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 
 defineOptions({ name: 'ErpMoldDetail' })
@@ -190,6 +303,12 @@ const { currentRoute } = useRouter()
 const detailLoading = ref(false)
 const detailData = ref<(MoldVO & Record<string, any>) | null>(null)
 const detailActiveTab = ref('check')
+const inspectionExportLoading = ref(false)
+const inspectionDateRange = ref<string[] | undefined>(undefined)
+const maintainExportLoading = ref(false)
+const maintainDateRange = ref<string[] | undefined>(undefined)
+const repairExportLoading = ref(false)
+const repairDateRange = ref<string[] | undefined>(undefined)
 
 const formatDetailDate = (value: any) => {
   if (!value) return ''
@@ -204,35 +323,50 @@ const formatHistoryTime = (value: any) => {
     if (hh !== undefined) return `${y}-${pad(m)}-${pad(d)} ${pad(hh)}:${pad(mm)}:${pad(ss)}`
     return `${y}-${pad(m)}-${pad(d)}`
   }
+  const tryDateFromNumber = (v: any) => {
+    const num = Number(v)
+    if (!Number.isFinite(num)) return undefined
+    const s = String(v).trim()
+    const ms = s.length === 10 ? num * 1000 : num
+    const d = new Date(ms)
+    if (Number.isNaN(d.getTime())) return undefined
+    return d
+  }
+  const tryDateFromString = (v: any) => {
+    const s = String(v).trim()
+    if (!s) return undefined
+    const d = new Date(s)
+    if (Number.isNaN(d.getTime())) return undefined
+    return d
+  }
+  const d = typeof raw === 'number' ? tryDateFromNumber(raw) : tryDateFromNumber(raw) ?? tryDateFromString(raw)
+  if (d) return formatDate(d, 'YYYY-MM-DD HH:mm:ss')
   return String(raw)
 }
 
 const getResultLabel = (value: any) => {
   const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (!v) return '-'
+  const upper = v.toUpperCase()
   if (v === '0') return '待检测'
-  if (v === '1') return 'OK'
-  if (v === '2') return 'NG'
-  return '-'
+  if (v === '1' || upper === 'OK') return '通过'
+  if (v === '2' || upper === 'NG') return '不通过'
+  return v
 }
 
 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) return 'info'
+  const upper = v.toUpperCase()
+  if (v === '1' || upper === 'OK') return 'success'
+  if (v === '2' || upper === 'NG') return 'danger'
   if (v === '0') return 'info'
   return 'info'
 }
 
-const inspectionHistory = computed(() => {
-  const data: any = detailData.value
-  return data?.inspectionList ?? []
-})
+const inspectionHistory = ref<any[]>([])
 
-const maintainHistory = computed(() => {
-  const data: any = detailData.value
-  const list = data?.maintainList ?? []
-  return Array.isArray(list) ? list : []
-})
+const maintainHistory = ref<any[]>([])
 
 type HistoryStepItem = {
   key: string
@@ -242,6 +376,7 @@ type HistoryStepItem = {
   criteria?: any
   images?: string[]
   remark?: any
+  taskTime?: any
   inspectionTime?: any
   createTime?: any
 }
@@ -266,7 +401,7 @@ const buildStepGroups = (
 
   for (const row of rows ?? []) {
     const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime)
-    const operator = String(row?.creatorName ?? row?.creator ?? '-')
+    const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-')
     const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
 
     const name =
@@ -285,6 +420,7 @@ const buildStepGroups = (
       criteria: row?.judgmentCriteria,
       images: parseImages(row?.images),
       remark: row?.remark,
+      taskTime: row?.taskTime,
       inspectionTime: row?.inspectionTime,
       createTime: row?.createTime
     }
@@ -316,36 +452,211 @@ const maintainStepGroups = computed<HistoryStepGroup[]>(() => {
 })
 
 type RepairHistoryRow = {
+  id?: any
   repairId?: any
+  repairCode?: any
+  repairName?: any
+  subjectId?: any
   subjectCode?: any
   subjectName?: any
   subjectContent?: any
   subjectStandard?: any
   malfunction?: any
+  malfunctionUrl?: any
   repairDes?: any
   remark?: any
   createTime?: any
+  finishDate?: any
+  result?: any
+  repairResult?: any
+  malfunctionImages?: string[]
 }
 
-const repairHistoryView = computed<RepairHistoryRow[]>(() => {
-  const data: any = detailData.value
-  const raw = data?.repairList
-  if (!raw) return []
-  if (Array.isArray(raw)) {
-    return raw as RepairHistoryRow[]
-  }
-  if (typeof raw === 'object') {
-    const result: RepairHistoryRow[] = []
-    Object.values(raw as Record<string, any>).forEach((rows: any) => {
-      if (Array.isArray(rows)) {
-        result.push(...(rows as RepairHistoryRow[]))
-      }
+type RepairHistoryGroup = { key: string; name: string; items: RepairHistoryRow[] }
+
+const repairActiveNames = ref<string[]>([])
+const repairList = ref<RepairHistoryRow[]>([])
+
+const repairGroups = computed<RepairHistoryGroup[]>(() => {
+  const groupsMap = new Map<string, RepairHistoryGroup>()
+  for (const row of repairList.value ?? []) {
+    const key = String(row.repairCode ?? row.repairId ?? row.subjectName ?? '-')
+    if (!groupsMap.has(key)) {
+      groupsMap.set(key, {
+        key,
+        name: String(row.repairName ?? row.repairCode ?? key),
+        items: []
+      })
+    }
+    const group = groupsMap.get(key)!
+    group.items.push({
+      ...row,
+      malfunctionImages: parseImages(row?.malfunctionUrl)
     })
-    return result
   }
-  return []
+
+  const groups = Array.from(groupsMap.values()).filter((g) => g.items.length)
+
+  return groups.sort((a, b) => {
+    const at = formatHistoryTime(a.items?.[0]?.finishDate ?? a.items?.[0]?.createTime)
+    const bt = formatHistoryTime(b.items?.[0]?.finishDate ?? b.items?.[0]?.createTime)
+    return String(bt).localeCompare(String(at))
+  })
 })
 
+const fetchRepairHistory = async () => {
+  const id = Number(route.params.id)
+  if (!id) return
+  const params: any = { moldId: id }
+  if (repairDateRange.value && repairDateRange.value.length === 2) {
+    params.startTime = repairDateRange.value[0]
+    params.endTime = repairDateRange.value[1]
+  }
+  const data = await MoldRepairApi.getRepairListByMoldId(params)
+  repairList.value = Array.isArray(data) ? data : []
+}
+
+const handleQueryRepair = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  await fetchRepairHistory()
+}
+
+const handleResetRepair = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  repairDateRange.value = undefined
+  await fetchRepairHistory()
+}
+
+const handleExportRepair = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  try {
+    repairExportLoading.value = true
+    const params: any = { moldId: id }
+    if (repairDateRange.value && repairDateRange.value.length === 2) {
+      params.startTime = repairDateRange.value[0]
+      params.endTime = repairDateRange.value[1]
+    }
+    const data = await MoldRepairApi.exportRepairExcel(params)
+    download.excel(data, '模具维修履历.xls')
+  } finally {
+    repairExportLoading.value = false
+  }
+}
+
+const fetchMaintainHistory = async () => {
+  const id = Number(route.params.id)
+  if (!id) return
+  const params: any = { moldId: id }
+  if (maintainDateRange.value && maintainDateRange.value.length === 2) {
+    params.startTime = maintainDateRange.value[0]
+    params.endTime = maintainDateRange.value[1]
+  }
+  const data = await TicketManagementApi.getMaintenanceByMoldId(params)
+  maintainHistory.value = Array.isArray(data) ? data : []
+}
+
+const handleQueryMaintain = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  await fetchMaintainHistory()
+}
+
+const handleResetMaintain = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  maintainDateRange.value = undefined
+  await fetchMaintainHistory()
+}
+
+const handleExportMaintain = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  try {
+    maintainExportLoading.value = true
+    const params: any = { moldId: id }
+    if (maintainDateRange.value && maintainDateRange.value.length === 2) {
+      params.startTime = maintainDateRange.value[0]
+      params.endTime = maintainDateRange.value[1]
+    }
+    const data = await TicketManagementApi.exportMaintenance(params)
+    download.excel(data, '模具保养履历.xls')
+  } finally {
+    maintainExportLoading.value = false
+  }
+}
+
+const fetchInspectionHistory = async () => {
+  const id = Number(route.params.id)
+  if (!id) return
+  const params: any = { moldId: id }
+  if (inspectionDateRange.value && inspectionDateRange.value.length === 2) {
+    params.startTime = inspectionDateRange.value[0]
+    params.endTime = inspectionDateRange.value[1]
+  }
+  const data = await TicketManagementApi.getInspectionByMoldId(params)
+  inspectionHistory.value = Array.isArray(data) ? data : []
+}
+
+const handleQueryInspection = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  await fetchInspectionHistory()
+}
+
+const handleResetInspection = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  inspectionDateRange.value = undefined
+  await fetchInspectionHistory()
+}
+
+const handleExportInspection = async () => {
+  const id = Number(route.params.id)
+  if (!id) {
+    message.error('参数错误，模具不能为空')
+    return
+  }
+  try {
+    inspectionExportLoading.value = true
+    const params: any = { moldId: id }
+    if (inspectionDateRange.value && inspectionDateRange.value.length === 2) {
+      params.startTime = inspectionDateRange.value[0]
+      params.endTime = inspectionDateRange.value[1]
+    }
+    const data = await TicketManagementApi.exportInspection(params)
+    download.excel(data, '模具点检履历.xls')
+  } finally {
+    inspectionExportLoading.value = false
+  }
+}
+
 const close = () => {
   delView(unref(currentRoute))
 }
@@ -361,6 +672,9 @@ const getDetail = async () => {
   detailLoading.value = true
   try {
     detailData.value = await MoldBrandApi.getMold(id)
+    await fetchInspectionHistory()
+    await fetchMaintainHistory()
+    await fetchRepairHistory()
   } finally {
     detailLoading.value = false
   }
@@ -398,6 +712,10 @@ onMounted(async () => {
   padding: 8px 8px 0;
 }
 
+.device-ledger-tab-toolbar {
+  margin-bottom: 16px;
+}
+
 .device-ledger-history-title {
   display: flex;
   align-items: center;
@@ -485,6 +803,27 @@ onMounted(async () => {
   justify-content: center;
 }
 
+.device-ledger-repair-collapse {
+  padding: 8px 8px 0;
+}
+
+.device-ledger-repair-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.device-ledger-repair-name {
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.device-ledger-repair-meta {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
 .device-ledger-history-item-text {
   color: var(--el-text-color-regular);
 }