diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 38a5811..efb2643 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 38a5811..efb2643 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 6cff9e2..5c474a1 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 38a5811..efb2643 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 6cff9e2..5c474a1 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index fb10946..940a7a4 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -98,7 +98,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 38a5811..efb2643 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 6cff9e2..5c474a1 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index fb10946..940a7a4 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -98,7 +98,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index f04e55b..81409c2 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -47,7 +47,7 @@
     { name: '标准配套设备', comp: TemplateTable },
     { name: '检定规程', comp: TemplateTable }]
 }
-const currentCompRef = ref()
+const baseInfoRef = ref()
 const current = ref('计量人员')
 const currentComp = shallowRef(baseInfo)
 watch(current, (newValue) => {
@@ -222,10 +222,12 @@
     },
   ).then(() => {
     current.value = '基本信息'
-    currentCompRef.value.submitForm().validate().then(() => {
+    console.log(baseInfoRef.value.submitForm(), '000')
+    baseInfoRef.value.submitForm().validate().then(() => {
       pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
+            ElMessage.success('新增成功')
             close()
           }
         })
@@ -347,7 +349,7 @@
           关闭
         </el-button>
       </template>
-      <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" />
+      <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
     <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
       <template #menu>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 38a5811..efb2643 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 6cff9e2..5c474a1 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index fb10946..940a7a4 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -98,7 +98,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index f04e55b..81409c2 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -47,7 +47,7 @@
     { name: '标准配套设备', comp: TemplateTable },
     { name: '检定规程', comp: TemplateTable }]
 }
-const currentCompRef = ref()
+const baseInfoRef = ref()
 const current = ref('计量人员')
 const currentComp = shallowRef(baseInfo)
 watch(current, (newValue) => {
@@ -222,10 +222,12 @@
     },
   ).then(() => {
     current.value = '基本信息'
-    currentCompRef.value.submitForm().validate().then(() => {
+    console.log(baseInfoRef.value.submitForm(), '000')
+    baseInfoRef.value.submitForm().validate().then(() => {
       pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
+            ElMessage.success('新增成功')
             close()
           }
         })
@@ -347,7 +349,7 @@
           关闭
         </el-button>
       </template>
-      <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" />
+      <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
     <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
       <template #menu>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a3eb850..9adca50 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -3,6 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f350d40..6afd53a 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,3 +107,49 @@
     data,
   })
 }
+
+// 设备检修保养验收单保存
+export function addAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/addAcceptanceCheck',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单提交
+export function submitAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单编辑
+export function updateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/updateAcceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单详情信息
+export function acceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/acceptanceCheckInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修保养验收单审批删除
+export function deleteAcceptanceCheck(data: object) {
+  return request({
+    url: '/acceptanceCheck/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
new file mode 100644
index 0000000..d02cee6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -0,0 +1,218 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+import { getEquipmentApplyList } from '@/api/device/checkList'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '4',
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    width: '120',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '送修人',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '申请日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  // 获取设备检修列表已完成
+  getEquipmentApplyList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    approvalStatus: '4',
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.applyNo" placeholder="申请编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.applyName" placeholder="申请名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 2cfe2e0..859b9b0 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -5,14 +5,14 @@
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
-import { getacceptanceCheckList } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
@@ -144,7 +144,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+    deleteAcceptanceCheck({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -256,7 +256,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -311,7 +311,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/train/edit/${row.id}`)
+      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -342,7 +342,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b7323f..de22d15 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,11 +3,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../checkList_interface'
+import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
+import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([])
@@ -27,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -45,7 +48,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '',
+  applyType: '9',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -186,6 +189,12 @@
   updateTime: '',
   version: '',
 })
+const checkIdObject = ref({
+  applyName: '',
+  applyPersonName: '',
+  time: '',
+  applyNo: '',
+})
 // 检修设备列表数据
 const list = ref<object[]>([])
 // 审批弹窗开关
@@ -240,13 +249,14 @@
     required: true,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
+const checkListRef = ref()
+// 检修申请编号按钮
+const selectPerson = () => {
+  checkListRef.value.initDialog()
+}
 // 标准配套设备更换表格分页
 const changePage = () => {}
+
 // 添加表格数据对象
 const addList = ref({})
 // 检修结果下拉框
@@ -266,9 +276,9 @@
 }
 const rules = ref({
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '检修申请名称不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -303,7 +313,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.fileList[0].minioFileName = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -337,7 +347,7 @@
 }
 // 获取详情信息
 const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
+  acceptanceCheckInfo({ id: infoId.value }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -364,23 +374,112 @@
   return ruleFormRef.value
 }
 defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addAcceptanceCheck(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateAcceptanceCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
     }
     else {
-      applyList.value.select = '3'
+      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
     }
-    applyShow.value = true
+  }
+  else {
+    clickBtn(item)
   }
 }
 // 点击增加行
@@ -391,6 +490,11 @@
 const handleVisibleClose = () => {
   dialogVisible.value = false
 }
+// 选择完负责人的函数
+const confirmPerson = (object: object) => {
+  formInline.value.acceptanceCheckId = object.id
+  checkIdObject.value = object
+}
 // 标准配套设备更换表格删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
@@ -440,7 +544,7 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -452,10 +556,10 @@
         :inline="true"
         :model="formInline"
         label-position="right"
-        label-width="130px"
+        label-width="110px"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
             <el-form-item label="验收单编号:">
               <el-input
@@ -475,29 +579,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+            <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="检修申请编号"
+                v-model="checkIdObject.applyNo"
+                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
                 :disabled="pageType === 'detail'"
-              />
+              >
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPerson"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="checkIdObject.applyName"
                 placeholder="检修申请名称"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="6">
-            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+            <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
-                v-model.trim="formInline.constructionStandardProject"
+                v-model.trim="formInline.overhaulPerson"
                 placeholder="检修保养人"
                 :disabled="pageType === 'detail'"
               />
@@ -506,62 +620,56 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="constructionStandardUnitName"
+              prop="time"
             >
               <el-date-picker
-                v-model="formInline.assessDate"
+                v-model="formInline.time"
                 style="width: 100%;"
                 type="datetime"
                 placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
+                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button>
+    <detail-block title="检修设备列表">
+      <!-- <template v-if="pageType !== 'detail'" #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template> -->
+    </detail-block>
     <el-table
       :data="list"
       border
@@ -594,7 +702,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <detail-block title="审批流程">
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
@@ -609,6 +717,8 @@
       </div>
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择用户列表组件 -->
+    <check-list ref="checkListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
@@ -652,17 +762,4 @@
   display: flex;
   justify-content: space-around;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 2b3c946..44335a6 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -12,7 +12,7 @@
 const props = defineProps({
   status: {
     type: String,
-    default: '0',
+    default: '',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 3247669..e22bc4c 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -5,7 +5,7 @@
 import type { IOptions } from '../checkList_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { addEquipmentApply, equipmentApplyInfo, updateEquipmentApply } from '@/api/device/checkList'
+import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,6 +13,7 @@
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
 import { submitApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 const loading = ref(false) // 表单加载状态
@@ -34,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   else {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存', '提交']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -222,7 +223,7 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
   applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -300,33 +301,68 @@
 if (pageType.value !== 'add') {
   getInfo()
 }
-
+// 保存后的id
+const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '提交' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        addEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          addEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
-  else if (item === '提交' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') {
     if (!formEl) { return }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        updateEquipmentApply(formInline.value).then((res) => {
-          if (res.code === 200) {
-            close()
-          }
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
         })
       }
     })
   }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
   else {
     clickBtn(item)
   }
@@ -352,7 +388,7 @@
       },
     ).then(() => {
       // 删除行
-      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
         return !SelectionList.value.includes(item)
       })
       ElMessage.success('删除成功')
@@ -366,15 +402,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 设备列表对象类型
+interface returnRowType {
+  id: string
+}
 // 设备列表添加
 const addRowMethods = (row: Array) => {
+  row.forEach((item: returnRowType, index: string) => {
+    formInline.value.equipmentList.push({ equipmentId: item.id })
+  })
   // 设备状态
-  if (row.length > 1) {
-    ElMessage.warning('只能选择一个设备')
-  }
-  else {
-    formInline.value.equipmentList.push(row[0])
-  }
+  formInline.value.equipmentInfoList.push(...row)
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -398,7 +436,12 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item, ruleFormRef)"
+        >
           {{ item }}
         </el-button>
         <el-button type="info" @click="close">
@@ -434,30 +477,42 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select v-model="formInline.applyUnit" :data="useDeptList" :placeholder="pageType === 'detail' ? '' : '申请单位'" :disabled="pageType === 'detail'" />
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :disabled="pageType === 'detail'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人:" prop="applyPerson">
-              <el-select v-model="formInline.applyPerson" :placeholder="pageType === 'detail' ? '' : '申请人'" :disabled="pageType === 'detail'" style="width: 100%;">
-                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in usePersonList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="time"
-            >
+            <el-form-item label="检修时间:" prop="time">
               <el-date-picker
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
                 placeholder="请选择检修时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY/MM/DD HH:mm"
+                value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -477,36 +532,45 @@
         </el-row>
       </el-form>
     </detail-page>
-    <div class="header">
-      <div class="title">
-        检修设备列表
-      </div>
-      <span class="btns">
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
         <!-- <el-button v-if="pageType !== 'detail'" type="primary">
           批量选择
         </el-button> -->
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button type="primary" @click="addRoow">
           增加行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
+        <el-button type="info" @click="removeRow">
           删除行
         </el-button>
-      </span>
-    </div>
+      </template>
+    </detail-block>
     <el-table
-      :data="formInline.equipmentList"
+      :data="formInline.equipmentInfoList"
       border
       style="width: 100%;"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+      <el-table-column
+        v-for="(item, index) in columns"
+        :key="index"
+        align="center"
+        :label="item.text"
+        :width="item.width"
+        :prop="item.value"
+      >
         <template #header>
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input v-if="item.text !== '有效日期'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input
+            v-if="item.text !== '有效日期'"
+            v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+            class="input"
+          />
           <el-date-picker
             v-else
             v-model="scope.row[item.value]"
@@ -528,7 +592,10 @@
             :key="index"
             :timestamp="activity.timestamp"
           >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            <div>
+              <span>审批人：</span>{{ activity.name }}
+              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </div>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 38a5811..efb2643 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 6cff9e2..5c474a1 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -49,8 +49,8 @@
   ],
 
 }
-const menu = ref<menuType[]>([
-  { name: '全部', value: '0' },
+const menus = ref<menuType[]>([
+  { name: '全部', value: '' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
   { name: '审批中', value: '3' },
@@ -61,7 +61,7 @@
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('0')
+const currentApprovalStatus = ref('')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index fb10946..940a7a4 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -98,7 +98,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index f04e55b..81409c2 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -47,7 +47,7 @@
     { name: '标准配套设备', comp: TemplateTable },
     { name: '检定规程', comp: TemplateTable }]
 }
-const currentCompRef = ref()
+const baseInfoRef = ref()
 const current = ref('计量人员')
 const currentComp = shallowRef(baseInfo)
 watch(current, (newValue) => {
@@ -222,10 +222,12 @@
     },
   ).then(() => {
     current.value = '基本信息'
-    currentCompRef.value.submitForm().validate().then(() => {
+    console.log(baseInfoRef.value.submitForm(), '000')
+    baseInfoRef.value.submitForm().validate().then(() => {
       pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
+            ElMessage.success('新增成功')
             close()
           }
         })
@@ -347,7 +349,7 @@
           关闭
         </el-button>
       </template>
-      <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" />
+      <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
     <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
       <template #menu>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a3eb850..9adca50 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -3,6 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 38a5811..e060a8b 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -49,7 +49,7 @@
   ],
 
 }
-const menu = ref<menuType[]>([
+const menus = ref<menuType[]>([
   { name: '全部', value: '0' },
   { name: '草稿箱', value: '1' },
   { name: '待审批', value: '2' },
@@ -86,7 +86,7 @@
     <div class="btns">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentTab">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>