diff --git a/src/api/mes/dvrepair/index.ts b/src/api/mes/dvrepair/index.ts
index 1a191f32..edbe9d93 100644
--- a/src/api/mes/dvrepair/index.ts
+++ b/src/api/mes/dvrepair/index.ts
@@ -1,62 +1,62 @@
-import request from '@/config/axios'
-
-// 设备维修记录 VO
-export interface DvRepairVO {
-  id: number // ID
-  repairCode: string // 维修单编号
-  repairName: string // 维修单名称
-  machineryId: number // 设备ID
-  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 // 备注
-}
-
-// 设备维修记录 API
-export const DvRepairApi = {
-  // 查询设备维修记录分页
-  getDvRepairPage: async (params: any) => {
-    return await request.get({ url: `/mes/dv-repair/page`, params })
-  },
-
-  // 查询设备维修记录详情
-  getDvRepair: async (id: number) => {
-    return await request.get({ url: `/mes/dv-repair/get?id=` + id })
-  },
-
-  // 新增设备维修记录
-  createDvRepair: async (data: DvRepairVO) => {
-    return await request.post({ url: `/mes/dv-repair/create`, data })
-  },
-
-  // 修改设备维修记录
-  updateDvRepair: async (data: DvRepairVO) => {
-    return await request.put({ url: `/mes/dv-repair/update`, data })
-  },
-
-  // 删除设备维修记录
-  deleteDvRepair: async (id: number) => {
-    return await request.delete({ url: `/mes/dv-repair/delete?id=` + id })
-  },
-
-  // 导出设备维修记录 Excel
-  exportDvRepair: async (params) => {
-    return await request.download({ url: `/mes/dv-repair/export-excel`, params })
-  },
-
-// ==================== 子表（设备维修记录行） ====================
-
-  // 获得设备维修记录行列表
-  getDvRepairLineListByRepairId: async (repairId) => {
-    return await request.get({ url: `/mes/dv-repair/dv-repair-line/list-by-repair-id?repairId=` + repairId })
-  },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 设备维修记录 VO
+export interface DvRepairVO {
+  id: number // ID
+  repairCode: string // 维修单编号
+  repairName: string // 维修单名称
+  machineryId: number // 设备ID
+  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 // 备注
+}
+
+// 设备维修记录 API
+export const DvRepairApi = {
+  // 查询设备维修记录分页
+  getDvRepairPage: async (params: any) => {
+    return await request.get({ url: `/mes/dv-repair/page`, params })
+  },
+
+  // 查询设备维修记录详情
+  getDvRepair: async (id: number) => {
+    return await request.get({ url: `/mes/dv-repair/get?id=` + id })
+  },
+
+  // 新增设备维修记录
+  createDvRepair: async (data: DvRepairVO) => {
+    return await request.post({ url: `/mes/dv-repair/create`, data })
+  },
+
+  // 修改设备维修记录
+  updateDvRepair: async (data: DvRepairVO) => {
+    return await request.put({ url: `/mes/dv-repair/update`, data })
+  },
+
+  // 删除设备维修记录
+  deleteDvRepair: async (ids: string) => {
+    return await request.delete({ url: `/mes/dv-repair/delete?ids=` + ids })
+  },
+
+  // 导出设备维修记录 Excel
+  exportDvRepair: async (params) => {
+    return await request.download({ url: `/mes/dv-repair/export-excel`, params })
+  },
+
+// ==================== 子表（设备维修记录行） ====================
+
+  // 获得设备维修记录行列表
+  getDvRepairLineListByRepairId: async (repairId) => {
+    return await request.get({ url: `/mes/dv-repair/dv-repair-line/list-by-repair-id?repairId=` + repairId })
+  },
+}
diff --git a/src/api/mes/repairItems/index.ts b/src/api/mes/repairItems/index.ts
index 36daef4f..fc36d3a2 100644
--- a/src/api/mes/repairItems/index.ts
+++ b/src/api/mes/repairItems/index.ts
@@ -27,6 +27,10 @@ export const RepairItemsApi = {
     return await request.get({ url: `/mes/repair-tems/getComponentList`, params: { deviceId } })
   },
 
+  getDeviceOrComponentList: async (params: { deviceId: number; componentId?: number; deviceType: number }) => {
+    return await request.get({ url: `/mes/repair-tems/getDeviceOrComponentList`, params })
+  },
+
   createRepairItem: async (data: RepairItemVO) => {
     return await request.post({ url: `/mes/repair-tems/create`, data })
   },
diff --git a/src/views/mes/dvrepair/DvRepairForm.vue b/src/views/mes/dvrepair/DvRepairForm.vue
index f1ea0858..4d8c2662 100644
--- a/src/views/mes/dvrepair/DvRepairForm.vue
+++ b/src/views/mes/dvrepair/DvRepairForm.vue
@@ -1,102 +1,103 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
+  <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="请输入维修单编号" />
+            <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="请输入维修单名称" />
+            <el-input v-model="formData.repairName" placeholder="请输入维修单名称" :disabled="isRepairMode" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item label="设备类型" prop="machineryTypeId">
-        <el-radio-group v-model="formData.machineryTypeId">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_MACHINE_TYPE)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
+        <el-radio-group v-model="formData.machineryTypeId" :disabled="isRepairMode">
+          <el-radio :label="1">设备</el-radio>
+          <el-radio :label="2">关键件</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="设备ID" prop="machineryId">
-            <el-input v-model="formData.machineryId" placeholder="请输入设备ID" />
+          <el-form-item label="设备" prop="deviceId">
+            <el-select
+v-model="formData.deviceId" filterable clearable :loading="deviceLoading"
+              :disabled="isRepairMode" 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="machineryCode">
-            <el-input v-model="formData.machineryCode" placeholder="请输入设备编码" />
+          <el-form-item v-if="showComponentSelect" label="关键件" prop="componentId">
+            <el-select
+v-model="formData.componentId" clearable :loading="componentLoading" :disabled="isRepairMode"
+              placeholder="请选择关键件" class="!w-full">
+              <el-option
+v-for="opt in componentOptions" :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="machineryName">
-            <el-input v-model="formData.machineryName" placeholder="请输入设备名称" />
+          <el-form-item label="设备名称" prop="machineryName" :required="false">
+            <el-input v-model="formData.machineryName" placeholder="自动带出" disabled />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="规格型号" prop="machinerySpec">
-            <el-input v-model="formData.machinerySpec" placeholder="请输入规格型号" />
+          <el-form-item label="设备编码" prop="machineryCode" :required="false">
+            <el-input v-model="formData.machineryCode" placeholder="自动带出" disabled />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
-          <el-form-item label="维修人员" prop="acceptedBy">
-            <el-input v-model="formData.acceptedBy" placeholder="请输入维修人员" />
+          <el-form-item label="规格型号" prop="machinerySpec" :required="false">
+            <el-input v-model="formData.machinerySpec" placeholder="自动带出" disabled />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="验收人员" prop="confirmBy">
-            <el-input v-model="formData.confirmBy" placeholder="请输入验收人员" />
+          <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="requireDate">
-            <el-date-picker
-              v-model="formData.requireDate"
-              type="date"
-              value-format="x"
-              placeholder="选择报修日期"
-            />
-          </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="选择完成日期"
-            />
+          <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="confirmDate">
-            <el-date-picker
-              v-model="formData.confirmDate"
-              type="date"
-              value-format="x"
-              placeholder="选择验收日期"
-            />
+          <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>
-      <el-form-item label="维修结果" prop="repairResult">
-        <Editor v-model="formData.repairResult" height="150px" />
-      </el-form-item>
+
+      <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">
@@ -111,9 +112,11 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { DvRepairApi, DvRepairVO } from '@/api/mes/dvrepair'
 import DvRepairLineForm from './components/DvRepairLineForm.vue'
+import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
+import { RepairItemsApi } from '@/api/mes/repairItems'
+import { getSimpleUserList, UserVO } from '@/api/system/user'
 
 /** 设备维修记录 表单 */
 defineOptions({ name: 'DvRepairForm' })
@@ -125,10 +128,17 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const isRepairMode = computed(() => 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']) // 定义 success 事件，用于操作成功后的回调
 const formData = ref({
   id: undefined,
   repairCode: undefined,
   repairName: undefined,
+  deviceId: undefined as number | undefined,
+  componentId: undefined as number | undefined,
   machineryId: undefined,
   machineryCode: undefined,
   machineryName: undefined,
@@ -144,6 +154,131 @@ const formData = ref({
   status: undefined,
   remark: undefined,
 })
+
+const showComponentSelect = computed(() => formData.value.machineryTypeId === 2)
+
+const deviceLoading = ref(false)
+const deviceOptions = ref<{ label: string; value: number; raw?: DeviceLedgerVO }[]>([])
+const deviceOptionsLoaded = ref(false)
+
+const componentLoading = ref(false)
+const componentOptions = ref<{ label: string; value: number }[]>([])
+
+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 upsertDeviceOption = (
+  options: { label: string; value: number; raw?: DeviceLedgerVO }[],
+  option: { label: string; value: number; raw?: DeviceLedgerVO }
+) => {
+  const existed = options.some((o) => o.value === option.value)
+  return existed ? options : [option, ...options]
+}
+
+const toComponentOption = (item: any) => {
+  const id = typeof item?.id === 'number' ? item.id : Number(item?.id)
+  if (Number.isNaN(id)) return undefined
+  const code = item?.code ?? item?.componentCode ?? item?.subjectCode
+  const name = item?.name ?? item?.componentName ?? item?.subjectName
+  const label = `${code ?? ''} ${name ?? ''}`.trim() || String(id)
+  return { label, value: id }
+}
+
+const loadComponentOptionsByDeviceId = async (deviceId: number) => {
+  componentLoading.value = true
+  try {
+    const data = await RepairItemsApi.getComponentList(deviceId)
+    const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as any[]
+    componentOptions.value = rows.map(toComponentOption).filter(Boolean) as { label: string; value: number }[]
+  } finally {
+    componentLoading.value = false
+  }
+}
+
+const ensureDeviceOptionsLoaded = async () => {
+  if (deviceOptionsLoaded.value) return
+  deviceLoading.value = true
+  try {
+    const data = await DeviceLedgerApi.getDeviceLedgerPage({})
+    const rows = (data?.list ?? []) as DeviceLedgerVO[]
+    deviceOptions.value = rows
+      .filter((r) => typeof r?.id === 'number')
+      .map((r) => ({ label: `${r.deviceCode ?? ''} ${r.deviceName ?? ''}`.trim(), value: r.id, raw: r }))
+    deviceOptionsLoaded.value = true
+  } finally {
+    deviceLoading.value = false
+  }
+}
+
+watch(
+  () => formData.value.machineryTypeId,
+  (val) => {
+    if (isHydrating.value) return
+    formData.value.deviceId = undefined
+    formData.value.componentId = undefined
+    formData.value.machineryId = undefined
+    formData.value.machineryCode = undefined
+    formData.value.machineryName = undefined
+    formData.value.machineryBrand = undefined
+    formData.value.machinerySpec = undefined
+    componentOptions.value = []
+    setLineRows([])
+  }
+)
+
+watch(
+  () => formData.value.deviceId,
+  async (deviceId) => {
+    if (isHydrating.value) return
+    formData.value.componentId = undefined
+    componentOptions.value = []
+    if (typeof deviceId !== 'number') {
+      setLineRows([])
+    }
+
+    const option = deviceOptions.value.find((o) => o.value === deviceId)
+    if (option?.raw) {
+      formData.value.machineryCode = option.raw.deviceCode
+      formData.value.machineryName = option.raw.deviceName
+      formData.value.machinerySpec = option.raw.deviceSpec
+      formData.value.machineryBrand = option.raw.deviceBrand
+    }
+
+    if (formData.value.machineryTypeId === 2 && typeof deviceId === 'number') {
+      await loadComponentOptionsByDeviceId(deviceId)
+    }
+
+    if (formData.value.machineryTypeId === 1 && typeof deviceId === 'number') {
+      await prefillLinesByDeviceOrComponent({ deviceId, deviceType: 1 })
+    }
+  }
+)
+
+watch(
+  () => formData.value.componentId,
+  async (componentId) => {
+    if (isHydrating.value) return
+    if (formData.value.machineryTypeId !== 2) return
+    const deviceId = formData.value.deviceId
+    if (typeof deviceId !== 'number' || typeof componentId !== 'number') {
+      setLineRows([])
+      return
+    }
+    await prefillLinesByDeviceOrComponent({ deviceId, componentId, deviceType: 2 })
+  }
+)
 const formRules = reactive({
   repairCode: [{ required: true, message: '维修单编号不能为空', trigger: 'blur' }],
   machineryId: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }],
@@ -157,26 +292,106 @@ const formRef = ref() // 表单 Ref
 const subTabsName = ref('dvRepairLine')
 const dvRepairLineFormRef = ref()
 
+const normalizeDeviceOrComponentList = (data: any) => {
+  const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as any[]
+  return rows
+}
+
+const toDvRepairLineRow = (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 setLineRows = (rows: any[]) => {
+  dvRepairLineFormRef.value?.setData(rows)
+}
+
+const prefillLinesByDeviceOrComponent = async (params: { deviceId: number; componentId?: number; deviceType: number }) => {
+  if (formType.value !== 'create') return
+  const data = await RepairItemsApi.getDeviceOrComponentList(params)
+  const list = normalizeDeviceOrComponentList(data)
+  setLineRows(list.map(toDvRepairLineRow))
+}
+
+let openRequestId = 0
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
+  const currentOpenId = ++openRequestId
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  dialogTitle.value = type === 'repair' ? '维修' : t('action.' + type)
   formType.value = type
   resetForm()
+  await ensureUsersLoaded()
+  await ensureDeviceOptionsLoaded()
+  if (currentOpenId !== openRequestId) return
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
+      isHydrating.value = true
       formData.value = await DvRepairApi.getDvRepair(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)
+
+      const typeId = typeof formData.value.machineryTypeId === 'number' ? formData.value.machineryTypeId : Number(formData.value.machineryTypeId)
+      formData.value.machineryTypeId = Number.isNaN(typeId) ? formData.value.machineryTypeId : typeId
+
+      const deviceId = (formData.value as any).deviceId
+      const resolvedDeviceId = typeof deviceId === 'number' ? deviceId : formData.value.machineryId
+      if (typeof resolvedDeviceId === 'number') {
+        formData.value.deviceId = resolvedDeviceId
+        const label = `${formData.value.machineryCode ?? ''} ${formData.value.machineryName ?? ''}`.trim() || `ID:${resolvedDeviceId}`
+        deviceOptions.value = upsertDeviceOption(deviceOptions.value, { label, value: resolvedDeviceId })
+      }
+
+      if (formData.value.machineryTypeId === 2 && typeof formData.value.deviceId === 'number') {
+        await loadComponentOptionsByDeviceId(formData.value.deviceId)
+        const componentId = (formData.value as any).componentId
+        const resolvedComponentId = typeof componentId === 'number' ? componentId : Number(componentId)
+        if (!Number.isNaN(resolvedComponentId)) {
+          formData.value.componentId = resolvedComponentId
+        }
+      }
     } finally {
+      isHydrating.value = false
       formLoading.value = false
     }
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+const handleDialogClosed = () => {
+  openRequestId++
+  emit('closed')
+}
+
+onBeforeUnmount(() => {
+  openRequestId++
+})
+
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
@@ -190,7 +405,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as DvRepairVO
+    const data = { ...(formData.value as any) } as DvRepairVO & { deviceId?: number; componentId?: number }
+      ; (data as any).acceptedBy = normalizeUserId((data as any).acceptedBy)
+      ; (data as any).confirmBy = normalizeUserId((data as any).confirmBy)
+    if (formType.value === 'repair') {
+      ;(data as any).status = 1
+    }
+    if (typeof formData.value.deviceId === 'number') {
+      data.machineryId = formData.value.deviceId as any
+    }
+    ; (data as any).deviceId = formData.value.deviceId
+      ; (data as any).componentId = formData.value.machineryTypeId === 2 ? formData.value.componentId : undefined
     // 拼接子表的数据
     data.dvRepairLines = dvRepairLineFormRef.value.getData()
     if (formType.value === 'create') {
@@ -214,21 +439,25 @@ const resetForm = () => {
     id: undefined,
     repairCode: undefined,
     repairName: undefined,
+    deviceId: undefined,
+    componentId: undefined,
     machineryId: undefined,
     machineryCode: undefined,
     machineryName: undefined,
     machineryBrand: undefined,
     machinerySpec: undefined,
-    machineryTypeId: undefined,
+    machineryTypeId: 1,
     requireDate: undefined,
     finishDate: undefined,
     confirmDate: undefined,
-    repairResult: undefined,
+    repairResult: '',
     acceptedBy: undefined,
     confirmBy: undefined,
     status: undefined,
     remark: undefined,
   }
+  deviceOptionsLoaded.value = false
+  componentOptions.value = []
   formRef.value?.resetFields()
 }
 </script>
diff --git a/src/views/mes/dvrepair/components/DvRepairLineForm.vue b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
index 897b1a02..96066c1e 100644
--- a/src/views/mes/dvrepair/components/DvRepairLineForm.vue
+++ b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
@@ -161,5 +161,9 @@ const getData = () => {
   return formData.value
 }
 
-defineExpose({ validate, getData })
+const setData = (rows: any[]) => {
+  formData.value = Array.isArray(rows) ? rows : []
+}
+
+defineExpose({ validate, getData, setData })
 </script>
diff --git a/src/views/mes/dvrepair/index.vue b/src/views/mes/dvrepair/index.vue
index 6adedafd..fe87bf7f 100644
--- a/src/views/mes/dvrepair/index.vue
+++ b/src/views/mes/dvrepair/index.vue
@@ -1,118 +1,69 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <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"
-        />
+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"
-        />
+v-model="queryParams.repairName" placeholder="请输入维修单名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
 
       <el-form-item label="设备名称" prop="machineryName">
         <el-input
-          v-model="queryParams.machineryName"
-          placeholder="请输入设备名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.machineryName" 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"
-        />
+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"
-        />
+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"
-        />
+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"
-        />
+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="dict in getStrDictOptions(DICT_TYPE.MES_MOLD_RECORD_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <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']"
-        >
+        <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']"
-        >
+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>
@@ -121,7 +72,10 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <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="machineryName" />
@@ -133,60 +87,34 @@
           <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="180px"
-      />
-      <el-table-column
-        label="完成日期"
-        align="center"
-        prop="finishDate"
-        :formatter="dateFormatter2"
-        width="180px"
-      />
-      <el-table-column
-        label="验收日期"
-        align="center"
-        prop="confirmDate"
-        :formatter="dateFormatter2"
-        width="180px"
-      />
+      <el-table-column label="报修日期" align="center" prop="requireDate" :formatter="dateFormatter2" width="180px" />
+      <el-table-column label="完成日期" align="center" prop="finishDate" :formatter="dateFormatter2" width="180px" />
+      <el-table-column label="验收日期" align="center" prop="confirmDate" :formatter="dateFormatter2" width="180px" />
       <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">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MES_MOLD_RECORD_STATUS" :value="scope.row.status" />
+          <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="remark" />
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="170px"
-        fixed="right"
-      />
-      <el-table-column label="操作" align="center" fixed="right">
+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('update', scope.row.id)"
-            v-hasPermi="['mes:dv-repair:update']"
-          >
+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 link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:dv-repair:delete']">
             删除
           </el-button>
         </template>
@@ -194,20 +122,17 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <DvRepairForm ref="formRef" @success="getList" />
+  <DvRepairForm v-if="formVisible" ref="formRef" @success="getList" @closed="formVisible = false" />
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DvRepairApi, DvRepairVO } from '@/api/mes/dvrepair'
 import DvRepairForm from './DvRepairForm.vue'
@@ -245,6 +170,31 @@ const queryParams = reactive({
 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
@@ -271,21 +221,40 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const formVisible = ref(false)
+
+const openForm = async (type: string, id?: number) => {
+  formVisible.value = true
+  await nextTick()
+  formRef.value?.open(type, id)
 }
 
 /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const buildIdsParam = (ids: number | number[]) => {
+  return Array.isArray(ids) ? ids.join(',') : String(ids)
+}
+
+const handleDelete = async (ids: number | number[]) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await DvRepairApi.deleteDvRepair(id)
+    const idsParam = buildIdsParam(ids)
+    await DvRepairApi.deleteDvRepair(idsParam)
     message.success(t('common.delSuccess'))
+    selectedIds.value = []
+    tableRef.value?.clearSelection?.()
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
+}
+
+const handleBatchDelete = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要删除的数据')
+    return
+  }
+  await handleDelete(selectedIds.value)
 }
 
 /** 导出按钮操作 */
@@ -295,7 +264,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await DvRepairApi.exportDvRepair(queryParams)
+    const data = await DvRepairApi.exportDvRepair(
+      selectedIds.value.length
+        ? {
+            ids: selectedIds.value.join(',')
+          }
+        : queryParams
+    )
     download.excel(data, '设备维修记录.xls')
   } catch {
   } finally {