diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts
index 1a0396846..e257dd16a 100644
--- a/src/api/eam/equipmentMaintenanceMain/index.ts
+++ b/src/api/eam/equipmentMaintenanceMain/index.ts
@@ -70,6 +70,11 @@ export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceM
   return await request.put({ url: `/eam/equipment-maintenance-main/update`, data })
 }
 
+// 修改设备保养工单主
+export const updateEquipmentMaintenance = async (data: EquipmentMaintenanceMainVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-main/updateOrders`, data })
+}
+
 // 删除设备保养工单主
 export const deleteEquipmentMaintenanceMain = async (id: number) => {
   return await request.delete({ url: `/eam/equipment-maintenance-main/delete?id=` + id })
diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts
index 471f98905..0d83bcb3e 100644
--- a/src/api/eam/equipmentRepairJobMain/index.ts
+++ b/src/api/eam/equipmentRepairJobMain/index.ts
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {EquipmentReportRepairRequestVO} from "@/api/eam/equipmentReportRepairRequest";
 
 export interface EquipmentRepairJobMainVO {
   id: number
@@ -72,6 +71,16 @@ export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainV
   return await request.put({ url: `/eam/equipment-repair-job-main/update`, data })
 }
 
+// 修改维修工单主
+export const updateEquipmentRepairMain = async (data: EquipmentRepairJobMainVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-main/updateRepair`, data })
+}
+
+// 完成维修工单主
+export const executeEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-main/execute`, data })
+}
+
 // 删除维修工单主
 export const deleteEquipmentRepairJobMain = async (id: number) => {
   return await request.delete({ url: `/eam/equipment-repair-job-main/delete?id=` + id })
diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
index 60b73fe59..946493a41 100644
--- a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
+++ b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
@@ -50,6 +50,7 @@
 import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
+import {updateEquipmentMaintenance} from "@/api/eam/equipmentMaintenanceMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -168,15 +169,17 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const submitForm = async (val) => {
 
-   //把success函数传递到父页面
-   emit('success',formData.value.id)
+
    // 校验表单
    if (!basicFormRef) return
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
    //发送数据
-   await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(formData.value)
+   await EquipmentMaintenanceMainApi.updateEquipmentMaintenance(formData.value);
+
+   //把success函数传递到父页面
+   emit('success',formData.value.id)
    dialogVisible.value = false
 }
 
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index e4219bc6d..d9f106904 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -547,7 +547,7 @@ const getData2=(val)=> {
         params.value.status = '5'
         // 发起
         await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
-        message.success(t('工单已完成'))
+        //message.success(t('工单已完成'))
         // 刷新列表
         await getList()
     })
diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
index 4be0eadb5..2b9c97950 100644
--- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
+++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
@@ -245,6 +245,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/eam/equipmentRepairJobMain/finishForm2.vue b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
new file mode 100644
index 000000000..9228d1980
--- /dev/null
+++ b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
@@ -0,0 +1,262 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
+    <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="维修描述" prop="maintenanceDesc">
+            <el-input v-model="formData.maintenanceDesc" placeholder="请输入维修描述" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="维修级别" prop="level">
+            <el-select v-model="formData.level" placeholder="请选择维修级别" style="width: 150px">
+              <el-option label="大修" value="0"></el-option>
+              <el-option label="中修" value="1"></el-option>
+              <el-option label="小修" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="维修开始时间" prop="startTime">
+            <el-date-picker
+              v-model="formData.startTime"
+              type="datetime"
+              value-format="x"
+              placeholder="选择维修开始时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="维修结束时间" prop="endTime">
+            <el-date-picker
+              v-model="formData.endTime"
+              type="datetime"
+              value-format="x"
+              placeholder="选择维修结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="执行人" prop="maintenancer">
+            <el-input v-model="formData.maintenancer" placeholder="请输入执行人"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="维修人电话" prop="maintenancePhone">
+            <el-input v-model="formData.maintenancePhone" placeholder="请输入维修人电话" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="结果" prop="completeResult">
+            <el-select v-model="formData.completeResult" placeholder="请选择结果" style="width: 150px">
+              <el-option label="完成" value="0"></el-option>
+              <el-option label="临时措施" value="1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
+      <el-button @click="handleClose('close')">取 消</el-button>
+    </template>
+  </Dialog>
+
+<!--添加巡检项弹窗-->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+
+</template>
+<script lang="ts" setup>
+import * as EquipmentRepairJobMainApi from '@/api/eam/equipmentRepairJobMain'
+import { SearchTable } from '@/components/SearchTable'
+import {ElInput} from "element-plus";
+import {updateEquipmentRepairMain} from "@/api/eam/equipmentRepairJobMain";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const tags=ref([])
+
+const inputValue = ref('')
+const inputVisible = ref(false)
+const isDisabled = ref(false)
+const InputRef = ref<InstanceType<typeof ElInput>>()
+
+
+const formData = ref({
+  id:'',
+  number:'',
+  maintenanceDesc: '',
+  level: '',
+  startTime:'',
+  endTime:'',
+  maintenancer:'',
+  maintenancePhone:'',
+  completeResult:'',
+})
+const formRules = reactive({
+  maintenanceDesc: [
+    { required: true, message: '维修描述不能为空', trigger: 'blur' },
+  ],
+  level: [
+    { required: true, message: '维修等级不能为空', trigger: 'blur' },
+  ],
+  startTime: [
+    { required: true, message: '开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '结束时间不能为空', trigger: 'blur' },
+  ],
+  maintenancer: [
+    { required: true, message: '维修人ID不能为空', trigger: 'blur' },
+  ],
+  maintenancePhone: [
+    { required: true, message: '维修人电话不能为空', trigger: 'blur' },
+  ],
+  completeResult: [
+    { required: true, message: '结果不能为空', trigger: 'blur' },
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+// /** 弹窗相关参数 */
+// const searchTableRef = ref();
+// const _searchTableTitle = ref();
+// const _searchTableAllSchemas = ref();
+// const _searchTablePage = ref();
+// const _formField = ref();
+// const _searchField = ref();
+// const _multiple = ref();
+// const _type = ref();
+// const _row = ref();
+// const _searchCondition = ref({})
+//
+//
+// const addItem = () =>{
+//   addItemCommon(true,'xunJianItem')
+// }
+//
+// /** 选择巡检项弹窗 */
+// const addItemCommon = (multiple,field) => {
+//   _searchCondition.value = {}
+//   const filters: any[] = []
+//   filters.push({
+//     action: "==",
+//     column: 'available',
+//     value: 'TRUE'
+//   })
+//   // 参数整理
+//   _searchCondition.value.isSearch = true
+//   _searchCondition.value.filters = filters
+//   _searchTableTitle.value = '选择巡检项'
+//   _multiple.value = multiple
+//   _formField.value = field
+//   _searchField.value = field
+//   _searchTablePage.value = inspectionItemApi.getInspectionItemPage
+//   _searchTableAllSchemas.value = InspectionItem.allSchemas
+//   openCommon()
+// }
+//
+// /** 弹窗选择之后  回调函数 添加选择集 */
+// const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+//   nextTick?.(() => {
+//       if (formField === 'xunJianItem') {
+//           val.forEach(item => {
+//             const isExist = tags.value.some(tag => tag.content === item.content);
+//             if (!isExist){
+//               const newItem = {};
+//               newItem['content'] = item.content;
+//               newItem['id'] = item.id;
+//               tags.value.push(newItem);
+//             }
+//           });
+//       }
+//   })
+// }
+// /*打开弹窗*/
+// const openCommon = () => {
+//   searchTableRef.value.open(
+//     _searchTableTitle.value,
+//     _searchTableAllSchemas.value,
+//     _searchTablePage.value,
+//     _formField.value,
+//     _searchField.value,
+//     _multiple.value,
+//     _type.value,
+//     _row.value,
+//     _searchCondition.value
+//   )
+// }
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  //初始化数据
+  formData.value.id = row.id
+  formData.value.number = row.number
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async (val) => {
+
+
+   // 校验表单
+   if (!basicFormRef) return
+   const valid = await basicFormRef.value.validate()
+   if (!valid) return
+
+   //发送数据
+   await EquipmentRepairJobMainApi.updateEquipmentRepairMain(formData.value);
+
+   //把success函数传递到父页面
+   emit('success',formData.value.id)
+   dialogVisible.value = false
+}
+
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
+}
+
+// 传递给父类
+const emit = defineEmits(['close','success'])
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index 2d5d60699..dbfbfb27e 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -50,6 +50,8 @@
     :isBusiness="false"
   />
 
+  <FinishForm2 ref="finishForm2Ref" @success="getData2" @close="getClosed2"/>
+
   <!-- 详情 -->
   <Detail ref="detailRef"
           :isBasic="false"
@@ -78,6 +80,12 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue'
+import FinishForm2 from '@/views/eam/equipmentRepairJobMain/finishForm2.vue'
+import * as EquipmentMaintenanceMainApi from "@/api/eam/equipmentMaintenanceMain";
+import {
+  executeEquipmentRepairJobMain,
+  executEquipmentRepairJobMain
+} from "@/api/eam/equipmentRepairJobMain";
 
 defineOptions({ name: 'EquipmentRepairJobMain' })
 
@@ -174,6 +182,8 @@ const buttonTableClick = async (val, row) => {
     handleReceive(row.id)
   } else if (val == 'execute') { // 执行
     handleExecute(row.id)
+  } else if (val == 'finish') { // 完成
+    handleFinish(row)
   }
 
 
@@ -220,6 +230,16 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentRepairJobMain')
 }
 
+/** 完成按钮操作 */
+const finishForm2Ref = ref()
+const handleFinish = async (row) => {
+  // 二次确认
+  await message.delConfirm('是否完成所选中工单？');
+
+  //打开提交表单
+  finishForm2Ref.value.open('update', row);
+}
+
 /** 接单按钮操作 */
 const handleReceive = async (id: number) => {
   try {
@@ -271,6 +291,32 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+
+
+//finishForm2 关闭按钮回传
+const getClosed2=(val)=> {
+  nextTick?.(() => {
+    getList()
+  })
+}
+
+//finishForm2 提交按钮回传
+const getData2=(val)=> {
+  nextTick?.(async () => {
+    const params = ref({
+      id: '',
+      status: '',
+    })
+    params.value.id = val
+    params.value.status = '5'
+    // 发起
+    await EquipmentRepairJobMainApi.executeEquipmentRepairJobMain(params.value)
+    message.success(t('工单已完成'))
+    // 刷新列表
+    await getList()
+  })
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {