diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 1dd4ff9..189fbdc 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="pauseApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="2" />
+  <apply-list apply-type="2" :schedule="SCHEDULE.STANDARD_PAUSE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 1dd4ff9..189fbdc 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="pauseApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="2" />
+  <apply-list apply-type="2" :schedule="SCHEDULE.STANDARD_PAUSE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/resumeApply.vue b/src/views/device/standardEquipment/resumeApply.vue
index a23213a..cd48041 100644
--- a/src/views/device/standardEquipment/resumeApply.vue
+++ b/src/views/device/standardEquipment/resumeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="resumeApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="4" />
+  <apply-list apply-type="4" :schedule="SCHEDULE.STANDARD_RESUME_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 1dd4ff9..189fbdc 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="pauseApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="2" />
+  <apply-list apply-type="2" :schedule="SCHEDULE.STANDARD_PAUSE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/resumeApply.vue b/src/views/device/standardEquipment/resumeApply.vue
index a23213a..cd48041 100644
--- a/src/views/device/standardEquipment/resumeApply.vue
+++ b/src/views/device/standardEquipment/resumeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="resumeApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="4" />
+  <apply-list apply-type="4" :schedule="SCHEDULE.STANDARD_RESUME_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index a66fb7b..02d0fcc 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -128,7 +128,8 @@
 
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -172,7 +173,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 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 1dd4ff9..189fbdc 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="pauseApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="2" />
+  <apply-list apply-type="2" :schedule="SCHEDULE.STANDARD_PAUSE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/resumeApply.vue b/src/views/device/standardEquipment/resumeApply.vue
index a23213a..cd48041 100644
--- a/src/views/device/standardEquipment/resumeApply.vue
+++ b/src/views/device/standardEquipment/resumeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="resumeApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="4" />
+  <apply-list apply-type="4" :schedule="SCHEDULE.STANDARD_RESUME_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index a66fb7b..02d0fcc 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -128,7 +128,8 @@
 
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -172,7 +173,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '标准装置列表', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 72271a5..467148d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -230,13 +230,33 @@
 const handleClose = () => {
   applyShow.value = false
 }
-
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
 // 点击数据后的操作按钮
 const clickBtn = (row: ISupplier, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
       $router.push(`/source/edit/${row.id}`)
       break

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 1dd4ff9..189fbdc 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="pauseApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="2" />
+  <apply-list apply-type="2" :schedule="SCHEDULE.STANDARD_PAUSE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/resumeApply.vue b/src/views/device/standardEquipment/resumeApply.vue
index a23213a..cd48041 100644
--- a/src/views/device/standardEquipment/resumeApply.vue
+++ b/src/views/device/standardEquipment/resumeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="resumeApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="4" />
+  <apply-list apply-type="4" :schedule="SCHEDULE.STANDARD_RESUME_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index a66fb7b..02d0fcc 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -128,7 +128,8 @@
 
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -172,7 +173,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '标准装置列表', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 72271a5..467148d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -230,13 +230,33 @@
 const handleClose = () => {
   applyShow.value = false
 }
-
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
 // 点击数据后的操作按钮
 const clickBtn = (row: ISupplier, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
       $router.push(`/source/edit/${row.id}`)
       break
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 4d0bdad..b0b2dd5 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,7 +2,7 @@
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
-import type { IOptions } from '../list_interface'
+import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 525909d..f350d40 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -44,3 +44,66 @@
     data,
   })
 }
+
+// 设备检修保养验收单列表
+export function getacceptanceCheckList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/acceptanceCheck/acceptanceCheckList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请新建
+export function addEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/addEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请详情信息
+export function equipmentApplyInfo(data: object) {
+  return request({
+    url: '/equipmentApply/equipmentApplyInfo',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备维护列表
+export function getEquipmentApplyList(data: { limit: number; offset: number }) {
+  return request({
+    url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请提交
+export function submitEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/submitEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请删除
+export function deleteEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/deleteEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
+// 设备检修申请编辑
+export function updateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/updateEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index c28e9ba..a5d557a 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 点击提交
+export function submitStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 3d73df2..993d66c 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -187,18 +187,6 @@
           auth: '/standard/expirationRemind',
         },
       },
-      // {
-      //   path: 'expirationRemind/:type/:id?',
-      //   name: 'fixedAssetsDetail',
-      //   component: () => import('@/views/device/standardEquipment/components/standardListAdd.vue'),
-      //   meta: {
-      //     title: '到期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/standard/expirationRemind',
-      //   },
-      // },
       {
         path: 'changeApply',
         name: 'changeApply',
@@ -416,12 +404,24 @@
         name: 'maintenanceList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceList.vue'),
         meta: {
-          title: '设备维护列表',
+          title: '设备检修列表',
           icon: 'ep:key',
           auth: '/device/maintenanceList',
         },
       },
       {
+        path: 'maintenanceList/:type/:id?',
+        name: 'maintenanceAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        meta: {
+          title: '设备检修列表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceList',
+        },
+      },
+      {
         path: 'maintenanceCheckList',
         name: 'maintenanceCheckList',
         component: () => import('@/views/device/deviceMaintenance/maintenanceCheckList.vue'),
@@ -432,6 +432,18 @@
         },
       },
       {
+        path: 'maintenanceCheckList/:type/:id?',
+        name: 'maintenanceCheckAdd',
+        component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
+        meta: {
+          title: '设备检修保养验收单',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/maintenance/maintenanceCheckList',
+        },
+      },
+      {
         path: 'manageCheckList',
         name: 'manageCheckList',
         component: () => import('@/views/device/deviceMaintenance/manageCheckList.vue'),
@@ -453,37 +465,6 @@
           activeMenu: '/maintenance/manageCheckList',
         },
       },
-      {
-        path: ':type/:id?',
-        name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'),
-        meta: {
-          title: '设备维护列表',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/maintenance/maintenanceList',
-        },
-        beforeEnter: (to, from, next) => {
-          const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
-          switch (type) {
-            case 'maintenanceList':
-              to.meta.activeMenu = '/maintenance/maintenanceList'
-              to.meta.title = '设备维护列表'
-              break
-            case 'maintenanceCheckList':
-              to.meta.activeMenu = '/maintenance/maintenanceCheckList'
-              to.meta.title = '设备检修保养验收单'
-              break
-            case 'manageCheckList':
-              to.meta.activeMenu = '/maintenance/manageCheckList'
-              to.meta.title = '设备管理点检查表'
-              break
-          }
-          next()
-        },
-      },
     ],
   },
   {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index fc2cfa7..b1d51bf 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -35,3 +35,8 @@
   remark: string
   updateTime: null | string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+}
diff --git a/src/views/device/deviceMaintenance/components/listApply/all.vue b/src/views/device/deviceMaintenance/components/listApply/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue b/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/canceled.vue b/src/views/device/deviceMaintenance/components/listApply/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue b/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue b/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPage.vue b/src/views/device/deviceMaintenance/components/listApply/listPage.vue
deleted file mode 100644
index d269b33..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPage.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 初始化路由
-const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张飒' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '申请编号',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请类型',
-    value: 'name',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '标准代码',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '标准所在部门',
-    value: 'name',
-    width: '110',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请部门',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '申请时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 审批弹窗开关
-const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  name: string
-}
-// 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
-  ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
-    })
-}
-// // 点击编辑/详情
-// const handleEdit = (index: string, row: rowReturn, value: string) => {
-//   if (value === '查看' || value === '编辑') {
-//     buttonArray.value = ['同意', '驳回', '拒绝']
-//     buttonType.value = value
-//     infoId.value = row.id
-//     show.value = false
-//   }
-//   else if (value === '删除' || value === '取消' || value === '提交') {
-//     handleDelete(row, value)
-//   }
-//   else {
-//     if (value === '同意') {
-//       applyList.value.select = '1'
-//     }
-//     else if (value === '驳回') {
-//       applyList.value.select = '2'
-//     }
-//     else {
-//       applyList.value.select = '3'
-//     }
-//     applyList.value.approval = row.name
-//     applyList.value.approvalTime = row.name
-//     applyShow.value = true
-//   }
-// }
-const pageTypeMap = ref('')
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/maintenance/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    if (pageType === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (pageType === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.name
-    applyList.value.approvalTime = row.name
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击搜索
-const searchList = () => {
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const add = () => {
-  $router.push('/maintenance/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  handleClose()
-}
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-        <search-item style="width: 15%;">
-          <el-select
-            v-model.trim="listQuery.businessContent"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
deleted file mode 100644
index 5b4b6c7..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/listPageAdd.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-console.log($route.meta.title)
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
-const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: null,
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-})
-// 数据
-const list = ref<object[]>([
-  { name: '王五' },
-])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
-  },
-  {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<object[]>([
-  {
-    text: '文件名称',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '上传时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '文件说明',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '附件文档',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const rules = ref({
-}) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
-}
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    console.log(item)
-  }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
-}
-// 点击增加行
-const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleVisibleClose()
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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)">
-          {{ item }}
-        </el-button>
-        <el-button type="warning" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :inline="true"
-        :model="formInline"
-        label-position="left"
-        label-width="auto"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="constructionStandardProject">
-              <el-input
-                v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item
-              label="检修时间:"
-              prop="constructionStandardUnitName"
-            >
-              <el-date-picker
-                v-model="formInline.assessDate"
-                type="datetime"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="false" :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
-                :disabled="pageType === 'detail'"
-              />
-            </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>
-        <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>
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        申请文档
-      </div>
-      <span class="btns">
-        <el-button v-if="pageType !== 'detail'" type="primary">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </span>
-    </div>
-    <normal-table
-      :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-      :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-    />
-    <div class="header">
-      <div class="title">
-        审批流程
-      </div>
-    </div>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/listApply/notPass.vue b/src/views/device/deviceMaintenance/components/listApply/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApply/passed.vue b/src/views/device/deviceMaintenance/components/listApply/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/device/deviceMaintenance/components/listApply/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
new file mode 100644
index 0000000..2cfe2e0
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -0,0 +1,429 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+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 ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+  applyName: '',
+  applyNo: '',
+  applyType: '',
+  businessKeys: [],
+  checkApplyNo: '',
+  checkEndDate: '',
+  checkStartDate: '',
+  createUser: '',
+  ids: [],
+  overhaulPerson: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    text: '验收单编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '验收单名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '检修申请编号',
+    value: 'checkApplyNo',
+    align: 'center',
+  },
+  {
+    text: '检修申请名称',
+    value: 'checkApplyName',
+    align: 'center',
+  },
+  {
+    text: '检修保养人',
+    value: 'overhaulPerson',
+    align: 'center',
+  },
+  {
+    text: '检修日期',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getacceptanceCheckList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
+    applyName: '',
+    applyNo: '',
+    applyType: '',
+    businessKeys: [],
+    checkApplyNo: '',
+    checkEndDate: '',
+    checkStartDate: '',
+    createUser: '',
+    ids: [],
+    overhaulPerson: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('maintenanceCheckList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/train/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="检修申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.overhaulPerson"
+          placeholder="检修保养人"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="检查日期开始时间"
+          end-placeholder="检查日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
new file mode 100644
index 0000000..9b7323f
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -0,0 +1,668 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../checkList_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+console.log($route.meta.title)
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [
+    {
+      abc: '',
+      abcName: '',
+      assetNo: '',
+      assetSource: '',
+      assetType: '',
+      assetTypeName: '',
+      attribute: '',
+      capitalSource: '',
+      capitalSourceName: '',
+      cardEstablishmentDate: '',
+      createTime: '',
+      createUser: 0,
+      depreciationMethod: '',
+      depreciationMethodName: '',
+      depreciationPeriod: 0,
+      enableDate: '',
+      equipmentCategory: '',
+      equipmentCategoryName: '',
+      equipmentName: '',
+      equipmentNo: '',
+      equipmentSpecifications: '',
+      equipmentType: '',
+      equipmentTypeName: '',
+      fileList: [
+        {
+          assetId: 0,
+          createTime: '',
+          createUser: 0,
+          fileName: '',
+          id: 0,
+          isDel: 0,
+          minioFileName: '',
+          remark: '',
+          updateTime: '',
+        },
+      ],
+      id: 0,
+      installIncidentalExpenses: '',
+      installPlace: '',
+      intactState: '',
+      isCalibrationTestEquipment: 0,
+      isDel: 0,
+      isFixedAssets: 0,
+      isMeasureAccount: 0,
+      isStandardSupportEquipment: 0,
+      labelBind: '',
+      majorCategory: '',
+      majorCategoryName: '',
+      managerLevel: '',
+      managerLevelName: '',
+      managerState: '',
+      managerStateName: '',
+      manufacturer: '',
+      manufacturerCountry: '',
+      manufacturingDate: '',
+      manufacturingNo: '',
+      mesureCycle: 0,
+      mesureDate: '',
+      mesureDept: 0,
+      mesureRange: '',
+      mesureResult: '',
+      mesureResultName: '',
+      mesureType: '',
+      mesureTypeName: '',
+      modelNo: '',
+      originValue: 0,
+      overallDimension: '',
+      presentOriginValue: 0,
+      purpose: '',
+      remark: '',
+      singlePrice: 0,
+      supportStandardEquipmentName: '',
+      supportStandardEquipmentNo: '',
+      technicalLevel: '',
+      uncertainty: '',
+      updateTime: '',
+      useDept: 0,
+      useDeptName: '',
+      usePerson: 0,
+      usePersonName: '',
+      validDate: '',
+      version: 0,
+      weight: 0,
+    },
+  ],
+  equipmentList: [
+    {
+      applyId: '',
+      assetOriginValue: 0,
+      createTime: '',
+      createUser: '',
+      equipmentId: '',
+      equipmentName: '',
+      equipmentNo: '',
+      financialValue: 0,
+      id: 0,
+      isDel: 0,
+      measureRange: '',
+      overhaulIdea: '',
+      overhaulResult: '',
+      overhaulResultName: '',
+      remark: '',
+      updateTime: '',
+      useDept: '',
+      usePerson: '',
+    },
+  ],
+  fileList: [
+    {
+      applyId: 0,
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: 0,
+  isDel: 0,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 检修设备列表数据
+const list = ref<object[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修结果',
+    value: 'xinghao',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '检修意见',
+    value: 'xinghao',
+    width: '450px',
+    align: 'center',
+    required: true,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 检修结果下拉框
+const options = ref([
+  { name: '已维修,可用', id: '1' },
+  { name: '已维修,未修好', id: '2' },
+  { name: '未维修', id: '3' },
+  { name: '其他', id: '4' },
+])
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+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' }],
+}) // 表单验证规则
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 获取详情信息
+const getInfo = () => {
+  getStandardListDetail({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+const fileRef = ref() // 文件上传input
+
+// 点击上传文件按钮
+const upload = () => {
+  fileRef.value.click()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+
+// 点击顶部一排按钮
+const getAddList = (item: string) => {
+  if (item === '提交' || item === '保存') {
+    console.log(item)
+  }
+  else {
+    if (item === '同意') {
+      applyList.value.select = '1'
+    }
+    else if (item === '驳回') {
+      applyList.value.select = '2'
+    }
+    else {
+      applyList.value.select = '3'
+    }
+    applyShow.value = true
+  }
+}
+// 点击增加行
+const addRoow = () => {
+  list.value.push(JSON.parse(JSON.stringify(addList.value)))
+}
+// 点击关闭
+const handleVisibleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      list.value = list.value.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="130px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="验收单编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="验收单编号、自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="验收单名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="验收单名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请编号:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请编号"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修申请名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修保养人:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                placeholder="检修保养人"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="检修日期:"
+              prop="constructionStandardUnitName"
+            >
+              <el-date-picker
+                v-model="formInline.assessDate"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="请选择检修日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.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>
+            </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>
+        <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>
+    <el-table
+      :data="list"
+      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">
+        <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-select
+            v-else
+            v-model="scope.row[item.value]"
+            clearable
+            placeholder="计划编号"
+            size="default"
+            :disabled="pageType === 'detail'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 253 253);
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+.dialog-buts {
+  width: 100%;
+  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
new file mode 100644
index 0000000..2b3c946
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="listMaintenanceApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IOptions } from '../checkList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTree } from '@/api/system/plan'
+import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } 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',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyType: '7',
+  applyUnit: '',
+  businessKeys: [],
+  createUser: '',
+  endTime: '',
+  ids: [],
+  processResult: '',
+  startTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  {
+    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 $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+  taskId: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteEquipmentApply({ id: row.id, taskId: row.taskId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 装载时间数组
+const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
+    applyName: '',
+    applyNo: '',
+    applyPerson: '',
+    applyType: '7',
+    applyUnit: '',
+    businessKeys: [],
+    createUser: '',
+    endTime: '',
+    ids: [],
+    processResult: '',
+    startTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  checkTimeArr.value = []
+}
+// 点击跳转
+const add = () => {
+  $router.push('/maintenance/maintenanceList/add')
+}
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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
+  }
+  fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier, type: string) => {
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row, 'detail')
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      goDetail(row, 'edit')
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.checkApplyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <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-item>
+        <el-date-picker
+          v-model="checkTimeArr"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          start-placeholder="申请日期开始时间"
+          end-placeholder="申请日期结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
new file mode 100644
index 0000000..3247669
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -0,0 +1,579 @@
+<script lang="ts" setup name="maintenanceAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+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 { UploadFile } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+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 addRow from '@/views/device/stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'detail') {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['提交']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+// 逻辑代码
+const formInline = ref({
+  acceptanceCheckId: '',
+  applyDesc: '',
+  applyName: '',
+  applyNo: '',
+  applyPerson: '',
+  applyPersonName: '',
+  applyType: '7',
+  applyTypeName: '',
+  applyUnit: '',
+  applyUnitName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  createTime: '',
+  createUser: '',
+  equipmentInfoList: [],
+  equipmentList: [],
+  fileList: [
+    {
+      applyId: null,
+      createTime: '',
+      createUser: null,
+      fileName: '',
+      id: null,
+      isDel: null,
+      minioFileName: '',
+      remark: '',
+      updateTime: '',
+    },
+  ],
+  id: null,
+  isDel: null,
+  overhaulPerson: '',
+  processId: '',
+  processResult: '',
+  remark: '',
+  taskId: '',
+  time: '',
+  updateTime: '',
+  version: '',
+})
+// 审批弹窗信息收集类型
+interface ListType {
+  equipmentName: string
+  equipmentNo: string
+  modelNo: string
+  mesureRange: string
+  useDeptName: string
+  usePersonName: string
+  managerStateName: string
+  validDate: string
+  equipmentSpecifications: string
+  manufacturingNo: string
+  manufacturer: string
+}
+// 数据
+const list = ref<ListType[]>([])
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
+}
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '160px',
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 标准配套设备更换表格分页
+const changePage = () => {}
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 审批流程
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: '时间不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+// 获取部门列表
+getDeptTreeList().then((res) => {
+  // 转成树结构
+  useDeptList.value = toTreeList(res.data, '0', true)
+})
+// 获取用户列表
+getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  usePersonList.value = res.data.rows
+})
+// 审批结束回调
+const approvalSuccess = () => {
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: formInline.value.taskId!,
+    comments: '',
+  }
+  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
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  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()
+          }
+        })
+      }
+    })
+  }
+  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()
+          }
+        })
+      }
+    })
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击增加行
+const addRoow = () => {
+  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
+  addRowRef.value.initDialog({ title: '' })
+}
+
+// 标准配套设备更换表格删除行
+const removeRow = () => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      // 删除行
+      formInline.value.equipmentList = formInline.value.equipmentList.filter((item) => {
+        return !SelectionList.value.includes(item)
+      })
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+// 设备列表添加
+const addRowMethods = (row: Array) => {
+  // 设备状态
+  if (row.length > 1) {
+    ElMessage.warning('只能选择一个设备')
+  }
+  else {
+    formInline.value.equipmentList.push(row[0])
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+</script>
+
+<template>
+  <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)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                placeholder="申请编号"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                placeholder="申请名称"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </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'" />
+            </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <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"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                placeholder="备注"
+                :disabled="pageType === 'detail'"
+              />
+            </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> -->
+        <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>
+    <el-table
+      :data="formInline.equipmentList"
+      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">
+        <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-date-picker
+            v-else
+            v-model="scope.row[item.value]"
+            type="datetime"
+            placeholder="请选择考核日期"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="pageType === 'detail'"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <detail-block v-if="pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.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/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 5143309..9f8f98b 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,7 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -117,40 +117,17 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
-          getselectCheckInfo(formInline.value).then((res) => {
-            if (res.code === '200') {
+          getAddCheckInfo(formInline.value).then((res) => {
+            if (res.code === 200) {
               close()
             }
           })
         }
-        else if (pageType.value === 'edit') { // 编辑
-          // getselectCheckInfo(formInline.value).then((res) => {
-          //   if (res.code === '200') {
-          //     close()
-          //   }
-          // })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (formInline.value.id) {
-    const params = {
-      id: formInline.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    sourceSubmit(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index c6edd5e..38a5811 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceCheckList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 0e03f84..6cff9e2 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,12 +1,110 @@
-<script lang="ts" setup name="MaintenanceList">
-import listPage from './components/applyList.vue'
-// 逻辑代码
+<script lang="ts" setup name="approve">
+import ListApproval from './components/listMaintenanceApproval.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+export interface menuType {
+  name: string
+  value: string
+}
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
+const dictStore = useDictStore()
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+const menu = ref<menuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
 </script>
 
 <template>
-  <list-page />
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 0940420..9556d73 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -177,7 +177,7 @@
   // todo: 批量导入
   fileRef.value.click()
 }
-// 添加溯源供方
+// 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
 }
@@ -269,21 +269,12 @@
             <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
                   size="small"
                   link
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  详情
+                  查看
                 </el-button>
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/delete')"
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 60d5098..10ae252 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="cancelApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="3" />
+  <apply-list apply-type="3" :schedule="SCHEDULE.STANDARD_REVERT_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/changeApply.vue b/src/views/device/standardEquipment/changeApply.vue
index 1c1d0fc..53d5e5e 100644
--- a/src/views/device/standardEquipment/changeApply.vue
+++ b/src/views/device/standardEquipment/changeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="1" />
+  <apply-list apply-type="1" :schedule="SCHEDULE.STANDARD_CHANGE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/checkApply.vue b/src/views/device/standardEquipment/checkApply.vue
index 11ba63f..fba3c1e 100644
--- a/src/views/device/standardEquipment/checkApply.vue
+++ b/src/views/device/standardEquipment/checkApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="checkApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="5" />
+  <apply-list apply-type="5" :schedule="SCHEDULE.STANDARD_CHECK_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index dca67da..f5510c1 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -11,7 +11,12 @@
     type: String,
     default: '1',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
 })
+console.log(props.schedule, '11111')
 export interface menuType {
   name: string
   comp: any
@@ -59,7 +64,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :apply-type="applyType" @setData="setData" />
+    <component :is="currentComp" :schedule="schedule" :apply-type="applyType" @setData="setData" />
   </div>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8882124..d4f8601 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -4,14 +4,20 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  schedule: {
+    type: String,
+    default: '',
+  },
   buttoms: {
     type: Array,
     default: () => [],
@@ -135,7 +141,8 @@
 const loadingTable = ref(false)
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -170,11 +177,12 @@
   standardName: string
   standardOwner: string
   createTime: string
+  taskId: string
 }
 // 点击删除
-const handleDelete = (row: rowReturn, type: string) => {
+const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认${type}${row.standardName}吗？`,
+    `确认删除${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -183,55 +191,104 @@
     },
   )
     .then(() => {
-      if (type === '删除') {
-        getStandardLisdelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
+      getStandardLisdelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, value: string) => {
-  if (value === '查看') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'detail',
-        id: row.id,
-      },
+const approvalDialog = ref()
+// 跳转到详情
+const goDetail = (row: rowReturn) => {
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'detail',
+      id: row.id,
+    },
+  })
+}
+// 提交
+const approvalSubmit = (row: rowReturn) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStandardEquipmentApply({ id: row.id, formId: props.schedule }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
     })
+  })
+}
+// 取消
+const handleCancel = (row: rowReturn) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
   }
-  else if (value === '编辑') {
-    $router.push({
-      name: 'standardListAdd',
-      params: {
-        type: 'edit',
-        id: row.id,
-      },
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
     })
-  }
-  else if (value === '删除' || value === '取消' || value === '提交') {
-    handleDelete(row, value)
-  }
-  else {
-    if (value === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (value === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyList.value.approval = row.standardOwner
-    applyList.value.approvalTime = row.createTime
-    applyShow.value = true
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: rowReturn, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push({
+        name: 'standardListAdd',
+        params: {
+          type: 'edit',
+          id: row.id,
+        },
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
   }
 }
 // 审批弹窗关闭
@@ -290,6 +347,10 @@
   }
   loading.close()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
 // 上传文件/批量导入
 const onFileChange = (event: any) => {
   if (event.target.files[0].type === 'application/pdf') {
@@ -438,7 +499,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row, item.name)"
+                  @click="clickBtn(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -449,77 +510,6 @@
       </table-container>
     </app-container>
   </div>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index b397cbb..6d85903 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -5,11 +5,13 @@
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -105,6 +107,7 @@
   standardOwner: '',
   updateTime: null,
   version: null,
+  taskId: '',
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -141,9 +144,11 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -470,27 +475,76 @@
 }
 defineExpose({ submitForm })
 
-// 点击顶部一排按钮
-const getAddList = (item: string) => {
-  if (item === '提交' || item === '保存') {
-    getStandardLisAdd(fromListInfo.value).then((res) => {
-      if (res.code === '200') {
-        close()
-      }
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
     })
+}
+// 点击数据后的操作按钮
+const getAddList = (buttonType: string) => {
+  switch (buttonType) {
+    case '提交':
+      getStandardLisAdd(fromListInfo.value).then((res) => {
+        if (res.code === '200') {
+          close()
+        }
+      })
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
   }
-  else {
-    if (item === '同意') {
-      applyList.value.select = '1'
-    }
-    else if (item === '驳回') {
-      applyList.value.select = '2'
-    }
-    else {
-      applyList.value.select = '3'
-    }
-    applyShow.value = true
-  }
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {
+
 }
 // 选择了标准名称后
 const standardChange = (e: any) => {
@@ -1013,218 +1067,162 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header">
-        <div class="title">
-          标准配套设备更换
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary">
-            批量选择
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="primary"
-            @click="addRoow"
-          >
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('1')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.applyEquipmentList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-input
-              v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
-              class="input"
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            标准配套设备更换
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary">
+              批量选择
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="primary"
+              @click="addRoow"
             >
-              <template v-if="item.choose" #append>
-                <el-button
-                  size="small"
-                  :disabled="pageType === 'detail'"
-                  @click="chooseList(scope.row, scope.$index)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="header">
-        <div class="title">
-          申请文档
-        </div>
-        <span class="btns">
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
-          </el-button>
-          <el-button
-            v-if="pageType !== 'detail'"
-            type="info"
-            @click="removeRow('2')"
-          >
-            删除行
-          </el-button>
-        </span>
-      </div>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-            />
-            <el-input
-              v-else
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-              class="input"
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('1')"
             >
-              <template v-if="item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  enctype="multipart/form-data"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
-                >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                    上传
+              删除行
+            </el-button>
+          </span>
+        </div>
+        <el-table
+          :data="fromListInfo.applyEquipmentList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-input
+                v-model="scope.row[item.value]"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="chooseList(scope.row, scope.$index)"
+                  >
+                    选择
                   </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="pageType === 'detail'" class="header">
-        <div class="title">
-          审批流程
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <detail-block>
+        <div class="header">
+          <div class="title">
+            申请文档
+          </div>
+          <span class="btns">
+            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+              增加行
+            </el-button>
+            <el-button
+              v-if="pageType !== 'detail'"
+              type="info"
+              @click="removeRow('2')"
+            >
+              删除行
+            </el-button>
+          </span>
         </div>
+        <el-table
+          :data="fromListInfo.fileList"
+          border
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columnsFiles"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-date-picker
+                v-if="item.time"
+                v-model="scope.row[item.value]"
+                type="datetime"
+                placeholder="请选择发证日期"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+              />
+              <el-input
+                v-else
+                v-model="scope.row[item.value]"
+                :autofocus="true"
+                style="height: 5vh;"
+                :placeholder="`${item.text}`"
+                class="input"
+              >
+                <template v-if="item.choose" #append>
+                  <el-upload
+                    v-model:file-list="fileList"
+                    enctype="multipart/form-data"
+                    :http-request="uploadQuarterlyEvaluateFile"
+                    :before-remove="beforeRemove"
+                    :on-exceed="handleExceed"
+                    :on-preview="uploadShow"
+                    :on-change="handleFileChange"
+                    :limit="1"
+                  >
+                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                      上传
+                    </el-button>
+                  </el-upload>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+      <div v-if="pageType === 'detail'">
+        <detail-block title="审批流程">
+          <!-- 审批流程 -->
+          <div>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in approvalActivities"
+                :key="index"
+                :timestamp="activity.timestamp"
+              >
+                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </detail-block>
       </div>
     </div>
   </app-container>
-  <el-dialog
-    v-model="applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="applyListClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="applyListClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index c378549..bb89e24 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -86,7 +86,7 @@
           <span style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input">
+          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
             <template #append>
               <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
                 选择
@@ -95,7 +95,7 @@
           </el-input>
         </template>
         <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 1340e03..35f9aab 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -122,7 +122,8 @@
 const $router = useRouter()
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -235,6 +236,7 @@
 interface rowReturn {
   id: string
   standardName: string
+  standardOwnerName: string
 }
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
@@ -266,7 +268,7 @@
 // 提醒函数
 const warnClick = (row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认提醒${row.standardName}吗？`,
+    `确认提醒${row.standardOwnerName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 1dd4ff9..189fbdc 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="pauseApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="2" />
+  <apply-list apply-type="2" :schedule="SCHEDULE.STANDARD_PAUSE_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/resumeApply.vue b/src/views/device/standardEquipment/resumeApply.vue
index a23213a..cd48041 100644
--- a/src/views/device/standardEquipment/resumeApply.vue
+++ b/src/views/device/standardEquipment/resumeApply.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="resumeApply">
 import applyList from './components/applyList.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
 
 <template>
-  <apply-list apply-type="4" />
+  <apply-list apply-type="4" :schedule="SCHEDULE.STANDARD_RESUME_APPROVAL" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index a66fb7b..02d0fcc 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -128,7 +128,8 @@
 
 // 获取部门信息
 getUsersDept({
-  createTime: null,
+  createEndTime: '',
+  createstartTime: '',
   director: '',
   meterMajor: '',
   organizeName: '',
@@ -172,7 +173,7 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '标准装置列表', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 72271a5..467148d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -230,13 +230,33 @@
 const handleClose = () => {
   applyShow.value = false
 }
-
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
 // 点击数据后的操作按钮
 const clickBtn = (row: ISupplier, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
       $router.push(`/source/edit/${row.id}`)
       break
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 4d0bdad..b0b2dd5 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,7 +2,7 @@
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
-import type { IOptions } from '../list_interface'
+import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 4c0d635..38a5811 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,11 +1,4 @@
 <script lang="ts" setup name="approve">
-// import All from './components/all.vue' // 全部
-// import DraftBox from './components/draftBox.vue' // 草稿箱
-// import ApprovalPending from './components/approvalPending.vue'// 待审批
-// import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-// import Passed from './components/passed.vue'// 已通过
-// import NotPass from './components/notPass.vue' // 技术能力
-// import Canceled from './components/canceled.vue' // 取消
 import ListApproval from './components/listApproval.vue' // 全部
 import useDictStore from '@/store/modules/dict'
 export interface menuType {
@@ -86,22 +79,6 @@
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
-
-// const current = ref('全部')
-// const currentComp = shallowRef(All)
-// watch(current, (newValue) => {
-//   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-// })
-// // 控制顶部tap栏是否禁用
-// const disabled = ref(false)
-// const setData = (newIsShow: any) => {
-//   if (newIsShow === false) {
-//     disabled.value = true
-//   }
-//   else {
-//     disabled.value = false
-//   }
-// }
 </script>
 
 <template>