From 2eeefcc18a0c9edea4189a2c3fd1fc12bad34d06 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 4 Jul 2024 11:25:32 +0800
Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=20=E7=82=B9=E6=A3=80=20=E4=BF=9D=E5=85=BB=20=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentInspectionMain/index.ts  |   6 +-
 src/api/eam/equipmentMaintenanceMain/index.ts |   6 +-
 src/api/eam/equipmentSpotCheckMain/index.ts   |   6 +-
 .../equipmentInspectionMain.data.ts           |   6 +-
 .../equipmentInspectionMain/finishForm1.vue   |  27 ++---
 .../equipmentInspectionMain/finishForm2.vue   |  18 +--
 .../eam/equipmentInspectionMain/index.vue     |  30 +----
 .../equipmentInspectionRecordMain.data.ts     |   5 +-
 .../equipmentMaintenanceMain/finishForm1.vue  | 103 ++----------------
 .../equipmentMaintenanceMain/finishForm2.vue  |  18 +--
 .../eam/equipmentMaintenanceMain/index.vue    |  30 +----
 .../equipmentSpotCheckMain.data.ts            |   5 +-
 .../equipmentSpotCheckMain/finishForm1.vue    |  34 +-----
 .../equipmentSpotCheckMain/finishForm2.vue    |  18 +--
 .../eam/equipmentSpotCheckMain/index.vue      |  11 +-
 .../equipmentSpotCheckRecordMain.data.ts      |   5 +-
 16 files changed, 80 insertions(+), 248 deletions(-)

diff --git a/src/api/eam/equipmentInspectionMain/index.ts b/src/api/eam/equipmentInspectionMain/index.ts
index 5ea08a095..6f2550029 100644
--- a/src/api/eam/equipmentInspectionMain/index.ts
+++ b/src/api/eam/equipmentInspectionMain/index.ts
@@ -68,9 +68,9 @@ export const updateEquipmentInspectionMain = async (data: EquipmentInspectionMai
   return await request.put({ url: `/eam/equipment-inspection-main/update`, data })
 }
 
-// 修改巡检工单主
-export const updateEquipmentInspection = async (data: EquipmentInspectionMainVO) => {
-  return await request.post({ url: `/eam/equipment-inspection-main/updateOrders`, data })
+// 验证巡检工单主
+export const verifyEquipmentInspectionMain = async (data: EquipmentInspectionMainVO) => {
+  return await request.post({ url: `/eam/equipment-inspection-main/verifyOrder`, data })
 }
 
 // 删除巡检工单主
diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts
index e257dd16a..e8b449834 100644
--- a/src/api/eam/equipmentMaintenanceMain/index.ts
+++ b/src/api/eam/equipmentMaintenanceMain/index.ts
@@ -70,9 +70,9 @@ 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 verifyEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-main/verifyOrder`, data })
 }
 
 // 删除设备保养工单主
diff --git a/src/api/eam/equipmentSpotCheckMain/index.ts b/src/api/eam/equipmentSpotCheckMain/index.ts
index c7c0fe718..bd0c0d547 100644
--- a/src/api/eam/equipmentSpotCheckMain/index.ts
+++ b/src/api/eam/equipmentSpotCheckMain/index.ts
@@ -66,9 +66,9 @@ export const updateEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainV
   return await request.put({ url: `/eam/equipment-spot-check-main/update`, data })
 }
 
-// 完成点检工单主
-export const updateEquipmentSpotCheck = async (data: EquipmentSpotCheckMainVO) => {
-  return await request.post({ url: `/eam/equipment-spot-check-main/updateOrders`, data })
+// 验证点检工单主
+export const verifyEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainVO) => {
+  return await request.post({ url: `/eam/equipment-spot-check-main/verifyOrder`, data })
 }
 
 // 删除点检工单主
diff --git a/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts b/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts
index 433e9dbb1..a5d413d53 100644
--- a/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts
+++ b/src/views/eam/equipmentInspectionMain/equipmentInspectionMain.data.ts
@@ -94,8 +94,10 @@ export const EquipmentInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否拍照',
     field: 'isPictures',
     sort: 'custom',
-    isSearch: true,
-    isForm: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     dictType: DICT_TYPE.FALSE_OR_TRUE,
     dictClass: 'string',
     form: {
diff --git a/src/views/eam/equipmentInspectionMain/finishForm1.vue b/src/views/eam/equipmentInspectionMain/finishForm1.vue
index 8be7d99b4..c9722f5c5 100644
--- a/src/views/eam/equipmentInspectionMain/finishForm1.vue
+++ b/src/views/eam/equipmentInspectionMain/finishForm1.vue
@@ -13,18 +13,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证时间" prop="verifyTime">
-            <el-date-picker
-              v-model="formData.verifyTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择验证时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -41,7 +29,10 @@ import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain
 import * as EquipmentInspectionMainApi from '@/api/eam/equipmentInspectionMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
-import {updateEquipmentInspection} from "@/api/eam/equipmentInspectionMain";
+import {
+  updateEquipmentInspection,
+  verifyEquipmentInspectionMain
+} from "@/api/eam/equipmentInspectionMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -63,9 +54,8 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  //verifyer: '',
   verifyContent: '',
-  verifyTime: '',
+  status:''
 })
 const formRules = reactive({
   // verifyer: [
@@ -76,9 +66,6 @@ const formRules = reactive({
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTime: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -102,8 +89,10 @@ const submitForm = async (val) => {
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
+   formData.value.status = '7'
+
    //发送数据
-   await EquipmentInspectionMainApi.updateEquipmentInspection(formData.value)
+   await EquipmentInspectionMainApi.verifyEquipmentInspectionMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentInspectionMain/finishForm2.vue b/src/views/eam/equipmentInspectionMain/finishForm2.vue
index f06d450c5..1755c28a7 100644
--- a/src/views/eam/equipmentInspectionMain/finishForm2.vue
+++ b/src/views/eam/equipmentInspectionMain/finishForm2.vue
@@ -7,11 +7,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>-->
 <!--          </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-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">
@@ -72,14 +72,16 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancePhone: [
-    { required: true, message: '巡检人电话不能为空', trigger: 'blur' },
+  startTime: [
+    { required: true, message: '巡检开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '巡检结束时间不能为空', trigger: 'blur' },
   ],
 })
 const basicFormRef = ref() // 表单 Ref
diff --git a/src/views/eam/equipmentInspectionMain/index.vue b/src/views/eam/equipmentInspectionMain/index.vue
index 8148ea401..13573deec 100644
--- a/src/views/eam/equipmentInspectionMain/index.vue
+++ b/src/views/eam/equipmentInspectionMain/index.vue
@@ -190,7 +190,7 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentInspectionMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 执行
     defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentInspectionMain:update'}), //作废
@@ -480,20 +480,8 @@ const getClosed1=(val)=> {
 const getData1=(val)=> {
   nextTick?.(async () => {
       console.log(val)
-
-      try {
-        const params = ref({
-          id: '',
-          status:'',
-        })
-        params.value.id = val
-        params.value.status = '7'
-        await EquipmentInspectionMainApi.updateEquipmentInspectionOrder(params.value)
-        message.success(t('工单已流转'))
-        // 刷新列表
-        await getList()
-      } catch {}
-
+      // 刷新列表
+      await getList()
     }
   )
 }
@@ -501,7 +489,6 @@ const getData1=(val)=> {
 //finishForm2 关闭按钮回传
 const getClosed2=(val)=> {
   nextTick?.(() => {
-    console.log(val)
     getList()
   })
 }
@@ -509,17 +496,6 @@ const getClosed2=(val)=> {
 //finishForm2 提交按钮回传
 const getData2=(val)=> {
   nextTick?.(async () => {
-    console.log(val)
-    // const params = ref({
-    //   id: '',
-    //   status: '',
-    // })
-    // params.value.id = val
-    // params.value.status = '5'
-    // // 发起
-    // await EquipmentInspectionMainApi.executeEquipmentInspectionOrder(params.value)
-    //message.success(t('工单已完成'))
-    // 刷新列表
     await getList()
   })
 }
diff --git a/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts b/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
index 6b740619b..ceeed384c 100644
--- a/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
+++ b/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
@@ -50,7 +50,10 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }
diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm1.vue b/src/views/eam/equipmentMaintenanceMain/finishForm1.vue
index 025d5aaff..7562df2c5 100644
--- a/src/views/eam/equipmentMaintenanceMain/finishForm1.vue
+++ b/src/views/eam/equipmentMaintenanceMain/finishForm1.vue
@@ -2,26 +2,9 @@
   <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="verifyer">
-            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="验证内容" prop="verifyContent">
-            <el-input v-model="formData.verifyContent" placeholder="请输入验证内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证时间" prop="verifyTime">
-            <el-date-picker
-              v-model="formData.verifyTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择验证时间">
-            </el-date-picker>
+            <el-input v-model="formData.verifyContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入验证内容" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -40,6 +23,7 @@
 import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
+import {verifyEquipmentMaintenanceMain} from "@/api/eam/equipmentMaintenanceMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -61,93 +45,18 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  verifyer: '',
   verifyContent: '',
-  verifyTime: '',
+  status:''
 })
 const formRules = reactive({
-  verifyer: [
-    { required: true, message: '验证人不能为空', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
   verifyContent: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTime: [
-    { 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
@@ -167,8 +76,10 @@ const submitForm = async (val) => {
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
+   formData.value.status = '7'
+
    //发送数据
-   await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(formData.value)
+   await EquipmentMaintenanceMainApi.verifyEquipmentMaintenanceMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
index 1e6c7b358..d62716ac9 100644
--- a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
+++ b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue
@@ -7,11 +7,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入保养人" :disabled="isDisabled"/>-->
 <!--          </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-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">
@@ -71,14 +71,16 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancePhone: [
-    { required: true, message: '保养人电话不能为空', trigger: 'blur' },
+  startTime: [
+    { required: true, message: '保养开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '保养结束时间不能为空', trigger: 'blur' },
   ],
 })
 const basicFormRef = ref() // 表单 Ref
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 1950e07be..4c13406f2 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -539,7 +539,6 @@ const searchFormClick = (searchData) => {
 //finishForm1 关闭按钮回传
 const getClosed1=(val)=> {
   nextTick?.(() => {
-    console.log(val)
     getList()
   })
 }
@@ -547,23 +546,8 @@ const getClosed1=(val)=> {
 //finishForm1 提交按钮回传
 const getData1=(val)=> {
     nextTick?.(async () => {
-      console.log(val)
-
-      try {
-          const params = ref({
-            id: '',
-            status:'',
-          })
-          params.value.id = val
-          params.value.status = '7'
-          await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value)
-          message.success(t('工单已流转'))
-          // 刷新列表
-          await getList()
-      } catch {}
-
-      }
-    )
+      await getList()
+    })
 }
 
 //finishForm2 关闭按钮回传
@@ -577,16 +561,6 @@ const getClosed2=(val)=> {
 //finishForm2 提交按钮回传
 const getData2=(val)=> {
     nextTick?.(async () => {
-        console.log(val)
-        // const params = ref({
-        //   id: '',
-        //   status: '',
-        // })
-        // params.value.id = val
-        // params.value.status = '5'
-        // // 发起
-        // await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
-        //message.success(t('工单已完成'))
         // 刷新列表
         await getList()
     })
diff --git a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
index f1581ad93..f4a4f08a8 100644
--- a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
+++ b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts
@@ -312,7 +312,10 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否拍照',
     field: 'isPictures',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     dictType: DICT_TYPE.FALSE_OR_TRUE,
     dictClass: 'string',
   },
diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
index da8b44232..7e96adfdc 100644
--- a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
+++ b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue
@@ -2,29 +2,12 @@
   <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="verifyer">-->
-<!--            <el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="验证内容" prop="verifyContent">
             <el-input v-model="formData.verifyContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入验证内容" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="验证时间" prop="verifyTime">
-            <el-date-picker
-              v-model="formData.verifyTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择验证时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -37,12 +20,9 @@
 
 </template>
 <script lang="ts" setup>
-import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
-import * as EquipmentInspectionMainApi from '@/api/eam/equipmentInspectionMain'
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentSpotCheckMainApi from "@/api/eam/equipmentSpotCheckMain";
-import {updateEquipmentSpotCheck} from "@/api/eam/equipmentSpotCheckMain";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -64,23 +44,15 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
- // verifyer: '',
   verifyContent: '',
-  verifyTime: '',
+  status : '',
   isRepair:"",
 })
 const formRules = reactive({
-  // verifyer: [
-  //   { required: true, message: '验证人不能为空', trigger: 'blur' },
-  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  // ],
   verifyContent: [
     { required: true, message: '验证内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  verifyTime: [
-    { required: true, message: '验证时间不能为空', trigger: 'blur' },
-  ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -105,8 +77,10 @@ const submitForm = async (val) => {
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
+   formData.value.status = '7'
+
    //发送数据
-   await EquipmentSpotCheckMainApi.updateEquipmentSpotCheck(formData.value)
+   await EquipmentSpotCheckMainApi.verifyEquipmentSpotCheckMain(formData.value)
    //把success函数传递到父页面
    emit('success',formData.value.id)
    dialogVisible.value = false
diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm2.vue b/src/views/eam/equipmentSpotCheckMain/finishForm2.vue
index 242e63158..b9bf1555b 100644
--- a/src/views/eam/equipmentSpotCheckMain/finishForm2.vue
+++ b/src/views/eam/equipmentSpotCheckMain/finishForm2.vue
@@ -7,11 +7,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>-->
 <!--          </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-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">
@@ -73,14 +73,16 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancePhone: [
-    { required: true, message: '巡检人电话不能为空', trigger: 'blur' },
+  startTime: [
+    { required: true, message: '点检开始时间不能为空', trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '点检结束时间不能为空', trigger: 'blur' },
   ],
 })
 const basicFormRef = ref() // 表单 Ref
diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue
index 3c3026348..1c1bd0fac 100644
--- a/src/views/eam/equipmentSpotCheckMain/index.vue
+++ b/src/views/eam/equipmentSpotCheckMain/index.vue
@@ -188,7 +188,7 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 执行
     defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentSpotCheckMain:update'}), //作废
@@ -507,15 +507,6 @@ const getClosed2=(val)=> {
 const getData2=(val)=> {
   nextTick?.(async () => {
     console.log(val)
-    // const params = ref({
-    //   id: '',
-    //   status: '',
-    // })
-    // params.value.id = val
-    // params.value.status = '5'
-    // 发起
-    //await EquipmentSpotCheckMainApi.executeEquipmentSpotCheckOrder(params.value)
-    //message.success(t('工单已完成'))
     // 刷新列表
     await getList()
   })
diff --git a/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts b/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
index 0a868ee9a..880f9ded5 100644
--- a/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
+++ b/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
@@ -250,7 +250,10 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }