diff --git a/.env.local b/.env.local
index 5bdf058c..9f6a531f 100644
--- a/.env.local
+++ b/.env.local
@@ -8,8 +8,8 @@ VITE_DEV=true
 # 线上环境
 # VITE_BASE_URL='https://besure.ngsk.tech:7001' 
 # 本地联调
-VITE_BASE_URL='http://localhost:48081' 
-# VITE_BASE_URL='http://192.168.5.135:48081' 
+# VITE_BASE_URL='http://192.168.5.107:48081' 
+VITE_BASE_URL='http://192.168.5.131:48081' 
 
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
diff --git a/src/api/erp/mold/index.ts b/src/api/erp/mold/index.ts
index 775bd7ae..dc34c093 100644
--- a/src/api/erp/mold/index.ts
+++ b/src/api/erp/mold/index.ts
@@ -81,6 +81,10 @@ export const MoldBrandApi = {
   getMoldPage: async (params) => {
     return await request.get({ url: `/erp/mold-brand/mold/page`, params })
   },
+
+  getMoldPageWithoutPaging: async () => {
+    return await request.get({ url: `/erp/mold-brand/mold/page` })
+  },
   // 新增模具
   createMold: async (data) => {
     return await request.post({ url: `/erp/mold-brand/mold/create`, data })
diff --git a/src/api/mes/energydevice/index.ts b/src/api/mes/energydevice/index.ts
index 5164e784..2f6932ef 100644
--- a/src/api/mes/energydevice/index.ts
+++ b/src/api/mes/energydevice/index.ts
@@ -25,6 +25,23 @@ export interface EnergyDeviceVO {
   operationRulesVOList?: EnergyDeviceOperationRuleVO[]
 }
 
+export interface EnergyDeviceDataRecordVO {
+  id: number
+  name?: string
+  deviceTypeName?: string
+  orgId?: number | string
+  orgName?: string
+  operationRulesVOMap?: Record<string, string | number | null>
+  energyConsumption?: string | number
+  energyAllocationConsumption?: string | number
+  energyActualConsumption?: string | number
+  shift?: string
+  startTime?: string
+  endTime?: string
+  earliestDataTime?: string
+  latestDataTime?: string
+}
+
 // 能源设备 API
 export const EnergyDeviceApi = {
   // 查询能源设备分页
@@ -41,6 +58,14 @@ export const EnergyDeviceApi = {
     return await request.get({ url: `/mes/energy-device/getList`, params })
   },
 
+  queryDataRecords: async (params: any) => {
+    return await request.get({ url: `/mes/energy-device/queryDataRecords`, params })
+  },
+
+  exportQueryDataRecords: async (params: any) => {
+    return await request.download({ url: `/mes/energy-device/record-export-excel`, params })
+  },
+
   // 新增能源设备
   createEnergyDevice: async (data: EnergyDeviceVO) => {
     return await request.post({ url: `/mes/energy-device/create`, data })
diff --git a/src/api/mold/moldRepairItems/index.ts b/src/api/mold/moldRepairItems/index.ts
new file mode 100644
index 00000000..527851a6
--- /dev/null
+++ b/src/api/mold/moldRepairItems/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export interface MoldRepairItemVO {
+  id?: number
+  subjectCode: string
+  subjectName: string
+  deviceType: string | number
+  moldId?: string | number
+  inspectionMethod?: string
+  valueType?: string
+  judgmentCriteria?: string
+  isEnable: string
+  deviceName?: string
+  componentName?: string
+  creatorName?: string
+  createTime?: string | number | Date
+  projectContent?: string
+}
+
+export const MoldRepairItemsApi = {
+  getRepairItemsPage: async (params: any) => {
+    return await request.get({ url: `/mes/mold-repair-tems/page`, params })
+  },
+
+  getComponentList: async (deviceId: number) => {
+    return await request.get({ url: `/mes/mold-repair-tems/getComponentList`, params: { deviceId } })
+  },
+
+  getDeviceOrComponentList: async (params: { deviceId: number; componentId?: number; deviceType: number }) => {
+    return await request.get({ url: `/mes/mold-repair-tems/getDeviceOrComponentList`, params })
+  },
+
+  createRepairItem: async (data: MoldRepairItemVO) => {
+    return await request.post({ url: `/mes/mold-repair-tems/create`, data })
+  },
+
+  updateRepairItem: async (data: MoldRepairItemVO) => {
+    return await request.put({ url: `/mes/mold-repair-tems/update`, data })
+  },
+
+  deleteRepairItems: async (ids: string) => {
+    return await request.delete({ url: `/mes/mold-repair-tems/delete?ids=` + ids })
+  },
+
+  exportRepairItems: async (params: any) => {
+    return await request.download({ url: `/mes/mold-repair-tems/export-excel`, params })
+  }
+}
diff --git a/src/api/mold/moldrepair/index.ts b/src/api/mold/moldrepair/index.ts
new file mode 100644
index 00000000..018fab09
--- /dev/null
+++ b/src/api/mold/moldrepair/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface MoldRepairVO {
+  id: number
+  repairCode: string
+  repairName: string
+  moldId?: number
+  moldCode?: string
+  moldName?: string
+  machineryId?: number
+  machineryCode?: string
+  machineryName?: string
+  machineryBrand: string
+  machinerySpec: string
+  machineryTypeId: number
+  requireDate: Date
+  finishDate: Date
+  confirmDate: Date
+  repairResult: string
+  acceptedBy: string
+  confirmBy: string
+  status: string
+  remark: string
+}
+
+export type MoldRepairSaveVO = Omit<MoldRepairVO, 'machineryId' | 'machineryCode' | 'machineryName'>
+
+export const MoldRepairApi = {
+  getMoldRepairPage: async (params: any) => {
+    return await request.get({ url: `/mes/mold-repair/page`, params })
+  },
+
+  getMoldRepair: async (id: number) => {
+    return await request.get({ url: `/mes/mold-repair/get?id=` + id })
+  },
+
+  createMoldRepair: async (data: MoldRepairSaveVO) => {
+    return await request.post({ url: `/mes/mold-repair/create`, data })
+  },
+
+  updateMoldRepair: async (data: MoldRepairSaveVO) => {
+    return await request.put({ url: `/mes/mold-repair/update`, data })
+  },
+
+  deleteMoldRepair: async (ids: string) => {
+    return await request.delete({ url: `/mes/mold-repair/delete?ids=` + ids })
+  },
+
+  exportMoldRepair: async (params) => {
+    return await request.download({ url: `/mes/mold-repair/export-excel`, params })
+  },
+
+  getMoldRepairLineListByRepairId: async (repairId) => {
+    return await request.get({ url: `/mes/mold-repair/mold-repair-line/list-by-repair-id?repairId=` + repairId })
+  }
+}
diff --git a/src/views/iot/device/components/DeviceAttributeForm.vue b/src/views/iot/device/components/DeviceAttributeForm.vue
index 2052c026..a79719a6 100644
--- a/src/views/iot/device/components/DeviceAttributeForm.vue
+++ b/src/views/iot/device/components/DeviceAttributeForm.vue
@@ -45,7 +45,7 @@
         <el-input v-model="formData.dataUnit" placeholder="请输入单位" />
       </el-form-item>
       <el-form-item label="倍率" prop="ratio">
-        <el-input v-model="formData.ratio" placeholder="请输入倍率" />
+        <el-input v-model="formData.ratio" placeholder="请输入倍率" :disabled="!ratioEnabled" />
       </el-form-item>
       <el-form-item label="顺序" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入顺序" @input="handleSortInput" />
@@ -105,6 +105,33 @@ const formData = ref({
   deviceId: undefined as number | undefined
 })
 
+const ratioEnabledTypes = new Set([
+  'uint8',
+  'uint16',
+  'uint32',
+  'uint64',
+  'int8',
+  'int16',
+  'int32',
+  'float32',
+  'float64'
+])
+
+const ratioEnabled = computed(() => {
+  const v = formData.value.dataType
+  if (!v) return false
+  return ratioEnabledTypes.has(v)
+})
+
+watch(
+  () => formData.value.dataType,
+  () => {
+    if (!ratioEnabled.value) {
+      formData.value.ratio = undefined
+    }
+  }
+)
+
 const handleAttributeCodeInput = (val: string) => {
   formData.value.attributeCode = val?.replace(/[\u4e00-\u9fa5]/g, '')
 }
@@ -191,7 +218,7 @@ const buildSubmitData = () => {
     dataType,
     address,
     dataUnit,
-    ratio,
+    ratio: ratioEnabled.value ? ratio : undefined,
     sort: parsedSort,
     remark,
     deviceId
diff --git a/src/views/iot/deviceParamAnalysis/index.vue b/src/views/iot/deviceParamAnalysis/index.vue
index 74226294..e5fada9a 100644
--- a/src/views/iot/deviceParamAnalysis/index.vue
+++ b/src/views/iot/deviceParamAnalysis/index.vue
@@ -409,8 +409,10 @@ const handleTreeNodeClick = async (data: DeviceTreeNode) => {
     return
   }
 
+
+  const isEmptyOrgNode = typeof data?.id === 'string' && data.id.startsWith('org-')
   const isEquipmentNode = typeof data?.id === 'string' && data.id.startsWith('equipment-')
-  if (isEquipmentNode && (data.paramCount ?? 0) <= 0) {
+  if (isEquipmentNode && (data.paramCount ?? 0) <= 0 || isEmptyOrgNode) {
     selectedParam.value = data
     selectedDeviceId.value = undefined
     selectedModelId.value = undefined
diff --git a/src/views/mes/energydevice/EnergyDeviceForm.vue b/src/views/mes/energydevice/EnergyDeviceForm.vue
index ea720e55..b1abd534 100644
--- a/src/views/mes/energydevice/EnergyDeviceForm.vue
+++ b/src/views/mes/energydevice/EnergyDeviceForm.vue
@@ -10,28 +10,33 @@
       </el-form-item>
 
       <el-form-item label="能源类型" prop="deviceTypeId">
-        <el-select v-model="formData.deviceTypeId" @change="handleDeviceTypeChange" placeholder="请选择能源类型" clearable
+        <el-select
+v-model="formData.deviceTypeId" @change="handleDeviceTypeChange" placeholder="请选择能源类型" clearable
           filterable class="!w-full">
           <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
 
       <el-form-item label="所属区域" prop="orgId">
-        <el-tree-select v-model="formData.orgId" :data="orgSelectTree" :props="orgTreeSelectProps" filterable
+        <el-tree-select
+v-model="formData.orgId" :data="orgSelectTree" :props="orgTreeSelectProps" filterable
           check-strictly clearable class="!w-full" placeholder="根据区域结构筛选列表" :loading="analysisLoading"
           :render-after-expand="false" @change="handleOrgChange" />
       </el-form-item>
 
       <el-form-item label="计算规则" prop="operationRulesVOList">
         <div class="w-full flex flex-col gap-8px">
-          <div v-for="(rule, index) in formData.operationRulesVOList" :key="index"
+          <div
+v-for="(rule, index) in formData.operationRulesVOList" :key="index"
             class="w-full flex items-center gap-8px">
-            <el-tree-select v-model="rule.pointValue" :data="equipmentTree" :props="treeSelectProps" filterable
+            <el-tree-select
+v-model="rule.pointValue" :data="equipmentTree" :props="treeSelectProps" filterable
               clearable class="!w-full" placeholder="根据设备选择点位" :loading="devicePointLoading"
               @change="(val) => handlePointSelected(index, val)" />
 
             <template v-if="index < formData.operationRulesVOList.length - 1">
-              <el-select v-model="formData.operationRulesVOList[index].operator" placeholder="运算符" class="!w-110px"
+              <el-select
+v-model="formData.operationRulesVOList[index].operator" placeholder="运算符" class="!w-110px"
                 clearable>
                 <el-option v-for="op in operatorOptions" :key="op" :label="op" :value="op" />
               </el-select>
diff --git a/src/views/mes/energydevice/index.vue b/src/views/mes/energydevice/index.vue
index d6af71f8..f81b740f 100644
--- a/src/views/mes/energydevice/index.vue
+++ b/src/views/mes/energydevice/index.vue
@@ -34,8 +34,16 @@ type="success" plain @click="handleExport" :loading="exportLoading"
   <!-- 列表 -->
   <ContentWrap>
     <el-table
-v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" highlight-current-row
-      @current-change="handleCurrentChange">
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      highlight-current-row
+      row-key="id"
+      @current-change="handleCurrentChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="表编码" align="center" prop="code" />
       <el-table-column label="表名称" align="center" prop="name" />
       <el-table-column label="能耗类型" align="center" prop="deviceTypeName" />
@@ -132,6 +140,7 @@ const typeList = ref<EnergyTypeVO[]>([]) // 列表
 const loading = ref(true) // 列表的加载中
 const list = ref<EnergyDeviceVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
+const selectedIds = ref<Array<number | string>>([])
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -199,6 +208,12 @@ const handleDelete = async (id: number) => {
   } catch { }
 }
 
+const handleSelectionChange = (rows: EnergyDeviceVO[]) => {
+  selectedIds.value = rows
+    .map((item) => item.id)
+    .filter((id): id is number | string => id !== undefined && id !== null)
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
@@ -206,7 +221,11 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await EnergyDeviceApi.exportEnergyDevice(queryParams)
+    const params: any = { ...queryParams }
+    if (selectedIds.value.length) {
+      params.ids = selectedIds.value.join(',')
+    }
+    const data = await EnergyDeviceApi.exportEnergyDevice(params)
     download.excel(data, '能源设备.xls')
   } catch {
   } finally {
diff --git a/src/views/mes/energydevicecheck/index.vue b/src/views/mes/energydevicecheck/index.vue
index f7297890..742e43b4 100644
--- a/src/views/mes/energydevicecheck/index.vue
+++ b/src/views/mes/energydevicecheck/index.vue
@@ -1,252 +1,178 @@
 <template>
-  <!-- 列表 -->
   <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="抄表明细" name="first">
-        <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="能源设备" prop="deviceId">
-        <el-select
-          v-model="queryParams.deviceId"
-          @change="handleQuery"
-          clearable
-          filterable
-          placeholder="请选择"
-          class="!w-180px"
-        >
-          <el-option
-            v-for="item in deviceList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="抄表时间" prop="checkTime">
-        <el-date-picker
-          v-model="queryParams.checkTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </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
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['mes:energy-device-check-record:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="表名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入表名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-text>本页总差值：{{erpNumberFormatter(totalDiffValue,3)}}</el-text>
-    </el-form>
-        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" style="margin-top:20px">
-          <el-table-column label="能源设备" align="center" prop="deviceName" sortable/>
-          <el-table-column label="抄表值" align="center" prop="checkValue" />
-          <el-table-column label="差值" align="center" prop="diffValue" />
-          <el-table-column label="上次抄表值" align="center" prop="lastCheckValue" />
-          <el-table-column
-            label="抄表时间"
-            align="center"
-            prop="checkTime"
-            :formatter="dateFormatter"
-            width="170px"
-            sortable
-          />
-          <el-table-column
-            label="上次抄表时间"
-            align="center"
-            prop="lastCheckTime"
-            :formatter="dateFormatter"
-            width="170px"
-            sortable
-          />
-          <el-table-column label="单价" align="center" prop="unitPrice" />
-          <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            :formatter="dateFormatter"
-            width="170px"
-          />
 
-        </el-table>
-        <!-- 分页 -->
-        <Pagination
-          :total="total"
-          v-model:page="queryParams.pageNo"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="能源报表" name="second" >
-        <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="能源设备" prop="deviceId">
-        <el-select
-          v-model="queryParams.deviceId"
-          @change="handleQuery"
-          clearable
-          filterable
-          placeholder="请选择"
-          class="!w-180px"
-        >
-          <el-option
-            v-for="item in deviceList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
+      <el-form-item label="所属区域" prop="orgId">
+        <el-select v-model="queryParams.orgId" filterable clearable placeholder="请选择所属区域" class="!w-240px">
+          <el-option v-for="opt in orgOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="抄表时间" prop="checkTime">
-        <el-date-picker
-          v-model="queryParams.checkTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+
+      <el-form-item label="时间范围" prop="timeRange">
+        <el-date-picker v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH"
+          format="YYYY-MM-DD HH" start-placeholder="请选择开始时间" end-placeholder="请选择结束时间"
+          :default-time="[new Date('2000-01-01 00:00:00'), new Date('2000-01-01 23:00:00')]"
+          :disabled-time="getDisabledTime" class="!w-360px " popper-class="energydevicecheckPicker"
+          :teleported="false" />
       </el-form-item>
-      <!-- <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </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
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['mes:energy-device-check-record:export']"
-        >
+        <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="success" plain @click="handleExport" :loading="exportLoading">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
-      <el-text>本页总差值：{{erpNumberFormatter(totalDiffValue,3)}}</el-text>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" style="margin-top:20px">
-          <el-table-column label="编码" align="center" prop="code" />
-          <el-table-column label="名称" align="center" prop="name" sortable/>
-          <el-table-column label="能源类型" align="center" prop="deviceType" />
-          <el-table-column label="所属区域" align="center" prop="orgName" />
-          <el-table-column label="班次" align="center" prop="shift" />
-          <el-table-column
-            label="开始时间"
-            align="center"
-            prop="startTime"
-            :formatter="dateFormatter"
-            width="170px"
-            sortable
-          />
-          <el-table-column
-            label="结束时间"
-            align="center"
-            prop="endTime"
-            :formatter="dateFormatter"
-            width="170px"
-            sortable
-          />
-
-        </el-table>
-        <!-- 分页 -->
-        <Pagination
-          :total="total"
-          v-model:page="queryParams.pageNo"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
     </el-form>
-      </el-tab-pane>
-    </el-tabs>
 
+    <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
+      :expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style="margin-top: 20px; min-height: 50vh"
+      @row-click="handleRowClick" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column type="expand" width="52">
+        <template #default="scope">
+          <el-table v-if="getPointDetailsRows(scope.row).length" :data="getPointDetailsRows(scope.row)"
+            :show-overflow-tooltip="true" size="small" border>
+            <el-table-column label="参数名称" prop="pointName" min-width="140" />
+            <el-table-column label="最早采集值" prop="earliestValue" min-width="120" />
+            <el-table-column label="最早采集时间" prop="earliestTime" min-width="170" />
+            <el-table-column label="最新值" prop="latestValue" min-width="120" />
+            <el-table-column label="最新采集时间" prop="latestTime" min-width="170" />
+            <el-table-column label="能耗用量" prop="difference" min-width="120" />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="序号" align="center" width="70">
+        <template #default="scope">
+          {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="表名称" align="center" prop="name" min-width="120" />
+      <el-table-column label="能源类型" align="center" prop="deviceTypeName" min-width="100" />
+      <el-table-column label="所属区域" align="center" prop="orgName" min-width="100" />
+      <el-table-column label="能源用量" align="center" prop="energyConsumption" min-width="120" />
+      <el-table-column label="班次" align="center" min-width="90">
+        <template #default>
+          <el-tag type="success">早班</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" min-width="170">
+        <template #default="scope">
+          {{ scope.row.startTime ?? scope.row.earliestDataTime ?? '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" min-width="170">
+        <template #default="scope">
+          {{ scope.row.endTime ?? scope.row.latestDataTime ?? '-' }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <EnergyDeviceCheckRecordForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { EnergyDeviceCheckRecordApi, EnergyDeviceCheckRecordVO } from '@/api/mes/energydevicecheck'
-import EnergyDeviceCheckRecordForm from './EnergyDeviceCheckRecordForm.vue'
-import {EnergyDeviceVO, EnergyDeviceApi} from "@/api/mes/energydevice";
-import {erpNumberFormatter} from "../../../utils";
+import { EnergyDeviceApi, EnergyDeviceDataRecordVO } from '@/api/mes/energydevice'
+import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
 
-/** 抄表记录 列表 */
 defineOptions({ name: 'EnergyDeviceCheckRecord' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
-const list = ref<EnergyDeviceCheckRecordVO[]>([]) // 列表的数据
-const deviceList = ref<EnergyDeviceVO[]>([]) // 列表
-const totalDiffValue = ref(0) // 列表的总页数
+const list = ref<EnergyDeviceDataRecordVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
+const tableRef = ref()
+const expandRowKeys = ref<Array<string | number>>([])
+const selectedIds = ref<Array<number | string>>([])
+
+const orgOptions = ref<{ label: string; value: string | number; raw?: OrganizationVO }[]>([])
+
+const getDisabledTime = () => {
+  const all = Array.from({ length: 60 }, (_, i) => i)
+  return {
+    disabledMinutes: () => all,
+    disabledSeconds: () => all
+  }
+}
+
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  deviceId: undefined,
-  checkTime: [],
-  diffValue: undefined,
-  remark: undefined,
-  createTime: []
+  name: undefined as string | undefined,
+  orgId: undefined as string | number | undefined,
+  timeRange: [] as string[],
+  startTime: undefined as string | undefined,
+  endTime: undefined as string | undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+const getPointDetailsRows = (row: EnergyDeviceDataRecordVO) => {
+  const list = (row as any)?.pointDetails
+  if (!Array.isArray(list)) return []
+  return list
+}
+
+const getRowClassName = ({ row }: { row: EnergyDeviceDataRecordVO }) => {
+  return getPointDetailsRows(row).length ? '' : 'row-no-expand'
+}
+
+const handleRowClick = (row: EnergyDeviceDataRecordVO) => {
+  const rows = getPointDetailsRows(row)
+  if (!rows.length) return
+  const key = row.id
+  const idx = expandRowKeys.value.findIndex((k) => k === key)
+  if (idx >= 0) {
+    expandRowKeys.value.splice(idx, 1)
+  } else {
+    expandRowKeys.value.push(key)
+  }
+}
+
+const handleSelectionChange = (rows: EnergyDeviceDataRecordVO[]) => {
+  selectedIds.value = rows
+    .map((item) => item.id)
+    .filter((id): id is number | string => id !== undefined && id !== null)
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    const data = await EnergyDeviceCheckRecordApi.getEnergyDeviceCheckRecordPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-   // 初始化总和为 0
-    let sum = 0;
-   // 遍历列表，累加每个实体对象的 value 属性值
-    for (let entity of list.value) {
-      sum += entity.diffValue;
+    queryParams.startTime = queryParams.timeRange?.[0]
+    queryParams.endTime = queryParams.timeRange?.[1]
+    const params = {
+      pageNo: queryParams.pageNo,
+      pageSize: queryParams.pageSize,
+      name: queryParams.name,
+      orgId: queryParams.orgId,
+      startTime: queryParams.startTime,
+      endTime: queryParams.endTime
     }
-    totalDiffValue.value = sum
+    const res: any = await EnergyDeviceApi.queryDataRecords(params)
+    const rows = (Array.isArray(res)
+      ? res
+      : Array.isArray(res?.list)
+        ? res.list
+        : Array.isArray(res?.data)
+          ? res.data
+          : []) as EnergyDeviceDataRecordVO[]
+    list.value = rows
+    total.value = Number(res?.total ?? rows.length)
+    expandRowKeys.value = []
   } finally {
     loading.value = false
   }
@@ -261,28 +187,10 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
+  queryParams.timeRange = []
   handleQuery()
 }
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await EnergyDeviceCheckRecordApi.deleteEnergyDeviceCheckRecord(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
@@ -290,24 +198,47 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await EnergyDeviceCheckRecordApi.exportEnergyDeviceCheckRecord(queryParams)
-    download.excel(data, '抄表记录.xls')
+    queryParams.startTime = queryParams.timeRange?.[0]
+    queryParams.endTime = queryParams.timeRange?.[1]
+    const params: any = {
+      name: queryParams.name,
+      orgId: queryParams.orgId,
+      startTime: queryParams.startTime,
+      endTime: queryParams.endTime
+    }
+    if (selectedIds.value.length) {
+      params.ids = selectedIds.value.join(',')
+    }
+    const data = await EnergyDeviceApi.exportQueryDataRecords(params)
+    download.excel(data, '能源报表.xls')
   } catch {
   } finally {
     exportLoading.value = false
   }
 }
 
+const loadOrgOptions = async () => {
+  if (orgOptions.value.length) return
+  const data: any = await OrganizationApi.getOrganizationList({})
+  const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as OrganizationVO[]
+  orgOptions.value = rows
+    .filter((r) => r?.id !== undefined && r?.name)
+    .map((r) => ({ label: r.name, value: r.id, raw: r }))
+}
+
 /** 初始化 **/
 onMounted(async () => {
+  await loadOrgOptions()
   await getList()
-  deviceList.value = await EnergyDeviceApi.getList()
 })
+</script>
 
-/** tab 切换 */
-let activeName = 'first'
-const handleTabClick = (tab: TabsPaneContext) => {
-  // queryParams.status = tab.paneName
-  // handleQuery()
+<style scoped lang="scss">
+:deep(.el-time-spinner__wrapper:nth-child(1)) {
+  width: 100%;
 }
-</script>
+
+:deep(.el-time-spinner__wrapper:nth-child(2)) {
+  display: none;
+}
+</style>
diff --git a/src/views/mold/moldrepair/MoldRepairForm.vue b/src/views/mold/moldrepair/MoldRepairForm.vue
new file mode 100644
index 00000000..74e4198b
--- /dev/null
+++ b/src/views/mold/moldrepair/MoldRepairForm.vue
@@ -0,0 +1,386 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px" @closed="handleDialogClosed">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="维修单编号" prop="repairCode">
+            <el-input v-model="formData.repairCode" placeholder="请输入维修单编号" :disabled="isRepairMode" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="维修单" prop="repairName">
+            <el-input v-model="formData.repairName" placeholder="请输入维修单名称" :disabled="isRepairMode" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="模具" prop="moldId">
+            <el-select
+              v-model="formData.moldId" filterable clearable :loading="moldLoading"
+              :disabled="isRepairMode" placeholder="请选择模具" class="!w-full">
+              <el-option v-for="opt in moldOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="模具名称" prop="moldName" :required="false">
+            <el-input v-model="formData.moldName" placeholder="自动带出" disabled />
+          </el-form-item>
+        </el-col>
+         <el-col :span="8">
+          <el-form-item label="模具编码" prop="moldCode" :required="false">
+            <el-input v-model="formData.moldCode" placeholder="自动带出" disabled />
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="8">
+          <el-form-item label="规格型号" prop="machinerySpec" :required="false">
+            <el-input v-model="formData.machinerySpec" placeholder="自动带出" disabled />
+          </el-form-item>
+          <el-form-item label="品牌" prop="machineryBrand" :required="false">
+            <el-input v-model="formData.machineryBrand" placeholder="自动带出" disabled />
+          </el-form-item>
+        </el-col> -->
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="维修人员" prop="acceptedBy">
+            <el-select
+              v-model="formData.acceptedBy" filterable clearable placeholder="请选择维修人员" class="!w-full"
+              :disabled="isRepairMode">
+              <el-option v-for="item in users" :key="String(item.id)" :label="item.nickname" :value="String(item.id)" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="验收人员" prop="confirmBy">
+            <el-select
+              v-model="formData.confirmBy" filterable clearable placeholder="请选择验收人员" class="!w-full"
+              :disabled="isRepairMode">
+              <el-option v-for="item in users" :key="String(item.id)" :label="item.nickname" :value="String(item.id)" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <template v-if="showRepairFields">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="报修日期" prop="requireDate">
+              <el-date-picker v-model="formData.requireDate" type="date" value-format="x" placeholder="选择报修日期" class="!w-full" :disabled="repairFieldsDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="完成日期" prop="finishDate">
+              <el-date-picker v-model="formData.finishDate" type="date" value-format="x" placeholder="选择完成日期" class="!w-full" :disabled="repairFieldsDisabled" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="验收日期" prop="confirmDate">
+              <el-date-picker v-model="formData.confirmDate" type="date" value-format="x" placeholder="选择验收日期" class="!w-full" :disabled="repairFieldsDisabled" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="维修结果" prop="repairResult">
+          <Editor v-model="formData.repairResult" height="150px" :readonly="repairFieldsDisabled" />
+        </el-form-item>
+      </template>
+    </el-form>
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="模具维修项目行" name="moldRepairLine">
+        <MoldRepairLineForm ref="moldRepairLineFormRef" :repair-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { MoldRepairApi, MoldRepairVO } from '@/api/mold/moldrepair'
+import { MoldRepairItemsApi } from '@/api/mold/moldRepairItems'
+import MoldRepairLineForm from './components/MoldRepairLineForm.vue'
+import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
+import { getSimpleUserList, UserVO } from '@/api/system/user'
+
+defineOptions({ name: 'MoldRepairForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref('')
+const isRepairMode = computed(() => formType.value === 'update' || formType.value === 'repair')
+const showRepairFields = computed(() => formType.value === 'update' || formType.value === 'repair')
+const repairFieldsDisabled = computed(() => formType.value !== 'repair')
+const isHydrating = ref(false)
+const emit = defineEmits(['success', 'closed'])
+const formData = ref({
+  id: undefined,
+  repairCode: undefined,
+  repairName: undefined,
+  moldId: undefined as number | undefined,
+  moldCode: undefined,
+  moldName: undefined,
+  machineryBrand: undefined,
+  machinerySpec: undefined,
+  requireDate: undefined,
+  finishDate: undefined,
+  confirmDate: undefined,
+  repairResult: '',
+  acceptedBy: undefined,
+  confirmBy: undefined,
+  status: undefined,
+  remark: undefined,
+})
+
+const moldLoading = ref(false)
+const moldOptions = ref<{ label: string; value: number; raw?: MoldVO }[]>([])
+const moldOptionsLoaded = ref(false)
+
+const users = ref<UserVO[]>([])
+
+const ensureUsersLoaded = async () => {
+  if (users.value.length) return
+  users.value = (await getSimpleUserList()) ?? []
+}
+
+const normalizeUserId = (value: any) => {
+  if (value === undefined || value === null || value === '') return undefined
+  const str = String(value)
+  if (/^\d+$/.test(str)) return str
+  const matched = users.value.find((u) => u.nickname === str)
+  return matched ? String(matched.id) : str
+}
+
+const upsertMoldOption = (
+  options: { label: string; value: number; raw?: MoldVO }[],
+  option: { label: string; value: number; raw?: MoldVO }
+) => {
+  const existed = options.some((o) => o.value === option.value)
+  return existed ? options : [option, ...options]
+}
+
+const toMoldOption = (item: any) => {
+  const id = typeof item?.id === 'number' ? item.id : Number(item?.id)
+  if (Number.isNaN(id)) return undefined
+  const code = item?.code ?? item?.moldCode
+  const name = item?.name ?? item?.moldName
+  const label = `${code ?? ''} ${name ?? ''}`.trim() || String(id)
+  return { label, value: id, raw: item as MoldVO }
+}
+
+const ensureMoldOptionsLoaded = async () => {
+  if (moldOptionsLoaded.value) return
+  moldLoading.value = true
+  try {
+    const data = await MoldBrandApi.getMoldPageWithoutPaging()
+    const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as any[]
+    moldOptions.value = rows.map(toMoldOption).filter(Boolean) as { label: string; value: number; raw?: MoldVO }[]
+    moldOptionsLoaded.value = true
+  } finally {
+    moldLoading.value = false
+  }
+}
+
+watch(
+  () => formData.value.moldId,
+  async (moldId) => {
+    if (isHydrating.value) return
+    if (typeof moldId !== 'number') {
+      formData.value.moldCode = undefined
+      formData.value.moldName = undefined
+      formData.value.machinerySpec = undefined
+      formData.value.machineryBrand = undefined
+      if (formType.value === 'create') setLineRows([])
+      return
+    }
+
+    const option = moldOptions.value.find((o) => o.value === moldId)
+    if (option?.raw) {
+      const raw: any = option.raw
+      const code = raw?.code ?? raw?.moldCode
+      const name = raw?.name ?? raw?.moldName
+      formData.value.moldCode = code
+      formData.value.moldName = name
+      formData.value.machinerySpec = raw?.moldType ?? raw?.spec ?? raw?.moldSpec
+      formData.value.machineryBrand = raw?.brandName ?? raw?.brand ?? raw?.moldBrand
+    }
+
+    await prefillLinesByMold(moldId as number)
+  }
+)
+const formRules = reactive({
+  repairCode: [{ required: true, message: '维修单编号不能为空', trigger: 'blur' }],
+  moldId: [{ required: true, message: '模具不能为空', trigger: 'change' }],
+})
+const formRef = ref()
+
+const subTabsName = ref('moldRepairLine')
+const moldRepairLineFormRef = ref()
+
+const setLineRows = (rows: any[]) => {
+  moldRepairLineFormRef.value?.setData(rows)
+}
+
+const normalizeMoldRepairItemList = (data: any) => {
+  const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as any[]
+  return rows
+}
+
+const toMoldRepairLineRow = (item: any) => {
+  const subjectId = item?.subjectId ?? item?.id
+  return {
+    id: undefined,
+    repairId: formData.value.id,
+    subjectId,
+    subjectCode: item?.subjectCode ?? item?.subject_code ?? item?.code,
+    subjectName: item?.subjectName ?? item?.subject_name ?? item?.name,
+    subjectType: item?.subjectType ?? item?.subject_type ?? item?.type,
+    subjectContent: item?.subjectContent ?? item?.projectContent ?? item?.subject_content,
+    subjectStandard: item?.subjectStandard ?? item?.judgmentCriteria ?? item?.subject_standard,
+    malfunction: undefined,
+    malfunctionUrl: undefined,
+    repairDes: undefined,
+    remark: undefined,
+  }
+}
+
+const prefillLinesByMold = async (moldId: number | undefined) => {
+  if (formType.value !== 'create') return
+  if (typeof moldId !== 'number') {
+    setLineRows([])
+    return
+  }
+  const data = await MoldRepairItemsApi.getRepairItemsPage({ pageNo: 1, pageSize: 100, moldId })
+  const list = normalizeMoldRepairItemList(data)
+  setLineRows(list.map(toMoldRepairLineRow))
+}
+
+let openRequestId = 0
+
+const open = async (type: string, id?: number) => {
+  const currentOpenId = ++openRequestId
+  dialogVisible.value = true
+  dialogTitle.value = type === 'repair' ? '维修' : t('action.' + type)
+  formType.value = type
+  resetForm()
+  await ensureUsersLoaded()
+  await ensureMoldOptionsLoaded()
+  if (currentOpenId !== openRequestId) return
+  if (id) {
+    formLoading.value = true
+    try {
+      isHydrating.value = true
+      formData.value = await MoldRepairApi.getMoldRepair(id)
+
+      if (currentOpenId !== openRequestId) return
+
+      ;(formData.value as any).requireDate = (formData.value as any).requireDate ?? undefined
+      ;(formData.value as any).finishDate = (formData.value as any).finishDate ?? undefined
+      ;(formData.value as any).confirmDate = (formData.value as any).confirmDate ?? undefined
+      ;(formData.value as any).repairResult = (formData.value as any).repairResult ?? ''
+
+      ;(formData.value as any).acceptedBy = normalizeUserId((formData.value as any).acceptedBy)
+      ;(formData.value as any).confirmBy = normalizeUserId((formData.value as any).confirmBy)
+
+      ;(formData.value as any).moldCode = (formData.value as any).moldCode ?? (formData.value as any).machineryCode
+      ;(formData.value as any).moldName = (formData.value as any).moldName ?? (formData.value as any).machineryName
+      const rawMoldId = (formData.value as any).moldId
+      const rawMachineryId = (formData.value as any).machineryId
+      const resolvedMoldId =
+        typeof rawMoldId === 'number'
+          ? rawMoldId
+          : typeof rawMachineryId === 'number'
+            ? rawMachineryId
+            : Number(rawMachineryId)
+
+      delete (formData.value as any).machineryId
+      delete (formData.value as any).machineryCode
+      delete (formData.value as any).machineryName
+      if (typeof resolvedMoldId === 'number' && !Number.isNaN(resolvedMoldId)) {
+        formData.value.moldId = resolvedMoldId
+        const label = `${formData.value.moldCode ?? ''} ${formData.value.moldName ?? ''}`.trim() || `ID:${resolvedMoldId}`
+        moldOptions.value = upsertMoldOption(moldOptions.value, { label, value: resolvedMoldId })
+      }
+    } finally {
+      isHydrating.value = false
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open })
+
+const handleDialogClosed = () => {
+  openRequestId++
+  emit('closed')
+}
+
+onBeforeUnmount(() => {
+  openRequestId++
+})
+
+const submitForm = async () => {
+  await formRef.value.validate()
+  try {
+    await moldRepairLineFormRef.value.validate()
+  } catch {
+    subTabsName.value = 'moldRepairLine'
+    return
+  }
+  formLoading.value = true
+  try {
+    const data = { ...(formData.value as any) } as MoldRepairVO & { moldId?: number; componentId?: number }
+      ;(data as any).acceptedBy = normalizeUserId((data as any).acceptedBy)
+      ;(data as any).confirmBy = normalizeUserId((data as any).confirmBy)
+      ;(data as any).moldCode = (data as any).moldCode ?? (data as any).machineryCode
+      ;(data as any).moldName = (data as any).moldName ?? (data as any).machineryName
+
+    delete (data as any).machineryId
+    delete (data as any).machineryCode
+    delete (data as any).machineryName
+    if (formType.value === 'repair') {
+      ;(data as any).status = 1
+    }
+    ;(data as any).moldId = formData.value.moldId
+    ;(data as any).moldRepairLines = moldRepairLineFormRef.value.getData()
+    if (formType.value === 'create') {
+      await MoldRepairApi.createMoldRepair(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MoldRepairApi.updateMoldRepair(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    repairCode: undefined,
+    repairName: undefined,
+    moldId: undefined,
+    moldCode: undefined,
+    moldName: undefined,
+    machineryBrand: undefined,
+    machinerySpec: undefined,
+    requireDate: undefined,
+    finishDate: undefined,
+    confirmDate: undefined,
+    repairResult: '',
+    acceptedBy: undefined,
+    confirmBy: undefined,
+    status: undefined,
+    remark: undefined,
+  }
+  moldOptionsLoaded.value = false
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mold/moldrepair/components/MoldRepairLineForm.vue b/src/views/mold/moldrepair/components/MoldRepairLineForm.vue
new file mode 100644
index 00000000..fcf57642
--- /dev/null
+++ b/src/views/mold/moldrepair/components/MoldRepairLineForm.vue
@@ -0,0 +1,109 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+      <el-table-column label="维修编码" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.subjectCode`" :rules="formRules.subjectCode" class="mb-0px!">
+            <el-input v-model="row.subjectCode" placeholder="请输入维修编码" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修名称" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.subjectName`" :rules="formRules.subjectName" class="mb-0px!">
+            <el-input v-model="row.subjectName" placeholder="请输入维修名称" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修内容" min-width="300">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.subjectContent`" :rules="formRules.subjectContent" class="mb-0px!">
+            <el-input type="textarea" v-model="row.subjectContent" placeholder="请输入维修内容" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加维修项目</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { MoldRepairApi } from '@/api/mold/moldrepair'
+
+const props = defineProps<{
+  repairId: undefined
+}>()
+const formLoading = ref(false)
+const formData = ref([])
+const formRules = reactive({
+  repairId: [{ required: true, message: '维修单ID不能为空', trigger: 'blur' }],
+  subjectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+  subjectCode: [{ required: true, message: '项目编码不能为空', trigger: 'blur' }],
+  subjectContent: [{ required: true, message: '项目内容不能为空', trigger: 'blur' }],
+})
+const formRef = ref()
+
+watch(
+  () => props.repairId,
+  async (val) => {
+    formData.value = []
+    if (!val) {
+      return
+    }
+    try {
+      formLoading.value = true
+      formData.value = await MoldRepairApi.getMoldRepairLineListByRepairId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    repairId: undefined,
+    subjectId: undefined,
+    subjectCode: undefined,
+    subjectName: undefined,
+    subjectType: undefined,
+    subjectContent: undefined,
+    subjectStandard: undefined,
+    malfunction: undefined,
+    malfunctionUrl: undefined,
+    repairDes: undefined,
+    remark: undefined,
+  }
+  row.repairId = props.repairId
+  formData.value.push(row)
+}
+
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+const validate = () => {
+  return formRef.value.validate()
+}
+
+const getData = () => {
+  return formData.value
+}
+
+const setData = (rows: any[]) => {
+  formData.value = Array.isArray(rows) ? rows : []
+}
+
+defineExpose({ validate, getData, setData })
+</script>
+
diff --git a/src/views/mold/moldrepair/index.vue b/src/views/mold/moldrepair/index.vue
new file mode 100644
index 00000000..da5fa15a
--- /dev/null
+++ b/src/views/mold/moldrepair/index.vue
@@ -0,0 +1,286 @@
+<template>
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="维修单号" prop="repairCode">
+        <el-input
+          v-model="queryParams.repairCode" placeholder="请输入维修单编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="维修单" prop="repairName">
+        <el-input
+          v-model="queryParams.repairName" placeholder="请输入维修单名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+
+      <el-form-item label="模具编码" prop="moldCode">
+        <el-input v-model="queryParams.moldCode" placeholder="请输入模具编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+
+      <el-form-item label="模具名称" prop="moldName">
+        <el-input v-model="queryParams.moldName" placeholder="请输入模具名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+
+      <el-form-item label="报修日期" prop="requireDate">
+        <el-date-picker
+          v-model="queryParams.requireDate" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="完成日期" prop="finishDate">
+        <el-date-picker
+          v-model="queryParams.finishDate" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="验收日期" prop="confirmDate">
+        <el-date-picker
+          v-model="queryParams.confirmDate" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="维修人员" prop="acceptedBy">
+        <el-input
+          v-model="queryParams.acceptedBy" placeholder="请输入维修人员" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px">
+          <el-option v-for="opt in statusOptions" :key="opt.value" :label="opt.label" :value="opt.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 type="primary" plain @click="openForm('create')" v-hasPermi="['mes:dv-repair:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['mes:dv-repair:delete']">
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
+        <el-button
+          type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['mes:dv-repair:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </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-column type="selection" width="55" fixed="left" reserve-selection />
+      <el-table-column label="维修单号" align="center" prop="repairCode" />
+      <el-table-column label="维修单" align="center" prop="repairName" />
+      <el-table-column label="模具名称" align="center" prop="moldName">
+        <template #default="scope">
+          {{ scope.row.moldName ?? scope.row.machineryName ?? '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="模具编码" align="center" prop="moldCode">
+        <template #default="scope">
+          {{ scope.row.moldCode ?? scope.row.machineryCode ?? '-' }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="品牌" align="center" prop="machineryBrand" />
+      <el-table-column label="规格型号" align="center" prop="machinerySpec" />
+      <el-table-column label="设备类型" align="center" prop="machineryTypeId" width="100px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_MACHINE_TYPE" :value="scope.row.machineryTypeId" />
+        </template>
+      </el-table-column> -->
+      <el-table-column label="报修日期" align="center" prop="requireDate" :formatter="dateFormatter2" width="110px" />
+      <el-table-column label="完成日期" align="center" prop="finishDate" :formatter="dateFormatter2" width="110px" />
+      <el-table-column label="验收日期" align="center" prop="confirmDate" :formatter="dateFormatter2" width="110px" />
+      <el-table-column label="维修结果" align="center" prop="repairResult" />
+      <el-table-column label="维修人员" align="center" prop="acceptedBy" />
+      <el-table-column label="验收人员" align="center" prop="confirmBy" />
+      <el-table-column label="单据状态" align="center" prop="status" width="110px">
+        <template #default="scope">
+          <el-tag :type="getStatusTagType(scope.row.status)" effect="light">
+            {{ getStatusLabel(scope.row.status) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="170px"
+        fixed="right" />
+      <el-table-column label="操作" align="center" fixed="right" width="200px">
+        <template #default="scope">
+          <el-button
+            link type="primary" @click="openForm('repair', scope.row.id)"
+            v-if="String(scope.row.status) !== '1'" v-hasPermi="['mes:dv-repair:update']">维修</el-button>
+          <el-button
+            link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:dv-repair:update']">
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:dv-repair:delete']">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <MoldRepairForm v-if="formVisible" ref="formRef" @success="getList" @closed="formVisible = false" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { MoldRepairApi, MoldRepairVO } from '@/api/mold/moldrepair'
+import MoldRepairForm from './MoldRepairForm.vue'
+
+defineOptions({ name: 'MoldRepair' })
+
+const message = useMessage()
+const { t } = useI18n()
+
+const loading = ref(true)
+const list = ref<MoldRepairVO[]>([])
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  repairCode: undefined,
+  repairName: undefined,
+  machineryId: undefined,
+  moldCode: undefined,
+  moldName: undefined,
+  machineryCode: undefined,
+  machineryName: undefined,
+  machineryBrand: undefined,
+  machinerySpec: undefined,
+  machineryTypeId: undefined,
+  requireDate: [],
+  finishDate: [],
+  confirmDate: [],
+  repairResult: undefined,
+  acceptedBy: undefined,
+  confirmBy: undefined,
+  status: undefined,
+  remark: undefined,
+  createTime: [],
+})
+const queryFormRef = ref()
+const exportLoading = ref(false)
+
+const statusOptions = [
+  { label: '待完成', value: '0' },
+  { label: '已完成', value: '1' }
+]
+
+const getStatusLabel = (value: any) => {
+  const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (v === '0') return '待完成'
+  if (v === '1') return '已完成'
+  return '-'
+}
+
+const getStatusTagType = (value: any) => {
+  const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (v === '1') return 'success'
+  if (v === '0') return 'warning'
+  return 'info'
+}
+
+const tableRef = ref()
+const selectedIds = ref<number[]>([])
+const handleSelectionChange = (rows: any[]) => {
+  selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const params = {
+      ...queryParams,
+      moldCode: queryParams.moldCode ?? queryParams.machineryCode,
+      moldName: queryParams.moldName ?? queryParams.machineryName,
+      machineryCode: queryParams.machineryCode ?? queryParams.moldCode,
+      machineryName: queryParams.machineryName ?? queryParams.moldName
+    }
+    const data = await MoldRepairApi.getMoldRepairPage(params)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const formRef = ref()
+const formVisible = ref(false)
+
+const openForm = async (type: string, id?: number) => {
+  formVisible.value = true
+  await nextTick()
+  formRef.value?.open(type, id)
+}
+
+const buildIdsParam = (ids: number | number[]) => {
+  return Array.isArray(ids) ? ids.join(',') : String(ids)
+}
+
+const handleDelete = async (ids: number | number[]) => {
+  try {
+    await message.delConfirm()
+    const idsParam = buildIdsParam(ids)
+    await MoldRepairApi.deleteMoldRepair(idsParam)
+    message.success(t('common.delSuccess'))
+    selectedIds.value = []
+    tableRef.value?.clearSelection?.()
+    await getList()
+  } catch { }
+}
+
+const handleBatchDelete = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要删除的数据')
+    return
+  }
+  await handleDelete(selectedIds.value)
+}
+
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await MoldRepairApi.exportMoldRepair(
+      selectedIds.value.length
+        ? {
+            ids: selectedIds.value.join(','),
+          }
+        : queryParams
+    )
+    download.excel(data, '设备维修记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/mold/repairItems/MoldRepairItemsForm.vue b/src/views/mold/repairItems/MoldRepairItemsForm.vue
new file mode 100644
index 00000000..c2fa06c3
--- /dev/null
+++ b/src/views/mold/repairItems/MoldRepairItemsForm.vue
@@ -0,0 +1,173 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+      <el-form-item label="维修编码" prop="subjectCode">
+        <el-input v-model="formData.subjectCode" placeholder="请输入维修编码" />
+      </el-form-item>
+      <el-form-item label="维修名称" prop="subjectName">
+        <el-input v-model="formData.subjectName" placeholder="请输入维修名称" />
+      </el-form-item>
+      <el-form-item label="模具" prop="moldId">
+        <el-select
+          v-model="formData.moldId"
+          filterable
+          remote
+          reserve-keyword
+          clearable
+          :remote-method="handleDeviceSearch"
+          :loading="deviceLoading"
+          placeholder="请选择模具"
+          class="!w-full"
+        >
+          <el-option v-for="opt in deviceOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维修内容" prop="projectContent">
+        <el-input v-model="formData.projectContent" placeholder="请输入维修内容" type="textarea" />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnable">
+        <el-radio-group v-model="formData.isEnable">
+          <el-radio v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value" :label="dict.value">
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { MoldRepairItemsApi, MoldRepairItemVO } from '@/api/mold/moldRepairItems'
+import { useDictStoreWithOut } from '@/store/modules/dict'
+import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
+
+defineOptions({ name: 'MoldRepairItemsForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dictStore = useDictStoreWithOut()
+const dictReady = ref(false)
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref('')
+const formRef = ref()
+
+const formData = ref({
+  id: undefined as number | undefined,
+  subjectCode: undefined as string | undefined,
+  subjectName: undefined as string | undefined,
+  moldId: undefined as number | undefined,
+  projectContent: undefined as string | undefined,
+  isEnable: undefined as string | undefined
+})
+
+const deviceLoading = ref(false)
+const deviceOptions = ref<{ label: string; value: number }[]>([])
+
+const handleDeviceSearch = async (keyword: string) => {
+  deviceLoading.value = true
+  try {
+    const data = await MoldBrandApi.getMoldPage({
+      code: keyword || undefined,
+      name: keyword || undefined
+    })
+    const rows = (data?.list ?? []) as MoldVO[]
+    deviceOptions.value = rows
+      .filter((r) => typeof r?.id === 'number')
+      .map((r) => ({ label: `${r.code ?? ''} ${r.name ?? ''}`.trim(), value: r.id }))
+  } finally {
+    deviceLoading.value = false
+  }
+}
+const validateDeviceId = (_: any, value: any, callback: any) => {
+  if (value === undefined || value === null || value === '') {
+    callback(new Error('模具不能为空'))
+    return
+  }
+  callback()
+}
+
+const formRules = reactive({
+  subjectCode: [{ required: true, message: '项目编码不能为空', trigger: 'blur' }],
+  subjectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
+  moldId: [{ validator: validateDeviceId, trigger: 'change' }],
+  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'change' }]
+})
+
+const open = async (type: string, row?: any) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  if (!dictReady.value) {
+    await dictStore.setDictMap()
+    dictReady.value = true
+  }
+  if (type === 'update' && row) {
+    formData.value = {
+      id: row.id,
+      subjectCode: row.subjectCode,
+      subjectName: row.subjectName,
+      moldId: row.moldId !== undefined && row.moldId !== null ? Number(row.moldId) : undefined,
+      projectContent: row.projectContent,
+      isEnable: row.isEnable !== undefined && row.isEnable !== null ? String(row.isEnable) : undefined
+    }
+
+    if (typeof formData.value.moldId === 'number') {
+      const label = row.moldName ? String(row.moldName) : `ID:${formData.value.moldId}`
+      deviceOptions.value = [{ label, value: formData.value.moldId }]
+    }
+  }
+}
+
+defineExpose({ open })
+
+const emit = defineEmits(['success'])
+const submitForm = async () => {
+  await formRef.value.validate()
+  formLoading.value = true
+  try {
+    const data = {
+      id: formType.value === 'update' ? formData.value.id : undefined,
+      subjectCode: formData.value.subjectCode,
+      subjectName: formData.value.subjectName,
+      moldId: formData.value.moldId,
+      isEnable: formData.value.isEnable,
+      projectContent: formData.value.projectContent
+    } as unknown as MoldRepairItemVO
+
+    if (formType.value === 'create') {
+      await MoldRepairItemsApi.createRepairItem(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MoldRepairItemsApi.updateRepairItem(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    subjectCode: undefined,
+    subjectName: undefined,
+    moldId: undefined,
+    projectContent: undefined,
+    isEnable: true
+  }
+  deviceOptions.value = []
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mold/repairItems/index.vue b/src/views/mold/repairItems/index.vue
new file mode 100644
index 00000000..ac6e50f3
--- /dev/null
+++ b/src/views/mold/repairItems/index.vue
@@ -0,0 +1,188 @@
+<template>
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <el-form-item label="维修编码" prop="subjectCode">
+        <el-input v-model="queryParams.subjectCode" placeholder="请输入维修编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="维修名称" prop="subjectName">
+        <el-input v-model="queryParams.subjectName" placeholder="请输入维修名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="维修内容" prop="projectContent">
+        <el-input
+          v-model="queryParams.projectContent"
+          placeholder="请输入维修内容"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </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 type="primary" plain @click="openForm('create')">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="danger" plain @click="handleBatchDelete" :disabled="!selectedIds.length">
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </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-column type="selection" width="55" fixed="left" reserve-selection />
+      <el-table-column label="维修编码" align="center" prop="subjectCode" min-width="130" :formatter="cellOrDash" />
+      <el-table-column label="维修名称" align="center" prop="subjectName" min-width="160" :formatter="cellOrDash" />
+      <el-table-column label="模具名称" align="center" prop="moldName" min-width="160" :formatter="cellOrDash" />
+      <el-table-column label="维修内容" align="center" prop="projectContent" min-width="200" :formatter="cellOrDash" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateOrDash" width="180" />
+      <el-table-column label="操作" align="center" width="140" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row)">编辑</el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+  </ContentWrap>
+
+  <MoldRepairItemsForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { MoldRepairItemsApi, MoldRepairItemVO } from '@/api/mold/moldRepairItems'
+import MoldRepairItemsForm from './MoldRepairItemsForm.vue'
+
+defineOptions({ name: 'MoldRepairItems' })
+
+const message = useMessage()
+const { t } = useI18n()
+
+const loading = ref(true)
+const list = ref<MoldRepairItemVO[]>([])
+const total = ref(0)
+const exportLoading = ref(false)
+
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  subjectCode: undefined as string | undefined,
+  subjectName: undefined as string | undefined,
+  projectContent: undefined as string | undefined,
+  createTime: [] as string[]
+})
+
+const queryFormRef = ref()
+const tableRef = ref()
+const selectedIds = ref<number[]>([])
+const formRef = ref()
+
+const cellOrDash = (_row: any, _column: any, cellValue: any) => {
+  if (cellValue === undefined || cellValue === null || cellValue === '') return '-'
+  return String(cellValue)
+}
+
+const dateOrDash = (row: any, column: any, cellValue: any) => {
+  const text = dateFormatter(row, column, cellValue)
+  if (text === undefined || text === null || text === '') return '-'
+  return String(text)
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MoldRepairItemsApi.getRepairItemsPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const handleSelectionChange = (rows: any[]) => {
+  selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
+const openForm = (type: string, row?: any) => {
+  formRef.value.open(type, row)
+}
+
+const buildIdsParam = (ids: number | number[]) => {
+  return Array.isArray(ids) ? ids.join(',') : String(ids)
+}
+
+const handleDelete = async (ids: number | number[]) => {
+  try {
+    await message.delConfirm()
+    await MoldRepairItemsApi.deleteRepairItems(buildIdsParam(ids))
+    message.success(t('common.delSuccess'))
+    selectedIds.value = []
+    tableRef.value?.clearSelection?.()
+    await getList()
+  } catch {}
+}
+
+const handleBatchDelete = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要删除的数据')
+    return
+  }
+  await handleDelete(selectedIds.value)
+}
+
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const params = {
+      ...queryParams,
+      ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined
+    }
+    const data = await MoldRepairItemsApi.exportRepairItems(params)
+    download.excel(data, '模具维修项目.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+onMounted(async () => {
+  await getList()
+})
+</script>