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/mold/moldrepair/MoldRepairForm.vue b/src/views/mold/moldrepair/MoldRepairForm.vue
new file mode 100644
index 00000000..6c33f21a
--- /dev/null
+++ b/src/views/mold/moldrepair/MoldRepairForm.vue
@@ -0,0 +1,349 @@
+<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 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
+    }
+  }
+)
+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)
+}
+
+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>